summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2009-12-12 15:05:34 +0000
committerTony Vroon <chainsaw@gentoo.org>2009-12-12 15:05:34 +0000
commit236c9382a3e91af49594ddaae26b20a2334bdb84 (patch)
tree1430c2ce3e85597e3741c8a22dc95bf601d2332a /net-misc/asterisk
parentVersion bump (diff)
downloadhistorical-236c9382a3e91af49594ddaae26b20a2334bdb84.tar.gz
historical-236c9382a3e91af49594ddaae26b20a2334bdb84.tar.bz2
historical-236c9382a3e91af49594ddaae26b20a2334bdb84.zip
Block net-misc/asterisk-chan_unistim as this channel driver is built into this newer Asterisk version. File collision found and reported by Diego E. "Flameeyes" Pettenò.
Package-Manager: portage-2.2_rc58/cvs/Linux x86_64
Diffstat (limited to 'net-misc/asterisk')
-rw-r--r--net-misc/asterisk/ChangeLog7
-rw-r--r--net-misc/asterisk/Manifest14
-rw-r--r--net-misc/asterisk/asterisk-1.6.1.11.ebuild3
3 files changed, 20 insertions, 4 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index a7b3a2aea97b..1400ec0f7805 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/asterisk
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.233 2009/12/09 18:49:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.234 2009/12/12 15:05:34 chainsaw Exp $
+
+ 12 Dec 2009; <chainsaw@gentoo.org> asterisk-1.6.1.11.ebuild:
+ Block net-misc/asterisk-chan_unistim as this channel driver is built into
+ this newer Asterisk version. File collision found and reported by Diego E.
+ "Flameeyes" Pettenò.
09 Dec 2009; Raúl Porcel <armin76@gentoo.org> asterisk-1.2.37.ebuild:
alpha/sparc stable wrt #295270
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 4a1db8047033..407b766b77ad 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 1.0.0/asterisk-1.0.5-uclibc-dns.diff 304 RMD160 6d58a0fdad04f5105c1b8f8bb3e2058b4f97f12f SHA1 5f7819a1e5f5b8f035146d5506bab83f4ecb6ae0 SHA256 e4de36e528b7d1a7941689d530d93f1ffd41a2f863a856e612e3637f78ea4890
AUX 1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317 RMD160 f598d94a52cec83fefdafdce0694049c657e09e0 SHA1 fc0f4d990e386d39d43bac073f353421063186c9 SHA256 61daa70727418dbaf232fc5d1eaddd20a8505b943b8fb724a1b63170edfe88cc
AUX 1.2.0/asterisk-1.2.21.1-h323-dumb-makefile.diff 1098 RMD160 c39cee5a6f420e6e63e30ac5e83aa9b78c1b12c8 SHA1 93087ecdcde11bd983d25acaac3723450abbc111 SHA256 86d0c8cd754754916c45d77d9c745d1688b3b7b54181ecb1d42a1934bdea7deb
@@ -27,6 +30,13 @@ DIST asterisk-1.6.1.11.tar.gz 23416739 RMD160 66e91876a107cb3df19f75535ab3485ed4
EBUILD asterisk-1.2.35.ebuild 11046 RMD160 cfa9bcba00b90a4dd29b24801c88e0edd08d3fa8 SHA1 20c166e3a3666cea6f2981914a6d578e86a03c3c SHA256 e3a181d565a3b8e6609c3f15d1f93eeec99a5aef989eda35e233494efdf172b2
EBUILD asterisk-1.2.36.ebuild 10642 RMD160 4012363919df4bf1dd922ddd548ae2b80bf8b83c SHA1 781e05d8221d9adfd25479bd735ea41416ebbe98 SHA256 2527501e141a494df5a01e5b4916ad656507908a05fec96084d48b56a16dba21
EBUILD asterisk-1.2.37.ebuild 10642 RMD160 eab802092b11029c2d725440728379c0c0974f31 SHA1 54d634caba7c7777c841f13bd4c78402e31f53a4 SHA256 503defdc6420b2a276f1da8256d6c89335a12a264a9083ec566b993944bf2e11
-EBUILD asterisk-1.6.1.11.ebuild 10838 RMD160 92f6f9971268f61b986bebe354e6923ef5fffc13 SHA1 652f0549ddf9c9746d958a62a86d28272f6b7638 SHA256 024a0aeec6679966fd557f5d3685d942e205fa216b20dfeadb11f9ab3e8451a0
-MISC ChangeLog 50895 RMD160 7b9b9dbb5a5204044813c937535cf77132078c78 SHA1 fae28ff8aee80d4bf74c6a007b992ba7b25880a2 SHA256 d67a1fdc43b3e476974e056b295796583e40a47f60b25d100e75d27d54ed4e87
+EBUILD asterisk-1.6.1.11.ebuild 10871 RMD160 52c97f166dda079954cfd994ff013e53fc00f1f6 SHA1 dd3d89aae68976c85043311f1dd44841f2cf90d6 SHA256 6eecd594e645605c688aef99dac0e3900a5d1fb035ef7c4ad6f52f8544b7e3e1
+MISC ChangeLog 51137 RMD160 6e20e59d44aef093b44a6340fcb7e542035ac06c SHA1 0a70f4453e938a35e6dd70901b4450499183a394 SHA256 1342a02ab139fa0779e46ee6e350951d1a76c30c4ac596345eeb5303d87134f8
MISC metadata.xml 1185 RMD160 eb12d6782abb8afd1c4eced97537a3528f960839 SHA1 80f58a977e41229cf37ee2cb5820e1cc29e517bc SHA256 4f1f9a977fac87bc22bc782cb30e4e7952e9772685d3424c69a514de3be5d0d3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksjsWAACgkQp5vW4rUFj5oAVACfcPWg5s/v/i3VJDkuefBflwTO
+T8EAoKTJdg916ChTWIIyVDM753i2uely
+=Y99J
+-----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.6.1.11.ebuild b/net-misc/asterisk/asterisk-1.6.1.11.ebuild
index a0157bd8e6c1..cab78b24c7bd 100644
--- a/net-misc/asterisk/asterisk-1.6.1.11.ebuild
+++ b/net-misc/asterisk/asterisk-1.6.1.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.11.ebuild,v 1.1 2009/12/01 10:39:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.1.11.ebuild,v 1.2 2009/12/12 15:05:34 chainsaw Exp $
EAPI=1
inherit eutils autotools
@@ -42,6 +42,7 @@ RDEPEND="sys-libs/ncurses
DEPEND="${RDEPEND}
!<net-misc/asterisk-addons-1.6
+ !net-misc/asterisk-chan_unistim
!net-misc/zaptel"
S="${WORKDIR}/${MY_P}"