More forcefully disable broken & unsupported H323 functionality in all ebuilds. As per Ionic on #gentoo-voip.

(Portage version: 2.1.10.26/cvs/Linux x86_64)

5 files changed, 19 insertions, 33 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 686cffbfe294..f74d67f0fc6c 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.346 2011/10/04 09:59:12 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.347 2011/10/11 15:20:11 chainsaw Exp $
+
+  11 Oct 2011; Tony Vroon <chainsaw@gentoo.org> asterisk-1.8.5.0-r3.ebuild,
+  asterisk-1.8.6.0.ebuild, asterisk-1.8.7.0_rc2.ebuild,
+  asterisk-1.8.7.0.ebuild:
+  More forcefully disable broken & unsupported H323 functionality in all
+  ebuilds. As per Ionic on #gentoo-voip.
 
 *asterisk-1.8.7.0 (04 Oct 2011)
 
diff --git a/net-misc/asterisk/asterisk-1.8.5.0-r3.ebuild b/net-misc/asterisk/asterisk-1.8.5.0-r3.ebuild
index b428954dfbef..8d789fd0261b 100644
--- a/net-misc/asterisk/asterisk-1.8.5.0-r3.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.5.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.5.0-r3.ebuild,v 1.5 2011/09/20 07:48:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.5.0-r3.ebuild,v 1.6 2011/10/11 15:20:11 chainsaw Exp $
 
 EAPI=3
 inherit autotools base eutils linux-info multilib
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk h323 http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
+IUSE="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 snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
 
 EPATCH_SUFFIX="patch"
 PATCHES=( "${WORKDIR}/asterisk-patchset" )
@@ -36,7 +36,6 @@ RDEPEND="sys-libs/ncurses
 		net-misc/dahdi-tools )
 	freetds? ( dev-db/freetds )
 	gtalk? ( dev-libs/iksemel )
-	h323? ( net-libs/openh323 )
 	http? ( dev-libs/gmime:2.4 )
 	iconv? ( virtual/libiconv )
 	jabber? ( dev-libs/iksemel )
@@ -117,6 +116,7 @@ src_configure() {
 
 	# 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
@@ -187,11 +187,6 @@ src_configure() {
 	else
 		menuselect/menuselect --disable chan_gtalk menuselect.makeopts
 	fi
-	if use h323; then
-		menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-	fi
 	if use http; then
 		menuselect/menuselect --enable res_http_post menuselect.makeopts
 	else
diff --git a/net-misc/asterisk/asterisk-1.8.6.0.ebuild b/net-misc/asterisk/asterisk-1.8.6.0.ebuild
index cd7d3d78bf7a..3d71e40b6cfa 100644
--- a/net-misc/asterisk/asterisk-1.8.6.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.6.0.ebuild,v 1.2 2011/09/20 07:48:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.6.0.ebuild,v 1.3 2011/10/11 15:20:11 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk h323 http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
+IUSE="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 snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
 
 EPATCH_SUFFIX="patch"
 PATCHES=( "${WORKDIR}/asterisk-patchset" )
@@ -34,7 +34,6 @@ RDEPEND="dev-libs/popt
 		net-misc/dahdi-tools )
 	freetds? ( dev-db/freetds )
 	gtalk? ( dev-libs/iksemel )
-	h323? ( net-libs/openh323 )
 	http? ( dev-libs/gmime:2.4 )
 	iconv? ( virtual/libiconv )
 	jabber? ( dev-libs/iksemel )
@@ -115,6 +114,7 @@ src_configure() {
 
 	# 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
@@ -185,11 +185,6 @@ src_configure() {
 	else
 		menuselect/menuselect --disable chan_gtalk menuselect.makeopts
 	fi
-	if use h323; then
-		menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-	fi
 	if use http; then
 		menuselect/menuselect --enable res_http_post menuselect.makeopts
 	else
diff --git a/net-misc/asterisk/asterisk-1.8.7.0.ebuild b/net-misc/asterisk/asterisk-1.8.7.0.ebuild
index b78826fda364..00858742361f 100644
--- a/net-misc/asterisk/asterisk-1.8.7.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.7.0.ebuild,v 1.1 2011/10/04 09:59:12 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.7.0.ebuild,v 1.2 2011/10/11 15:20:11 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk h323 http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
+IUSE="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 snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
 
 EPATCH_SUFFIX="patch"
 PATCHES=( "${WORKDIR}/asterisk-patchset" )
@@ -34,7 +34,6 @@ RDEPEND="dev-libs/popt
 		net-misc/dahdi-tools )
 	freetds? ( dev-db/freetds )
 	gtalk? ( dev-libs/iksemel )
-	h323? ( net-libs/openh323 )
 	http? ( dev-libs/gmime:2.4 )
 	iconv? ( virtual/libiconv )
 	jabber? ( dev-libs/iksemel )
@@ -115,6 +114,7 @@ src_configure() {
 
 	# 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
@@ -185,11 +185,6 @@ src_configure() {
 	else
 		menuselect/menuselect --disable chan_gtalk menuselect.makeopts
 	fi
-	if use h323; then
-		menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-	fi
 	if use http; then
 		menuselect/menuselect --enable res_http_post menuselect.makeopts
 	else
diff --git a/net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild b/net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild
index 8abfc55cd030..e8dae4f9d222 100644
--- a/net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild,v 1.1 2011/09/22 13:06:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.7.0_rc2.ebuild,v 1.2 2011/10/11 15:20:11 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk h323 http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
+IUSE="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 snmp span speex ssl sqlite sqlite3 srtp static syslog usb vorbis"
 
 EPATCH_SUFFIX="patch"
 PATCHES=( "${WORKDIR}/asterisk-patchset" )
@@ -34,7 +34,6 @@ RDEPEND="dev-libs/popt
 		net-misc/dahdi-tools )
 	freetds? ( dev-db/freetds )
 	gtalk? ( dev-libs/iksemel )
-	h323? ( net-libs/openh323 )
 	http? ( dev-libs/gmime:2.4 )
 	iconv? ( virtual/libiconv )
 	jabber? ( dev-libs/iksemel )
@@ -115,6 +114,7 @@ src_configure() {
 
 	# 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
@@ -185,11 +185,6 @@ src_configure() {
 	else
 		menuselect/menuselect --disable chan_gtalk menuselect.makeopts
 	fi
-	if use h323; then
-		menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
-	else
-		menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-	fi
 	if use http; then
 		menuselect/menuselect --enable res_http_post menuselect.makeopts
 	else