net-misc/asterisk: removing 1.6 branch as it's now in gentoo-x86

svn path=/trunk/; revision=803

4 files changed, 6 insertions, 464 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 9bd6411..6665dd8 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+  -asterisk-1.6.0.6.ebuild:
+  removing asterisk-1.6 as it is now in gentoo-x86
+
   08 Mar 2009; Rambaldi <rambaldi@xs4all.nl> ++, -asterisk-1.6.0.3.ebuild:
   net-misc/asterisk-1.6: version bump, thanks Michael Higgins
   <linux@evolone.org>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 1fcb967..7c858bb 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -13,9 +13,7 @@ AUX 1.6/asterisk-1.6.0-uclibc.patch 373 RMD160 08f18dd2af3736497995ebcbea84939ae
 AUX 1.6/asterisk-1.6.0-var_rundir.patch 441 RMD160 55869a82a01be38e80da9a31faac6d2d03f0fc58 SHA1 5bf2a8ed9778623f611330fcc4ea75c50f642680 SHA256 f75156feb6a6e421fc83e2d518b4b9204e4ae11e802440576a54de226ffd8064
 DIST asterisk-1.4.21.2.tar.gz 11528693 RMD160 938c618d17aeef45a17d2fbe5293fbc13c4efe0d SHA1 8c0dcf57f69ce27929f7836081316a2695eb76fa SHA256 27c3bb0e47c6f762c0ce701cd97b5f23fd3424984523bf353593b77a696ea8b5
 DIST asterisk-1.4.22.1.tar.gz 11602819 RMD160 e085c651114be7273e0dabf5d695012bd8f0c05b SHA1 3d13cdeac27bd797f2ea03a4d5fa122f5518343c SHA256 aef8fd6d9dbf135fcd0259d73382bf8a485f378cc6572214fd92e718806209d6
-DIST asterisk-1.6.0.6.tar.gz 13415949 RMD160 1e1ad871b442f6f053c2fae6e2981de8f46e9ecb SHA1 8869dc4301de67bdabe529d84a1f98219a0500d2 SHA256 d2c940515d3c1ff2dcfcaa002767d99403796573abdd4baeac5d405a0ccbfd5b
 EBUILD asterisk-1.4.21.2.ebuild 11270 RMD160 3cab6b9d77ee3b42af8f91868c27aa6f3b0ff1d2 SHA1 e9921ec41acd80f04fe16b90a5a34fd4a79ff5f6 SHA256 6557079857aec9177af592183cfa257c7e9b3cff3d4107fe12d38e6715d03474
 EBUILD asterisk-1.4.22.1.ebuild 11755 RMD160 aa7f781eac9e247eb7ff2e2c905bb44babed0d33 SHA1 5033fc7f71c9f2a7b05df717083151b77c645d88 SHA256 f06359747ea4bd8378461d8859efff466557c6c59dfe99b8a1e234810e360aa2
-EBUILD asterisk-1.6.0.6.ebuild 11383 RMD160 b83581ad863d2ffbe80d1062816dd1df85eb9617 SHA1 59f7824b39fa24910598515c027ce466c50e3b50 SHA256 f9b2e3b5f278456cea65553681179fd36dfbe52e0d585bda8702d50e13ad4c68
-MISC ChangeLog 6607 RMD160 cc03355dd1cbdfc3de49bd45a24d3c30907b8f03 SHA1 5a23d05d36a45be46a8514b71a890546e1970d91 SHA256 4f0f15d9908695c3c139b8dcfd712b3c518d8c7cd641661c521aeda40d9aa93e
-MISC metadata.xml 1421 RMD160 e115e21af431967e895eff1fdd2443c15a93c6a1 SHA1 50fd1a1e1a4510579c493e416be5d7b58d429dc4 SHA256 5150221104b564da15d13a269c25a59c4a9bb5cffc607f84c7c597e36a55bf4f
+MISC ChangeLog 6754 RMD160 9b354fc9a48c4c0c35ecef6e4420094649ea8d04 SHA1 cebcee7290671e25f877229167ad29cf226aa110 SHA256 0b80ef824652e19a68d8e1e39c47182db1d23d22f8038de6e04e3ed4447bddac
+MISC metadata.xml 865 RMD160 d70b5dad2fedbeec6f95471a85e45daf59283eb6 SHA1 8ddac25be23f99cee8855deff42b5051f1dd0a27 SHA256 72e8f3641c155b97410bf1789b208fe83df3d7f854e2ad83e79cae7204b03471
diff --git a/net-misc/asterisk/asterisk-1.6.0.6.ebuild b/net-misc/asterisk/asterisk-1.6.0.6.ebuild
deleted file mode 100644
index d129e7f..0000000
--- a/net-misc/asterisk/asterisk-1.6.0.6.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-inherit eutils
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.digium.com/pub/asterisk/releases/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa +caps curl dahdi debug freetds h323 iconv imap jabber ldap keepsrc misdn mmx newt nosamples odbc oss pic postgres radius snmp span speex ssl sqlite static vorbis"
-
-RDEPEND="virtual/libc
-	sys-libs/ncurses
-	dev-libs/popt
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.7
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	h323? ( dev-libs/pwlib
-		net-libs/openh323 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client )
-	jabber? ( dev-libs/iksemel )
-	ldap?	( net-nds/openldap )
-	misdn? ( net-dialup/misdnuser )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( virtual/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( <media-libs/spandsp-0.0.6_pre3 )
-	speex? ( media-libs/speex )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!<net-misc/asterisk-addons-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-#
-# shortcuts
-#
-
-# update from asterisk-1.0.x
-is_ast10update() {
-	return $(has_version "=net-misc/asterisk-1.0*")
-}
-
-# update from asterisk-1.2.x
-is_ast12update() {
-	return $(has_version "=net-misc/asterisk-1.2*")
-}
-
-# update from asterisk 1.4.x
-is_ast14update() {
-	return $(has_version "=net-misc/asterisk-1.4*")
-}
-
-# update in the asterisk-1.6.x line
-is_astupdate() {
-	if ! is_ast10update && ! is_ast12update && !is_ast14update; then
-		return $(has_version "<net-misc/asterisk-${PV}")
-	fi
-	return 0
-}
-
-get_available_modules() {
-	local modules mod x
-
-	# build list of available modules...
-	for x in app cdr codec format func pbx res; do
-
-		for mod in $(find "${S}" -type f -name "${x}_*.c*" -print)
-		do
-			modules="${modules} $(basename ${mod/%.c*})"
-		done
-	done
-
-	echo "${modules}"
-}
-
-pkg_setup() {
-	local checkfailed=0 waitaftermsg=0
-
-	if is_ast10update || is_ast12update || is_ast14update ; then
-		ewarn "      Asterisk UPGRADE Warning"
-		ewarn ""
-		ewarn "- Please read "${ROOT}"usr/share/doc/${PF}/UPGRADE.txt.bz2 after the installation!"
-		ewarn ""
-		ewarn "      Asterisk UPGRADE Warning"
-		echo
-		waitaftermsg=1
-	fi
-
-	if [[ $waitaftermsg -eq 1 ]]; then
-		einfo "Press Ctrl+C to abort"
-		echo
-		ebeep 10
-	fi
-
-	#
-	# Regular checks
-	#
-	einfo "Running some pre-flight checks..."
-	echo
-
-	# imap requires ssl if imap-c-client was built with ssl,
-	# conversely if ssl and imap are both on then imap-c-client needs ssl
-	if use imap; then
-		if use ssl && ! built_with_use virtual/imap-c-client ssl; then
-			eerror
-			eerror "IMAP with SSL requested, but your IMAP C-Client libraries"
-			eerror "are built without SSL!"
-			eerror
-			die "Please recompile the IMAP C-Client libraries with SSL support enabled"
-		elif ! use ssl && built_with_use virtual/imap-c-client ssl; then
-			eerror
-			eerror "IMAP without SSL requested, but your IMAP C-Client"
-			eerror "libraries are built with SSL!"
-			eerror
-			die "Please recompile the IMAP C-Client libraries without SSL support enabled"
-		fi
-	fi
-
-	#
-	# In a perfect world, $user should know what he's doing when specifying
-	# a custom list of modules
-	#
-	if [[ -n "${ASTERISK_MODULES}" ]] ; then
-		ewarn "_insert random warning message here_"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#
-	# comment about h323 issues
-	#
-	if use h323 ; then
-		ewarn "h323 useflag: It is known that the h323 module doesn't compile
-		the \"normal\" way: For a workaround, asterisk will be built two times
-		without cleaning the build dir."
-	fi
-
-	#
-	# put pid file(s) into /var/run/asterisk
-	#
-	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-var_rundir.patch || die "patch failed"
-
-	#
-	# fix gsm codec cflags (e.g. i586 core epias) and disable
-	# assembler optimizations (on non-mmx / non-x86 or x86 PIC systems)
-	#
-	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-gsm-pic.patch || die "patch failed"
-
-	#
-	# add missing LIBS for uclibc
-	#
-	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-uclibc.patch  || die "patch failed"
-
-	if use x86 && use mmx ; then
-		if use pic ; then
-			ewarn "pic useflag: Not enabling mmx optimizations"
-		else
-			einfo "mmx useflag: Enabling mmx optimizations"
-			sed -i -e "s:^#K6OPT.*:K6OPT = -DK6OPT:" \
-				codecs/gsm/Makefile || die "sed gsm makefile failed"
-		fi
-	fi
-
-	#
-	# fix imap check in configure
-	# (TODO: patch configure.ac & run eautoreconf ?)
-	#
-	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-configure-gentoo.diff || die "patch failed"
-
-	# parse modules list
-	if [[ -n "${ASTERISK_MODULES}" ]]; then
-		local x modules="$(get_available_modules)"
-
-		einfo "Custom list of modules specified, checking..."
-
-		use debug && {
-			einfo "Available modules: ${modules}"
-			einfo " Selected modules: ${ASTERISK_MODULES}"
-		}
-
-		for x in ${ASTERISK_MODULES}; do
-			if [[ "${x}" = "-*" ]]; then
-				MODULES_LIST=""
-			else
-				if has ${x} ${modules}
-				then
-					MODULES_LIST="${MODULES_LIST} ${x}"
-				else
-					eerror "Unknown module: ${x}"
-				fi
-			fi
-		done
-
-		export MODULES_LIST
-	fi
-}
-
-src_compile() {
-	#
-	# start with configure
-	#
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		$(use_with alsa asound) \
-		$(use_with caps cap) \
-		$(use_with curl) \
-		$(use_with dahdi pri) \
-		$(use_with dahdi tonezone) \
-		$(use_with dahdi) \
-		$(use_with freetds tds) \
-		$(use_with h323 h323 "/usr/share/openh323") \
-		$(use_with h323 pwlib "/usr/share/pwlib") \
-		$(use_with iconv) \
-		$(use_with imap) \
-		$(use_with jabber iksemel) \
-		$(use_with misdn isdnnet) \
-		$(use_with misdn suppserv) \
-		$(use_with misdn) \
-		$(use_with newt) \
-		$(use_with odbc) \
-		$(use_with oss) \
-		$(use_with postgres) \
-		$(use_with radius) \
-		$(use_with snmp netsnmp) \
-		$(use_with span spandsp) \
-		$(use_with speex) \
-		$(use_with speex speexdsp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl crypto) \
-		$(use_with ssl) \
-		$(use_with vorbis ogg) \
-		$(use_with vorbis) || die "econf failed"
-
-	#
-	# custom module filter
-	# run menuselect to evaluate the list of modules
-	# and rewrite the list afterwards
-	#
-	if [[ -n "${MODULES_LIST}" ]]
-	then
-		local mod category tmp_list failed_list
-
-		###
-		# run menuselect
-
-		emake menuselect.makeopts || die "emake menuselect.makeopts failed"
-
-		###
-		# get list of modules with failed dependencies
-
-		failed_list="$(awk -F= '/^MENUSELECT_DEPSFAILED=/{ print $3 }' menuselect.makeopts)"
-
-		###
-		# traverse our list of modules
-
-		for category in app cdr codec format func pbx res; do
-			tmp_list=""
-
-			# search list of modules for matching ones first...
-			for mod in ${MODULES_LIST}; do
-				# module is from current category?
-				if [[ "${mod/%_*}" = "${category}" ]]
-				then
-					# check menuselect thinks the dependencies are met
-					if has ${mod} ${failed_list}
-					then
-						eerror "${mod}: dependencies required to build this module are not met, NOT BUILDING!"
-					else
-						tmp_list="${tmp_list} ${mod}"
-					fi
-				fi
-			done
-
-			use debug && echo "${category} tmp: ${tmp_list}"
-
-			# replace the module list for $category with our custom one
-			if [[ -n "${tmp_list}" ]]
-			then
-				category="$(echo ${category} | tr '[:lower:]' '[:upper:]')"
-				sed -i -e "s:^\(MENUSELECT_${category}S?\):\1=${tmp_list}:" \
-					menuselect.makeopts || die "failed to set list of ${category} applications"
-			fi
-		done
-	fi
-
-	#
-	# fasten your seatbelts (and start praying)
-	#
-	if use h323 ; then
-		# emake one time to get h323 to make.... yea not "clean" but works
-		emake
-	fi
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# setup directory structure
-	#
-	mkdir -p "${D}"usr/lib/pkgconfig
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	emake -j1 DESTDIR="${D}" samples || die "emake samples failed"
-
-	# remove installed sample files if nosamples flag is set
-	if use nosamples; then
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/*
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-*
-		rm -f  "${D}"var/lib/asterisk/agi-bin/*
-	else
-		einfo "Sample files have been installed"
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default
-
-	# move sample configuration files to doc directory
-	if is_ast10update || is_ast12update || is_ast14update; then
-		einfo "Updating from old (pre-1.6) asterisk version, new configuration files have been installed"
-		einfo "into "${ROOT}"etc/asterisk, use etc-update or dispatch-conf to update them"
-	fi
-
-	einfo "Configuration samples have been moved to: "${ROOT}"/usr/share/doc/${PF}/conf"
-	insinto /usr/share/doc/${PF}/conf
-	doins "${D}"etc/asterisk/*.conf*
-
-	# keep directories
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.4/asterisk.rc6 asterisk
-	newconfd "${FILESDIR}"/1.4/asterisk.confd asterisk
-
-	# some people like to keep the sources around for custom patching
-	# copy the whole source tree to /usr/src/asterisk-${PVF} and run make clean there
-	if use keepsrc
-	then
-		einfo "keepsrc useflag enabled, copying source..."
-		dodir /usr/src
-
-		cp -dPR "${S}" "${D}"/usr/src/${PF} || die "copying source tree failed"
-
-		ebegin "running make clean..."
-		emake -C "${D}"/usr/src/${PF} clean >/dev/null || die "make clean failed"
-		eend $?
-
-		einfo "Source files have been saved to "${ROOT}"usr/src/${PF}"
-	fi
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install snmp mib files
-	#
-	if use snmp
-	then
-		insinto /usr/share/snmp/mibs/
-		doins doc/digium-mib.txt doc/asterisk-mib.txt
-	fi
-
-	einfo "Fixing permissions"
-	for x in spool run lib log; do
-		fowners -R asterisk:asterisk /var/${x}/asterisk
-		fperms -R u=rwX,g=rX,o=     /var/${x}/asterisk
-	done
-
-	fowners -R root:asterisk /etc/asterisk
-	fperms -R u=rwX,g=rX,o= /etc/asterisk
-}
-
-pkg_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	einfo ""
-	einfo "If you want to know more about asterisk, visit these sites:"
-	einfo "http://www.asteriskdocs.org/"
-	einfo "http://www.voip-info.org/wiki-Asterisk"
-	elog
-	einfo "http://www.automated.it/guidetoasterisk.htm"
-	elog
-	einfo "Gentoo VoIP IRC Channel:"
-	einfo "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-
-	#
-	# Warning about 1.x -> 1.6 changes...
-	#
-	if is_ast10update || is_ast12update || is_ast14update; then
-		ewarn ""
-		ewarn "- Please read "${ROOT}"usr/share/doc/${PF}/UPGRADE.txt.bz2 before continuing"
-		ewarn ""
-	fi
-}
-
-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=rX,o=     "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 0404d77..9d2bb3b 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -10,16 +10,7 @@
     <flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
     <flag name="nosamples">Don't install sample sound and configuration files</flag>
 	<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
-    <flag name="span">Enable support for the spandsp codec</flag>
     <flag name="zaptel">Enables zaptel support ( is beeing replaced by dahdi)</flag>
-	<!-- old use flags, keeping for future work on ebuilds
-    <flag name="pri">Enables pri support</flag>
-    <flag name="ukcid">Enable UK callerid support</flag>
-    <flag name="bri">Enable ISDN BRI support (bristuff)</flag>
-    <flag name="genericjb">Enable experimental generic jitter buffer</flag>
-    <flag name="lowmem">Build Asterisk for environments with low amounts of memory (embedded devices)</flag>
-    <flag name="osp">Enable support for the Open Settlement Protocol</flag>
-	-->
   </use>
 
 </pkgmetadata>