summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-06-08 17:23:52 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-06-08 17:23:52 +0000
commite03a3783f979fa73f9940490b9d459ed48780cc9 (patch)
treeb629a2af941063928b281c1c21be1401fa91de0d /www-client
parentVersion bump with new config file (diff)
downloadgentoo-2-e03a3783f979fa73f9940490b9d459ed48780cc9.tar.gz
gentoo-2-e03a3783f979fa73f9940490b9d459ed48780cc9.tar.bz2
gentoo-2-e03a3783f979fa73f9940490b9d459ed48780cc9.zip
Version bump for dev channel release. Remove old.
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-21.0.1163.0.ebuild (renamed from www-client/chromium/chromium-21.0.1145.0-r1.ebuild)13
2 files changed, 14 insertions, 7 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index b3cc562480c1..a4829374ccd3 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.652 2012/06/07 01:56:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.653 2012/06/08 17:23:52 phajdan.jr Exp $
+
+*chromium-21.0.1163.0 (08 Jun 2012)
+
+ 08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-21.0.1145.0-r1.ebuild, +chromium-21.0.1163.0.ebuild:
+ Version bump for dev channel release. Remove old.
*chromium-20.0.1132.27 (07 Jun 2012)
diff --git a/www-client/chromium/chromium-21.0.1145.0-r1.ebuild b/www-client/chromium/chromium-21.0.1163.0.ebuild
index cb73cb50c01c..9313fcfe86ef 100644
--- a/www-client/chromium/chromium-21.0.1145.0-r1.ebuild
+++ b/www-client/chromium/chromium-21.0.1163.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1145.0-r1.ebuild,v 1.1 2012/05/27 14:57:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1163.0.ebuild,v 1.1 2012/06/08 17:23:52 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -29,6 +29,7 @@ RDEPEND="app-arch/bzip2
>=dev-lang/v8-3.10.2.1
dev-libs/dbus-glib
dev-libs/elfutils
+ dev-libs/expat
>=dev-libs/icu-49.1.1-r1
>=dev-libs/libevent-1.4.13
dev-libs/libxml2[icu]
@@ -90,7 +91,9 @@ pkg_setup() {
python_set_active_version 2
python_pkg_setup
- chromium_check_kernel_config
+ if ! use selinux; then
+ chromium_suid_sandbox_check_kernel_config
+ fi
if use bindist; then
elog "bindist enabled: H.264 video support will be disabled."
@@ -107,9 +110,8 @@ src_prepare() {
sed -i '1i#define OF(x) x' \
third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
- epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
-
- epatch "${FILESDIR}/${PN}-zlib-r0.patch"
+ # Unbundle expat, bug #384773.
+ epatch "${FILESDIR}/${PN}-expat-r0.patch"
epatch_user
@@ -119,7 +121,6 @@ src_prepare() {
\! -path 'third_party/angle/*' \
\! -path 'third_party/cacheinvalidation/*' \
\! -path 'third_party/cld/*' \
- \! -path 'third_party/expat/*' \
\! -path 'third_party/ffmpeg/*' \
\! -path 'third_party/flac/flac.h' \
\! -path 'third_party/gpsd/*' \