Update parallel make patchset as it broke for USE=keepsrc with make clean. An anonymous source on IRC pointed this out.

(Portage version: 2.1.7.16/cvs/Linux x86_64)

4 files changed, 14 insertions, 431 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 7d4912ce3c72..009fb9dc5eea 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/asterisk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.237 2009/12/27 09:41:51 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.238 2010/01/04 12:56:16 chainsaw Exp $
+
+*asterisk-1.6.1.12-r1 (04 Jan 2010)
+
+  04 Jan 2010; <chainsaw@gentoo.org> -asterisk-1.6.1.11.ebuild,
+  -asterisk-1.6.1.12.ebuild, +asterisk-1.6.1.12-r1.ebuild,
+  -files/1.6.1/asterisk-1.6.1.12-parallel-make.patch,
+  +files/1.6.1/asterisk-1.6.1.12-parallel-make-v2.patch:
+  Update parallel make patchset as it broke for USE=keepsrc with make clean.
+  An anonymous source on IRC pointed this out.
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> asterisk-1.2.36.ebuild:
   Marked ppc stable for bug #284892.
diff --git a/net-misc/asterisk/asterisk-1.6.1.11.ebuild b/net-misc/asterisk/asterisk-1.6.1.11.ebuild
deleted file mode 100644
index cab78b24c7bd..000000000000
--- a/net-misc/asterisk/asterisk-1.6.1.11.ebuild
+++ /dev/null
@@ -1,415 +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/asterisk-1.6.1.11.ebuild,v 1.2 2009/12/12 15:05:34 chainsaw Exp $
-
-EAPI=1
-inherit eutils autotools
-
-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 iconv jabber ldap keepsrc misdn newt nosamples odbc oss postgres radius snmp span speex ssl sqlite static vorbis"
-
-RDEPEND="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 )
-	iconv? ( virtual/libiconv )
-	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 )
-	speex? ( media-libs/speex )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!<net-misc/asterisk-addons-1.6
-	!net-misc/asterisk-chan_unistim
-	!net-misc/zaptel"
-
-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_ast12update ; then
-		ewarn "Please note that the configuration style (particularly the dial plan) has changed significantly."
-		ewarn "sip.conf: insecure=very -> insecure=port,invite"
-		ewarn "asterisk.conf: please familiarise yourself with [compat]"
-		ewarn "extensions.conf: use comma instead of pipe as a separator"
-		ewarn "- Please read "${ROOT}"usr/share/doc/${PF}/UPGRADE.txt.bz2 after the installation!"
-		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
-
-	if [[ -n "${ASTERISK_MODULES}" ]] ; then
-		ewarn "You are overriding ASTERISK_MODULES. We will assume you know what you are doing. There is no support for this option, try without if you see breakage."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#
-	# put pid file(s) into /var/run/asterisk
-	#
-	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-var_rundir.patch || die "patch failed"
-
-	#
-	# fix gsm codec cflags (e.g. i586 core epias) and disable
-	# assembler optimizations
-	#
-	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-gsm-pic.patch || die "patch failed"
-
-	#
-	# add missing LIBS for uclibc
-	#
-	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1-uclibc.patch  || die "patch failed"
-
-	#
-	# make sure FXO ports are usable immediately, without requiring an inbound call first
-	# https://issues.asterisk.org/view.php?id=14577
-	#
-	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1.6-fxsks-hookstate.patch || die "patch failed"
-
-	#
-	# do not ignore alarm-cleared event while V23 caller ID detection is in progress
-	# otherwise automated British Telecom line test causes permanent red alarm
-	# https://issues.asterisk.org/view.php?id=14163
-	#
-	epatch "${FILESDIR}"/1.6.1/${PN}-1.6.1.6-bt-line-test.patch || die "patch failed"
-
-	AT_M4DIR=autoconf eautoreconf
-
-	# 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 iconv) \
-		$(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
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# setup directory structure
-	#
-	mkdir -p "${D}"usr/lib/pkgconfig
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake 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
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/run/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.6.1/asterisk.initd asterisk
-	newconfd "${FILESDIR}"/1.6.0/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
-}
-
-pkg_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-pkg_postinst() {
-	ebegin "Fixing up permissions"
-		chown -R asterisk:asterisk "${ROOT}"var/log/asterisk
-		chmod -R u=rwX,g=rX,o=     "${ROOT}"var/log/asterisk
-
-		chown asterisk:asterisk "${ROOT}"etc/asterisk/
-		chown asterisk:asterisk "${ROOT}"etc/asterisk/*.adsi
-		chown asterisk:asterisk "${ROOT}"etc/asterisk/extensions.ael
-		chmod u=rwX,g=rwX,o= "${ROOT}"etc/asterisk/
-		chmod u=rwX,g=rwX,o= "${ROOT}"etc/asterisk/*.adsi
-		chmod u=rwX,g=rwX,o= "${ROOT}"etc/asterisk/extensions.ael
-	eend $?
-
-	#
-	# 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
-
-	#
-	# 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=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-1.6.1.12.ebuild b/net-misc/asterisk/asterisk-1.6.1.12-r1.ebuild
index 8e8de46f3440..2ca7b564b3f2 100644
--- a/net-misc/asterisk/asterisk-1.6.1.12.ebuild
+++ b/net-misc/asterisk/asterisk-1.6.1.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.12.ebuild,v 1.2 2009/12/21 14:13:01 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.12-r1.ebuild,v 1.1 2010/01/04 12:56:16 chainsaw Exp $
 
 EAPI=1
 inherit eutils autotools
@@ -164,7 +164,7 @@ src_unpack() {
 	# sprinkle some plus signs in strategic locations for maximum parallel make happiness
 	# https://issues.asterisk.org/view.php?id=16489
 	#
-	epatch "${FILESDIR}"/1.6.1/${P}-parallel-make.patch || die "patch failed"
+	epatch "${FILESDIR}"/1.6.1/${P}-parallel-make-v2.patch || die "patch failed"
 
 	AT_M4DIR=autoconf eautoreconf
 
diff --git a/net-misc/asterisk/files/1.6.1/asterisk-1.6.1.12-parallel-make.patch b/net-misc/asterisk/files/1.6.1/asterisk-1.6.1.12-parallel-make-v2.patch
index 8416ce9f5c06..603b88c1cbef 100644
--- a/net-misc/asterisk/files/1.6.1/asterisk-1.6.1.12-parallel-make.patch
+++ b/net-misc/asterisk/files/1.6.1/asterisk-1.6.1.12-parallel-make-v2.patch
@@ -1,17 +1,6 @@
 diff -uNr asterisk-1.6.1.12.ORIG/channels/Makefile asterisk-1.6.1.12/channels/Makefile
 --- asterisk-1.6.1.12.ORIG/channels/Makefile	2009-12-19 18:18:32.727000128 +0000
 +++ asterisk-1.6.1.12/channels/Makefile	2009-12-19 18:18:42.016000126 +0000
-@@ -62,8 +62,8 @@
- endif
- 
- clean::
--	$(MAKE) -C misdn clean
--	if [ -f h323/Makefile ]; then $(MAKE) -C h323 clean; fi
-+	+$(MAKE) -C misdn clean
-+	if [ -f h323/Makefile ]; then +$(MAKE) -C h323 clean; fi
- 
- dist-clean::
- 	rm -f h323/Makefile
 @@ -99,7 +99,7 @@
  chan_usbradio.so: LIBS+=-lusb -lasound