summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2013-03-19 22:49:07 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2013-03-19 22:49:07 +0000
commit3ce7400419ea7b46c75546b3842af141eb2bc9fe (patch)
tree2a2f3f42c4b9565e9e5b34db85eadd2a5cc3bd4b /www-client
parentchanged the description in the ebuild (diff)
downloadgentoo-2-3ce7400419ea7b46c75546b3842af141eb2bc9fe.tar.gz
gentoo-2-3ce7400419ea7b46c75546b3842af141eb2bc9fe.tar.bz2
gentoo-2-3ce7400419ea7b46c75546b3842af141eb2bc9fe.zip
Dev channel bump. Remove old.
(Portage version: 2.1.11.52/cvs/Linux i686, signed Manifest commit with key 30427902)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog9
-rw-r--r--www-client/chromium/chromium-27.0.1444.3.ebuild (renamed from www-client/chromium/chromium-27.0.1430.0.ebuild)21
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild11
3 files changed, 23 insertions, 18 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 0fca185f1211..e8cc0beda89d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
# 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.848 2013/03/19 16:42:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.849 2013/03/19 22:49:07 phajdan.jr Exp $
+
+*chromium-27.0.1444.3 (19 Mar 2013)
+
+ 19 Mar 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-27.0.1430.0.ebuild, +chromium-27.0.1444.3.ebuild,
+ chromium-9999-r1.ebuild:
+ Dev channel bump. Remove old.
*chromium-26.0.1410.33-r1 (19 Mar 2013)
diff --git a/www-client/chromium/chromium-27.0.1430.0.ebuild b/www-client/chromium/chromium-27.0.1444.3.ebuild
index 3b00340ca8e5..ffb1d305984e 100644
--- a/www-client/chromium/chromium-27.0.1430.0.ebuild
+++ b/www-client/chromium/chromium-27.0.1444.3.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-27.0.1430.0.ebuild,v 1.6 2013/03/09 05:25:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1444.3.ebuild,v 1.1 2013/03/19 22:49:07 phajdan.jr Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
+IUSE="cups gnome gnome-keyring gps kerberos selinux system-sqlite tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -56,9 +56,8 @@ RDEPEND="app-accessibility/speech-dispatcher:=
!arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) )
media-libs/opus:=
media-libs/speex:=
- pulseaudio? ( media-sound/pulseaudio:= )
+ media-sound/pulseaudio:=
>=media-video/ffmpeg-1.0:=[opus]
- >=net-libs/libsrtp-1.4.4_p20121108:=
sys-apps/dbus:=
sys-apps/pciutils:=
sys-libs/zlib:=[minizip]
@@ -124,18 +123,18 @@ pkg_setup() {
src_prepare() {
if ! use arm; then
mkdir -p out/Release/obj/gen/sdk/toolchain || die
- cp -a /usr/$(get_libdir)/nacl-toolchain-newlib \
+ # Do not preserve SELinux context, bug #460892 .
+ cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die
touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
fi
- # Fix build without NaCl glibc toolchain.
- epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
-
epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
- epatch "${FILESDIR}/${PN}-system-v8-r0.patch"
epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
+ # Fix build issue with smhasher, bug #459126 .
+ epatch "${FILESDIR}/${PN}-smhasher-r0.patch"
+
epatch_user
# Remove most bundled libraries. Some are still needed.
@@ -155,6 +154,7 @@ src_prepare() {
\! -path 'third_party/leveldatabase/*' \
\! -path 'third_party/libjingle/*' \
\! -path 'third_party/libphonenumber/*' \
+ \! -path 'third_party/libsrtp/*' \
\! -path 'third_party/libxml/chromium/*' \
\! -path 'third_party/libXNVCtrl/*' \
\! -path 'third_party/libyuv/*' \
@@ -214,6 +214,7 @@ src_configure() {
# Use system-provided libraries.
# TODO: use_system_hunspell (upstream changes needed).
+ # TODO: use_system_libsrtp (bug #459932).
# TODO: use_system_ssl (http://crbug.com/58087).
# TODO: use_system_sqlite (http://crbug.com/22208).
myconf+="
@@ -226,7 +227,6 @@ src_configure() {
-Duse_system_libevent=1
-Duse_system_libjpeg=1
-Duse_system_libpng=1
- -Duse_system_libsrtp=1
-Duse_system_libusb=1
-Duse_system_libvpx=1
-Duse_system_libwebp=1
@@ -267,7 +267,6 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
- $(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
if use system-sqlite; then
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 4de68106d55e..7e6fbaa0f679 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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-9999-r1.ebuild,v 1.182 2013/03/13 23:27:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.183 2013/03/19 22:49:07 phajdan.jr Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -19,7 +19,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src"
LICENSE="BSD"
SLOT="live"
KEYWORDS=""
-IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
+IUSE="cups gnome gnome-keyring gps kerberos selinux system-sqlite tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -56,9 +56,8 @@ RDEPEND="app-accessibility/speech-dispatcher:=
!arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) )
media-libs/opus:=
media-libs/speex:=
- pulseaudio? ( media-sound/pulseaudio:= )
+ media-sound/pulseaudio:=
>=media-video/ffmpeg-1.0:=[opus]
- >=net-libs/libsrtp-1.4.4_p20121108:=
sys-apps/dbus:=
sys-apps/pciutils:=
sys-libs/zlib:=[minizip]
@@ -209,6 +208,7 @@ src_prepare() {
\! -path 'third_party/leveldatabase/*' \
\! -path 'third_party/libjingle/*' \
\! -path 'third_party/libphonenumber/*' \
+ \! -path 'third_party/libsrtp/*' \
\! -path 'third_party/libxml/chromium/*' \
\! -path 'third_party/libXNVCtrl/*' \
\! -path 'third_party/libyuv/*' \
@@ -272,6 +272,7 @@ src_configure() {
# Use system-provided libraries.
# TODO: use_system_hunspell (upstream changes needed).
+ # TODO: use_system_libsrtp (bug #459932).
# TODO: use_system_ssl (http://crbug.com/58087).
# TODO: use_system_sqlite (http://crbug.com/22208).
myconf+="
@@ -284,7 +285,6 @@ src_configure() {
-Duse_system_libevent=1
-Duse_system_libjpeg=1
-Duse_system_libpng=1
- -Duse_system_libsrtp=1
-Duse_system_libusb=1
-Duse_system_libvpx=1
-Duse_system_libwebp=1
@@ -325,7 +325,6 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
- $(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
if use system-sqlite; then