Remove incorrect RDEPEND on Asterisk, initially noted by Oliver Jaksch. Causes circul...

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

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 0d2343217d3b6445cb457880506b90fb828b5509..147454e8d582d96334176c8c741a738db4238c39 100644 (file)
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dahdi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.3 2010/04/13 12:04:21 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.4 2010/04/14 11:36:39 chainsaw Exp $
+
+  14 Apr 2010; <chainsaw@gentoo.org> dahdi-2.2.1.1.ebuild:
+  Remove incorrect RDEPEND on Asterisk, initially noted by Oliver Jaksch.
+  Causes circular dependencies as pointed out by Kerin "kerframil" Miller in
+  bug #315201.
 
 *dahdi-2.2.1.1 (13 Apr 2010)
 

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 71c4f33bc96dc995da11c9f3566487c449fc3172..54f2339d6004d30c6c94fb85eec35f4b8a59caaa 100644 (file)
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -20,13 +20,13 @@ DIST dahdi-linux-2.2.1.1.tar.gz 1418259 RMD160 c7c17bb7def165cb6487baf421c7b7c06
 DIST gentoo-dahdi-patchset-0.1.tar.bz2 62493 RMD160 ce12f54ce29ebb62fc883aba17d2f2ac75bc1d02 SHA1 3f55307c64abc77b9ca3ac4f6786a042cfde54c2 SHA256 b1325c52bc29cc7c705d246c9c3df1cb58a521d466427fbedf9afb50e5fc878e
 EBUILD dahdi-2.1.0.4.ebuild 1997 RMD160 6cee82786f6d70d34cffd7c10bdfbabf36ac7ca4 SHA1 97324730a73be1589645610f3c1d4f0458cfcf13 SHA256 3f0b8c2e36d194bba640a3c11093c85de5f6aa40dec240aeaab7da48b17218db
 EBUILD dahdi-2.2.0.2.ebuild 2445 RMD160 28f9976748f7bd49fcaff9dc67adf074e8d3f21b SHA1 8d8a391ecdf236d75306cd1e7bfe588acc55aef5 SHA256 a180b4ede9d99a075b66a8eb3603ab5ca8820ffcdeea0edb5a4680761677acc9
-EBUILD dahdi-2.2.1.1.ebuild 1928 RMD160 d06d634d44011c2c5deff5cf03124ba35ad57267 SHA1 914a8b3e26fecbad9305097a9023fec53354f9e4 SHA256 2e840118fa5ce962de41db5a36123e83b66d0e9ea8a413011b0f188e124f78e3
-MISC ChangeLog 1635 RMD160 04a315dcf2433a00358da9c20d2007ac310ada20 SHA1 8fb27fc5bf46946bdc3d347686fa41b40c53d4bf SHA256 f541abd098e536fce1bc31a70a8cca4edd79a21e7388aedf11b02709fa10d225
+EBUILD dahdi-2.2.1.1.ebuild 1913 RMD160 0178a5f4dd14d6c9935497b09685b2c20205e1b7 SHA1 db054d7ba5c7906ca87f48eb3bea3791e80bdecb SHA256 ba0ecfca46aad4ce9a7709543ce27fe388d9f204ea0dd081f2b87c05e1cc78b5
+MISC ChangeLog 1861 RMD160 072a7912c0734db4eb9d29eedfe5f9aa042bf681 SHA1 327cbab45e0592cbb957b3cf0bc38244b51341bf SHA256 70b3da67475b2d15de23a62da8ea3080cb4f62b56f9d4aefcb01123ca9a6159c
 MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvEXcsACgkQp5vW4rUFj5oDFACguudYN88eOknzSMowN+ibw3hz
-7awAmwT3b5h1wVcj3qHkYWej7qStLgOv
-=fmQ7
+iEYEARECAAYFAkvFqM0ACgkQp5vW4rUFj5oV1wCeOrLr9qorhUh1Qyxw7wm3rHpB
+RFoAoKvKxnVQHl1MuQODZxRrhrZAvu5W
+=RygC
 -----END PGP SIGNATURE-----

diff --git a/net-misc/dahdi/dahdi-2.2.1.1.ebuild b/net-misc/dahdi/dahdi-2.2.1.1.ebuild
index 0ac63087b0f61ccc03238f581489b654a8ae718e..ac7da414780069e34a5730c952df9298363c402c 100644 (file)
--- a/net-misc/dahdi/dahdi-2.2.1.1.ebuild
+++ b/net-misc/dahdi/dahdi-2.2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.2.1.1.ebuild,v 1.1 2010/04/13 12:04:21 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.2.1.1.ebuild,v 1.2 2010/04/14 11:36:39 chainsaw Exp $
 
 EAPI=3
 
@@ -16,7 +16,7 @@ http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fwload-vpmad
 http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
 http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
 http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz
+http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz
 mirror://gentoo/gentoo-dahdi-patchset-0.1.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="net-misc/asterisk"
+RDEPEND=""
 
 EPATCH_SUFFIX="diff"
 PATCHES=( "${WORKDIR}/dahdi-patchset" )