diff options
author | 2013-06-17 23:55:33 +0000 | |
---|---|---|
committer | 2013-06-17 23:55:33 +0000 | |
commit | 533b20e9dba5e5f66c3ee6dfce12cd7b9bd0f189 (patch) | |
tree | 8ddb82ab0de2cf75f602c1f7b16fb5d844dca90a /www-client | |
parent | Add to tree from kde overlay (diff) | |
download | gentoo-2-533b20e9dba5e5f66c3ee6dfce12cd7b9bd0f189.tar.gz gentoo-2-533b20e9dba5e5f66c3ee6dfce12cd7b9bd0f189.tar.bz2 gentoo-2-533b20e9dba5e5f66c3ee6dfce12cd7b9bd0f189.zip |
Allow speech-dispatcher-0.7* to be used for chromium-28.
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/ChangeLog | 5 | ||||
-rw-r--r-- | www-client/chromium/chromium-28.0.1500.45.ebuild | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 5112f1830ba3..3f14b8d4ac36 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/chromium # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.897 2013/06/13 02:50:03 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.898 2013/06/17 23:55:33 floppym Exp $ + + 17 Jun 2013; Mike Gilbert <floppym@gentoo.org> chromium-28.0.1500.45.ebuild: + Allow speech-dispatcher-0.7* to be used for chromium-28. *chromium-28.0.1500.45 (13 Jun 2013) diff --git a/www-client/chromium/chromium-28.0.1500.45.ebuild b/www-client/chromium/chromium-28.0.1500.45.ebuild index 76884773d4df..7749b907fae6 100644 --- a/www-client/chromium/chromium-28.0.1500.45.ebuild +++ b/www-client/chromium/chromium-28.0.1500.45.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1500.45.ebuild,v 1.1 2013/06/13 02:50:03 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1500.45.ebuild,v 1.2 2013/06/17 23:55:33 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -25,7 +25,7 @@ IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-f # Native Client binaries are compiled with different set of flags, bug #452066. QA_FLAGS_IGNORED=".*\.nexe" -RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= +RDEPEND="app-accessibility/speech-dispatcher:= app-arch/bzip2:= app-arch/snappy:= system-sqlite? ( dev-db/sqlite:3 ) @@ -287,8 +287,13 @@ src_configure() { myconf+=" -Dlinux_link_gsettings=1 -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlibspeechd_h_prefix=speech-dispatcher/" + -Dlinux_link_libspeechd=1" + + if has_version '>=app-accessibility/speech-dispatcher-0.8'; then + myconf+=" -Dlibspeechd_h_prefix=speech-dispatcher/" + else + myconf+=" -Dlibspeechd_h_prefix=" + fi # TODO: use the file at run time instead of effectively compiling it in. myconf+=" |