diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-03-08 16:54:25 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-03-08 16:54:25 +0000 |
| commit | cc0a8d20e13a516aa965fc8c5f33c7d97d0b0040 (patch) | |
| tree | c490050561bbc4fd64b3095dadee17813e906e86 /www-client | |
| parent | Need to copy the .svn directory for 'svn info' (bug#455498). (diff) | |
| download | gentoo-2-cc0a8d20e13a516aa965fc8c5f33c7d97d0b0040.tar.gz gentoo-2-cc0a8d20e13a516aa965fc8c5f33c7d97d0b0040.tar.bz2 gentoo-2-cc0a8d20e13a516aa965fc8c5f33c7d97d0b0040.zip | |
Stable channel bump.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 8 | ||||
| -rw-r--r-- | www-client/chromium/chromium-25.0.1364.160.ebuild (renamed from www-client/chromium/chromium-25.0.1364.97.ebuild) | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index aa6e18329add..f518c40d0e43 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # 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.834 2013/03/07 20:51:59 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.835 2013/03/08 16:54:25 floppym Exp $ + +*chromium-25.0.1364.160 (08 Mar 2013) + + 08 Mar 2013; Mike Gilbert <floppym@gentoo.org> +chromium-25.0.1364.160.ebuild, + -chromium-25.0.1364.97.ebuild: + Stable channel bump. 07 Mar 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-27.0.1430.0.ebuild, chromium-9999-r1.ebuild, metadata.xml: diff --git a/www-client/chromium/chromium-25.0.1364.97.ebuild b/www-client/chromium/chromium-25.0.1364.160.ebuild index 90fb5ec004b5..f71523dbfd75 100644 --- a/www-client/chromium/chromium-25.0.1364.97.ebuild +++ b/www-client/chromium/chromium-25.0.1364.160.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-25.0.1364.97.ebuild,v 1.3 2013/02/22 12:09:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.160.ebuild,v 1.1 2013/03/08 16:54:25 floppym Exp $ EAPI="5" PYTHON_DEPEND="2:2.6" @@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux system-ffmpeg tcmalloc" RDEPEND="app-accessibility/speech-dispatcher @@ -35,7 +35,7 @@ RDEPEND="app-accessibility/speech-dispatcher dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 - dev-libs/protobuf + dev-libs/protobuf:= gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 @@ -49,7 +49,6 @@ RDEPEND="app-accessibility/speech-dispatcher media-libs/speex pulseaudio? ( media-sound/pulseaudio ) system-ffmpeg? ( >=media-video/ffmpeg-1.0 ) - >=net-libs/libsrtp-1.4.4_p20121108 sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] @@ -183,6 +182,7 @@ src_prepare() { \! -path 'third_party/leveldatabase/*' \ \! -path 'third_party/libjingle/*' \ \! -path 'third_party/libphonenumber/*' \ + \! -path 'third_party/libsrtp/*' \ \! -path 'third_party/libusb/libusb.h' \ \! -path 'third_party/libvpx/libvpx.h' \ \! -path 'third_party/libxml/chromium/*' \ @@ -215,6 +215,7 @@ src_prepare() { \! -path 'third_party/webgl_conformance/*' \ \! -path 'third_party/webrtc/*' \ \! -path 'third_party/widevine/*' \ + \! -path 'third_party/x86inc/*' \ -delete || die # Remove bundled v8. @@ -262,7 +263,7 @@ src_configure() { -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 - -Duse_system_libsrtp=1 + -Duse_system_libsrtp=0 -Duse_system_libusb=1 -Duse_system_libvpx=1 -Duse_system_libwebp=1 |