diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2009-12-12 15:05:34 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2009-12-12 15:05:34 +0000 |
| commit | d054128e35015a535cbe22c2b99bea83d81255c6 (patch) | |
| tree | bf25def4bf875bbeff23efa9adf7dffb502468dd /net-misc/asterisk | |
| parent | Version bump (diff) | |
| download | gentoo-2-d054128e35015a535cbe22c2b99bea83d81255c6.tar.gz gentoo-2-d054128e35015a535cbe22c2b99bea83d81255c6.tar.bz2 gentoo-2-d054128e35015a535cbe22c2b99bea83d81255c6.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ò.
(Portage version: 2.2_rc58/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/asterisk')
| -rw-r--r-- | net-misc/asterisk/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/asterisk/asterisk-1.6.1.11.ebuild | 3 |
2 files changed, 8 insertions, 2 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/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}" |