summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir Lamouri <volkmar@gentoo.org>2009-09-26 10:45:42 +0000
committerMounir Lamouri <volkmar@gentoo.org>2009-09-26 10:45:42 +0000
commitf936659785326267e22f29f0c4ffe05b30e9cd6b (patch)
tree958c41264770ef2103f11b6cc469be4fa3266920 /net-libs
parentAdd the bundled-libs USE flag, fix bug #280772 (properly specify liblua depen... (diff)
downloadgentoo-2-f936659785326267e22f29f0c4ffe05b30e9cd6b.tar.gz
gentoo-2-f936659785326267e22f29f0c4ffe05b30e9cd6b.tar.bz2
gentoo-2-f936659785326267e22f29f0c4ffe05b30e9cd6b.zip
Only apply vxml-ptones patch if vxml is enabled dtmf is disabled.
Thanks to Matthias Raffelsieper. (Portage version: 14103-svn/cvs/Linux ppc)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/ptlib/ChangeLog6
-rw-r--r--net-libs/ptlib/ptlib-2.6.4-r1.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index 518948fa014b..2080b9ed9975 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/ptlib
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.12 2009/09/12 21:47:20 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.13 2009/09/26 10:45:42 volkmar Exp $
+
+ 24 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> ptlib-2.6.4-r1.ebuild:
+ Only apply vxml-ptones patch if vxml is enabled dtmf is disabled.
+ Thanks to Matthias Raffelsieper.
12 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> ptlib-2.6.4-r1.ebuild,
+files/ptlib-2.6.4-vxml-ptones.patch:
diff --git a/net-libs/ptlib/ptlib-2.6.4-r1.ebuild b/net-libs/ptlib/ptlib-2.6.4-r1.ebuild
index 151c4831dc6d..853800340191 100644
--- a/net-libs/ptlib/ptlib-2.6.4-r1.ebuild
+++ b/net-libs/ptlib/ptlib-2.6.4-r1.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-libs/ptlib/ptlib-2.6.4-r1.ebuild,v 1.2 2009/09/12 21:47:20 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.4-r1.ebuild,v 1.3 2009/09/26 10:45:42 volkmar Exp $
EAPI="2"
@@ -125,7 +125,9 @@ src_prepare() {
fi
# bug 283675, upstream bug 2857750
- epatch "${FILESDIR}"/${P}-vxml-ptones.patch
+ if use vxml && ! use dtmf; then
+ epatch "${FILESDIR}"/${P}-vxml-ptones.patch
+ fi
}
src_configure() {