Version bump, as requested by Oleg Gawriloff in bug #404489. Removed old ebuilds and unused gsm USE-flag description.

(Portage version: 2.1.10.46/cvs/Linux x86_64)

4 files changed, 34 insertions, 92 deletions

diff --git a/net-misc/asterisk-core-sounds/ChangeLog b/net-misc/asterisk-core-sounds/ChangeLog
index bf9e179ca237..a44f9092b696 100644
--- a/net-misc/asterisk-core-sounds/ChangeLog
+++ b/net-misc/asterisk-core-sounds/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk-core-sounds
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-core-sounds/ChangeLog,v 1.9 2012/02/16 18:43:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-core-sounds/ChangeLog,v 1.10 2012/02/20 16:33:01 chainsaw Exp $
+
+*asterisk-core-sounds-1.4.22 (20 Feb 2012)
+
+  20 Feb 2012; Tony Vroon <chainsaw@gentoo.org>
+  -asterisk-core-sounds-1.4.19.ebuild, -asterisk-core-sounds-1.4.21.ebuild,
+  +asterisk-core-sounds-1.4.22.ebuild, metadata.xml:
+  Version bump, as requested by Oleg Gawriloff in bug #404489. Removed old
+  ebuilds and unused gsm USE-flag description.
 
   16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   asterisk-core-sounds-1.4.21-r1.ebuild:
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.19.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.19.ebuild
deleted file mode 100644
index 2eac088db94a..000000000000
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.19.ebuild
+++ /dev/null
@@ -1,67 +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-core-sounds/asterisk-core-sounds-1.4.19.ebuild,v 1.4 2011/02/27 19:00:35 chainsaw Exp $
-
-EAPI="2"
-
-DESCRIPTION="Core sounds for asterisk"
-HOMEPAGE="http://www.asterisk.org/"
-LINGUAS="^en fr" # ^ is used to indicate to the loops below to NOT set this as an optional
-CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
-
-SRC_URI=""
-IUSE="${CODECS}"
-for l in ${LINGUAS}; do
-	[[ "${l}" != ^* ]] && IUSE+=" linguas_${l}" && SRC_URI+=" linguas_${l}? ("
-	for c in ${CODECS}; do
-		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )"
-	done
-	[[ "${l}" = ^* ]] || SRC_URI+=" )"
-done
-
-LICENSE="CCPL-Attribution-ShareAlike-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=net-misc/asterisk-1.4"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local ar
-
-	for ar in ${A}; do
-		l="${ar#${PN}-}"
-		l=${l%%-*}
-		echo ">>> Unpacking $ar to ${WORKDIR}/${l}"
-		[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
-		tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
-	done
-}
-
-src_install() {
-	for l in ${LINGUAS}; do
-		if [[ "${l}" = ^* ]] || use linguas_${l}; then
-			l="${l#^}"
-			dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
-			rm ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
-		fi
-	done
-
-	diropts -m 0770 -o asterisk -g asterisk
-	insopts -m 0660 -o asterisk -g asterisk
-
-	dodir /var/lib/asterisk/sounds
-	insinto /var/lib/asterisk/sounds
-	doins -r .
-}
-
-pkg_postinst() {
-	local c has_once_codec=
-
-	for c in ${CODECS}; do
-			use ${c#+} && has_one_codec=1
-	done
-
-	[ -n "${has_one_codec}" ] || ewarn "You have none of the codec use flags (${CODECS}) set.  You need to have at least one set in order for this package to be useful."
-}
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
index 837d8a8fc249..04acb04d4015 100644
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21.ebuild
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21.ebuild,v 1.1 2011/09/20 11:23:02 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild,v 1.1 2012/02/20 16:33:01 chainsaw Exp $
 
-EAPI="2"
+EAPI="4"
 
 DESCRIPTION="Core sounds for asterisk"
 HOMEPAGE="http://www.asterisk.org/"
@@ -10,11 +10,16 @@ LINGUAS="^en fr es ru" # ^ is used to indicate to the loops below to NOT set thi
 CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
 
 SRC_URI=""
-IUSE="${CODECS}"
+IUSE=""
+for c in ${CODECS}; do
+	[[ "${c}" != +* ]] && IUSE+=" ${c}"
+done
 for l in ${LINGUAS}; do
 	[[ "${l}" != ^* ]] && IUSE+=" linguas_${l}" && SRC_URI+=" linguas_${l}? ("
 	for c in ${CODECS}; do
-		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )"
+		[[ "${c}" != +* ]] &&
+		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )" ||
+		SRC_URI+=" http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz"
 	done
 	[[ "${l}" = ^* ]] || SRC_URI+=" )"
 done
@@ -33,9 +38,12 @@ src_unpack() {
 	for ar in ${A}; do
 		l="${ar#${PN}-}"
 		l=${l%%-*}
-		echo ">>> Unpacking $ar to ${WORKDIR}/${l}"
-		[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
-		tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
+		c="${ar#${PN}-*-}"
+		c=${c%%-*}
+		ebegin "Unpacking ${c} audio files for \"${l}\""
+			[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
+			tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
+		eend $?
 	done
 }
 
@@ -43,25 +51,19 @@ src_install() {
 	for l in ${LINGUAS}; do
 		if [[ "${l}" = ^* ]] || use linguas_${l}; then
 			l="${l#^}"
-			dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
-			rm ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+			ebegin "Installing documentation for \"${l}\""
+				dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+				rm ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
+			eend $?
 		fi
 	done
 
 	diropts -m 0770 -o asterisk -g asterisk
 	insopts -m 0660 -o asterisk -g asterisk
 
-	dodir /var/lib/asterisk/sounds
-	insinto /var/lib/asterisk/sounds
-	doins -r .
-}
-
-pkg_postinst() {
-	local c has_once_codec=
-
-	for c in ${CODECS}; do
-			use ${c#+} && has_one_codec=1
-	done
-
-	[ -n "${has_one_codec}" ] || ewarn "You have none of the codec use flags (${CODECS}) set.  You need to have at least one set in order for this package to be useful."
+	ebegin "Installing audio files"
+		dodir /var/lib/asterisk/sounds
+		insinto /var/lib/asterisk/sounds
+		doins -r .
+	eend $?
 }
diff --git a/net-misc/asterisk-core-sounds/metadata.xml b/net-misc/asterisk-core-sounds/metadata.xml
index 639419ffc299..3c66f4c6a117 100644
--- a/net-misc/asterisk-core-sounds/metadata.xml
+++ b/net-misc/asterisk-core-sounds/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="alaw">Install the sounds files for the alaw codec.</flag>
 		<flag name="g722">Install the sounds files for the g722 codec.</flag>
 		<flag name="g729">Install the sounds files for the g729 codec.</flag>
-		<flag name="gsm">Install the sounds files for the +gsm codec.</flag>
 		<flag name="siren7">Install the sounds files for the siren7 codec.</flag>
 		<flag name="siren14">Install the sounds files for the siren14 codec.</flag>
 		<flag name="sln16">Install the sounds files for the sln16 codec.</flag>