Explicitly block against the abandoned net-libs/openh323 package in the tree. Closes...

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 45fa3b0a0aaa093ee9dcb6220b2067c33d997cfd..c6ebd54d29266217e0c4a11fc42d641112d97c29 100644 (file)
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.343 2011/09/01 14:09:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.344 2011/09/20 07:48:58 chainsaw Exp $
+
+  20 Sep 2011; Tony Vroon <chainsaw@gentoo.org> asterisk-1.8.5.0-r3.ebuild,
+  asterisk-1.8.6.0.ebuild:
+  Explicitly block against the abandoned net-libs/openh323 package in the tree.
+  Closes bug #345635 by Grigoriy Puzankin and bug #383629 by Aidan Marks.
 
 *asterisk-1.8.6.0 (01 Sep 2011)
 

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9a18bdc50c9469015b4adfef0187511a0fc03343..7a5a3a7dccb50e914ad9e88dd171f14cf04cddfc 100644 (file)
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -15,14 +15,14 @@ DIST asterisk-1.8.5.0.tar.gz 27417584 RMD160 c841993f914bd150696b9163a1cc1d1828f
 DIST asterisk-1.8.6.0.tar.gz 27753713 RMD160 687a3668f2fd6e1005d32b85ab33250832049a21 SHA1 65f1a43b0ed7b3df4536cc63e5e79f631f302eff SHA256 dd6a489a8d89a147a18e5b7ee74eb44835459a7bd14786b8a114f3052066636b
 DIST gentoo-asterisk-patchset-1.1.tar.bz2 11344 RMD160 b4bf8aefd32a1a3359f5056c4df0d86818ec68c1 SHA1 65e8d104d270438f104022e9782033e525577430 SHA256 41d9939d02db41d82140008a31945bb95c346bed6b451166b2d28974ed9d6fe8
 DIST gentoo-asterisk-patchset-1.2.tar.bz2 10624 RMD160 749a14b673d9df07f36f4aebcf9fdd85ff69b579 SHA1 607d28d62f77d5b4b17c0cc436b45b7a1aa196e1 SHA256 591618545dc20f08faf57bacca9457c18cc845bd38e3e6cfe403b2802efeeb44
-EBUILD asterisk-1.8.5.0-r3.ebuild 14629 RMD160 9287fb4acc9f8df5381b1a9af215e920180b28f9 SHA1 760dbbf97588f4563abb63c7ee590894637eb0da SHA256 15d26ccae276dd60dd03b77f3c913f7a43a56a5cb3a5e08037eada8d5957069e
-EBUILD asterisk-1.8.6.0.ebuild 14519 RMD160 71132b7137a19f1c23458af2063276c8a721038d SHA1 f157b0df26dfe7e7cf85e9e9e3d43d0744393ee8 SHA256 6527cde8a91f5585e4fc43a2024dc101fa329c49032fcc37f15308f87c1267f2
-MISC ChangeLog 86822 RMD160 21a3615d21db14b18adef131b9ad3db8977c7b7c SHA1 3304cbc96c5344f670b8670d1852d1abc1179acb SHA256 0675eef3875836351575f61e116e559a8723ab262e04bd2a05f93d9532525c8a
+EBUILD asterisk-1.8.5.0-r3.ebuild 14574 RMD160 167f9de584619a145a41b48853c8974f9aaa30ed SHA1 55bf9a6f034c0e1992f1079b24221a97f45bba00 SHA256 0d698934dacb0c694dd3540e9c0d502b7c5793eb6a29f04f740df8064eb5829b
+EBUILD asterisk-1.8.6.0.ebuild 14461 RMD160 ac806afbf18a4abaa223b6a644085a461a97ce12 SHA1 bb71f4999b08bf50012da25fb1b8fdbc7f532ea9 SHA256 9d4764be14fea8c0de761ce7b815a51e6e66bb6d261162044d5cf7a100691cc7
+MISC ChangeLog 87080 RMD160 f0b30336ad27ad81a4ee590c9e2f1d13af112df9 SHA1 0b470d75546c407dda04001a3195fd83e4786069 SHA256 53119eb2c0ed1c6d36ecfa6945f388df4f3a4c275dbc4765bde9a639915fee3b
 MISC metadata.xml 1104 RMD160 5b90405c685bc1c0ee173b3024afab5bc849bf40 SHA1 bf76dd265acf32efba9e4e8189ae154a4b9ebd40 SHA256 17e96f326cd60399fb217025567ae4c80f1b9b12418f1bf5b41c8fa4c49598ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5fkj0ACgkQp5vW4rUFj5oF2wCfR1bk8tIXQDYuU8hPy7mdR4fp
-r00AoIevL/OmDiprX/2nUQRZ4bDhyWXM
-=G4Lk
+iEYEARECAAYFAk54RXYACgkQp5vW4rUFj5qchQCeN3jV60nRXWfEdwMehcO++SR/
+fgQAn09Rr7XOOozBjLbwdYr5a1+Dqs+f
+=wUFD
 -----END PGP SIGNATURE-----

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 677d273f85f8aa1b582422e077423264fd044062..b428954dfbefb6cdec41503926f6ca7a7b50866a 100644 (file)
--- 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.4 2011/08/28 18:39:57 pacho Exp $
+# $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 $
 
 EAPI=3
 inherit autotools base eutils linux-info multilib
@@ -63,9 +63,7 @@ RDEPEND="sys-libs/ncurses
        vorbis? ( media-libs/libvorbis )"
 
 DEPEND="${RDEPEND}
-       !net-misc/asterisk-addons
-       !net-misc/asterisk-chan_unistim
-       !net-misc/zaptel"
+       !net-libs/openh323"
 
 RDEPEND="${RDEPEND}
        syslog? ( virtual/logger )"

diff --git a/net-misc/asterisk/asterisk-1.8.6.0.ebuild b/net-misc/asterisk/asterisk-1.8.6.0.ebuild
index de92a6fe0324845deefb480b17a716d78343fa32..cd7d3d78bf7ad6ce745dde31bd360fa93be446c0 100644 (file)
--- 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.1 2011/09/01 14:09:56 chainsaw Exp $
+# $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 $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -61,9 +61,7 @@ RDEPEND="dev-libs/popt
        vorbis? ( media-libs/libvorbis )"
 
 DEPEND="${RDEPEND}
-       !net-misc/asterisk-addons
-       !net-misc/asterisk-chan_unistim
-       !net-misc/zaptel"
+       !net-libs/openh323"
 
 RDEPEND="${RDEPEND}
        syslog? ( virtual/logger )"