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
commite395afba4b4724efe48b94c4e83b958a2f9906f5 (patch)
treec130f1881fec5a4ddfbf9ab709dfc11582552a33 /net-libs/ptlib
parentAdd the bundled-libs USE flag, fix bug #280772 (properly specify liblua depen... (diff)
downloadhistorical-e395afba4b4724efe48b94c4e83b958a2f9906f5.tar.gz
historical-e395afba4b4724efe48b94c4e83b958a2f9906f5.tar.bz2
historical-e395afba4b4724efe48b94c4e83b958a2f9906f5.zip
Only apply vxml-ptones patch if vxml is enabled dtmf is disabled.
Thanks to Matthias Raffelsieper. Package-Manager: portage-14103-svn/cvs/Linux ppc
Diffstat (limited to 'net-libs/ptlib')
-rw-r--r--net-libs/ptlib/ChangeLog6
-rw-r--r--net-libs/ptlib/Manifest4
-rw-r--r--net-libs/ptlib/ptlib-2.6.4-r1.ebuild6
3 files changed, 11 insertions, 5 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/Manifest b/net-libs/ptlib/Manifest
index 113889e610e1..7024aecb77f1 100644
--- a/net-libs/ptlib/Manifest
+++ b/net-libs/ptlib/Manifest
@@ -1,6 +1,6 @@
AUX ptlib-2.6.4-vxml-ptones.patch 250 RMD160 b7eddb71af5d331ab104045c47d763bec1933434 SHA1 e7e586d16a13de169447a392662056549ff84912 SHA256 9d678b1439184728eb28ef7495816c59504b16a5bbc90e978f27f590666f865c
DIST ptlib-2.6.4-htmldoc.tar.bz2 2089282 RMD160 67113ef082fa05ed10874c438d007fccf4aa864b SHA1 f2d53729a7cbf1e2e909fc62ed30e220a10b2fcc SHA256 588ee9c090e6d5f082cca7c11a51d29b563a6d46ed259f13c398820a89f78d8c
DIST ptlib-2.6.4.tar.bz2 3302374 RMD160 53d0ea4b67438f61f86fd0d8b68959ef0aa18342 SHA1 2808a7546c354c1b6c140667a91da6f79a98f5c9 SHA256 22eae4f6c72247f8ac79c57ce4469797ad3df67614758c5096b7ce9290bd10b4
-EBUILD ptlib-2.6.4-r1.ebuild 7305 RMD160 5c89ade91e5e3b49816366d6d06549da94111151 SHA1 9a8101b811ea173041214e9c26db3862b0f48f17 SHA256 178900035ca0f60b7c696879f812788ede3251c9b2dbca6f729cef7614dec6e1
-MISC ChangeLog 2030 RMD160 55ea31d5775d7ada8abaa00d6009085a3d247975 SHA1 4cd84b0cdd067d8a9a3171f04fa00de4f2c9646e SHA256 091ee55e4cb90317282a417eb5bb892b219623b52d2c8350d994419499df260a
+EBUILD ptlib-2.6.4-r1.ebuild 7343 RMD160 84c8924ebe4643b6de1e2a5e2d8ac13d324c7dbb SHA1 d70ac6ae1f28ddd2c4262dfb5b625ed3d3ae0c65 SHA256 506ddfb38efcb56e28df30f87915f84d4e69b65ac5ff9e3e069c8a9097191b1d
+MISC ChangeLog 2208 RMD160 b0673f28fd0f6bd434a678933602bf6e620b89b2 SHA1 404ed7ed7125b7ad07eb55ad4f17782ff9239b45 SHA256 7fec135ddfa313112b9cc20a300b24592e33a4e43bf8278287ef22d2c68ed589
MISC metadata.xml 1160 RMD160 b259b8631049719fe5c9aed02f15b95232860d41 SHA1 78af21a8a19d1d988329da8a70babd744a4e0e6c SHA256 91aa203d63993f44e881c8ee7908d49596ddd1c03b89ea5b041ac86e2877fdb7
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() {