diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-01-28 09:52:27 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-01-28 09:52:27 +0000 |
| commit | cec6c28f5e7f5e0be6ac12a7d21f557c32c0d2cd (patch) | |
| tree | 781de3636e51ca3aafde70faea498ec8ad3cd268 /www-client | |
| parent | EAPI3 (diff) | |
| download | gentoo-2-cec6c28f5e7f5e0be6ac12a7d21f557c32c0d2cd.tar.gz gentoo-2-cec6c28f5e7f5e0be6ac12a7d21f557c32c0d2cd.tar.bz2 gentoo-2-cec6c28f5e7f5e0be6ac12a7d21f557c32c0d2cd.zip | |
Remove system-sqlite USE flag, it's broken upstream. Bug #352892 by fkhp <fkhp101@tom.com>.
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 19 |
2 files changed, 8 insertions, 17 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 8e40e85e2372..a6f490f55450 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/chromium # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.268 2011/01/27 10:46:25 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.269 2011/01/28 09:52:27 phajdan.jr Exp $ + + 28 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild: + Remove system-sqlite USE flag, it's broken upstream. Bug #352892 by fkhp + <fkhp101@tom.com>. *chromium-10.0.648.6 (27 Jan 2011) diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index 91b5bda39674..a9123019edec 100644 --- a/www-client/chromium/chromium-9999.ebuild +++ b/www-client/chromium/chromium-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.128 2011/01/22 16:18:21 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.129 2011/01/28 09:52:27 phajdan.jr Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -17,12 +17,9 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite" +IUSE="cups +gecko-mediaplayer gnome gnome-keyring" RDEPEND="app-arch/bzip2 - system-sqlite? ( - >=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe] - ) dev-lang/v8 dev-libs/dbus-glib >=dev-libs/icu-4.4.1 @@ -198,13 +195,6 @@ src_prepare() { rmdir v8/include || die ln -s /usr/include v8/include || die - if use system-sqlite; then - # Remove bundled sqlite, preserving the shim header. - find third_party/sqlite -type f \! -iname '*.gyp*' \ - \! -path 'third_party/sqlite/sqlite3.h' \ - -delete || die - fi - # Make sure the build system will use the right python, bug #344367. # Only convert directories that need it, to save time. python_convert_shebangs -q -r 2 build tools @@ -220,6 +210,7 @@ src_configure() { # Use system-provided libraries. # TODO: use_system_hunspell (upstream changes needed). # TODO: use_system_ssl (need to consult upstream). + # TODO: use_system_sqlite (http://crbug.com/22208). myconf+=" -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 @@ -234,10 +225,6 @@ src_configure() { -Duse_system_xdg_utils=1 -Duse_system_zlib=1" - if use system-sqlite; then - myconf+=" -Duse_system_sqlite=1" - fi - # The dependency on cups is optional, see bug #324105. if use cups; then myconf+=" -Duse_cups=1" |