Apply correction to REQUIRED_USE, bug #416245.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 12 insertions, 8 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index ba34e2b9738d..b3d71418f551 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.390 2012/05/08 14:39:34 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.391 2012/05/16 11:52:19 chithanh Exp $
+
+  16 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  asterisk-1.8.12.0.ebuild, asterisk-10.4.0.ebuild:
+  Apply correction to REQUIRED_USE, bug #416245.
 
   08 May 2012; Tony Vroon <chainsaw@gentoo.org> asterisk-1.8.12.0.ebuild,
   asterisk-10.4.0.ebuild:
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9b4ae99a88fa..d0f5d1aeec08 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -16,8 +16,8 @@ DIST gentoo-asterisk-patchset-1.12.tar.bz2 30340 RMD160 b4e65e60f98cb5d125ecf6ca
 DIST gentoo-asterisk-patchset-2.3.tar.bz2 7254 RMD160 e033ee4e9bacaee2a1a652651f761e124ea1572e SHA1 76ee692b579bdf7af2999c0afaef67e49bdfcb4a SHA256 a111d7d4d41264636bccdccda29715ce799fefae37bb52587ff39c871e0a7fbb
 DIST gentoo-asterisk-patchset-2.4.tar.bz2 7083 RMD160 0d82c7837ea6008dc442168af841ab00cc79a57c SHA1 750bfca96e7c8695cb82988b4c0da92409f0ce3e SHA256 fb26b569ea2cf020d5da0957856a6b5c8fbdfd083ad09b39c8cec2a8807814a2
 EBUILD asterisk-1.8.11.1.ebuild 8468 RMD160 3c41a0192dff559d295317af407a34b81aeeafc3 SHA1 3259ec55f1ebf493c2fe310f8e800de8fe65bde5 SHA256 5285a0c6c1cb5b704444e8d67559ea1a3c02e1a7aa8b14377e95c8f88a7b7718
-EBUILD asterisk-1.8.12.0.ebuild 8507 RMD160 04d716f296d835ff475127ea7a85a9277a7f4463 SHA1 f5546557be86fb44f98ad02f1a78125dcda71fd7 SHA256 e2487d665eeb59239ed7c29e6377df150c5fb9b89a723e7407cbad501ca61b22
+EBUILD asterisk-1.8.12.0.ebuild 8508 RMD160 acd6ba274042554f39c82b44210f42d66a5d417f SHA1 3388bd6b918023b9677f0245549c9c26ccc98e87 SHA256 eb4a534a1059ac48e132f336b16b7d15877849cd5fac09fb7232f8283cab11ca
 EBUILD asterisk-10.3.1.ebuild 8550 RMD160 61cb696216b604e97bf489486304e58fc1468db9 SHA1 6a36dcdd77e48d9e6f8303e3b1a37069575c8d04 SHA256 09b09f717d63c23835b6a095a5def29b6212d2542de45432f2940962f723482f
-EBUILD asterisk-10.4.0.ebuild 8582 RMD160 bbe2da8e2984a15a4964be7a6f91d625870ec634 SHA1 ebdf6816dfb0056c24d47fe455c034190c6ad9ff SHA256 06dea216a4163740a4aa70463987cf1623607e65ae71d87e604fe56970a817e1
-MISC ChangeLog 101142 RMD160 555b3fa715b6938ff0ed696bff16cb8e0ba06b23 SHA1 949014e341385d2294faa574f5a9db6c8ff3e8f7 SHA256 200171a7255afd8c3ec404bbc3ee41802bdc985f3212a0c5c4fd18859e045f11
+EBUILD asterisk-10.4.0.ebuild 8583 RMD160 a4d08c8c24707faab5699d82da995c3716a0b583 SHA1 31c0fea3ed14bc051681fa4c7645084a526b605a SHA256 1bc683ed5f802ca2b58e4fa5c0189b5ea22ddb2d6aadac7c1d1fd69569f51b9b
+MISC ChangeLog 101313 RMD160 a311e8e78444df4ec6c85b1d053df1ed54d2bf0c SHA1 da12c02c1fdafe57efd7abe9d063b03c2a921460 SHA256 1c0dfa47026f42363552d1178cd815493497c188e6ed05b33cdf1cbd5dfdc00e
 MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
diff --git a/net-misc/asterisk/asterisk-1.8.12.0.ebuild b/net-misc/asterisk/asterisk-1.8.12.0.ebuild
index 934d52a32c77..12433c01ecdf 100644
--- a/net-misc/asterisk/asterisk-1.8.12.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.12.0.ebuild,v 1.2 2012/05/08 14:39:34 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.12.0.ebuild,v 1.3 2012/05/16 11:52:19 chithanh Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 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 sqlite sqlite3 srtp static syslog usb vorbis"
-REQUIRED_USE="gtalk ( jabber )"
+REQUIRED_USE="gtalk? ( jabber )"
 
 EPATCH_SUFFIX="patch"
 PATCHES=( "${WORKDIR}/asterisk-patchset" )
diff --git a/net-misc/asterisk/asterisk-10.4.0.ebuild b/net-misc/asterisk/asterisk-10.4.0.ebuild
index 5f364d18301d..5b8376895d2c 100644
--- a/net-misc/asterisk/asterisk-10.4.0.ebuild
+++ b/net-misc/asterisk/asterisk-10.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.4.0.ebuild,v 1.2 2012/05/08 14:39:34 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.4.0.ebuild,v 1.3 2012/05/16 11:52:19 chithanh Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 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 srtp static syslog usb vorbis"
-REQUIRED_USE="gtalk ( jabber )"
+REQUIRED_USE="gtalk? ( jabber )"
 
 EPATCH_SUFFIX="patch"
 PATCHES=( "${WORKDIR}/asterisk-patchset" )