commit:     6051113dbbd90a8cbed3158979c064c1649c8ecb
Author:     Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 18:24:06 2017 +0000
Commit:     Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 18:47:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6051113d

www-client/chromium: dev channel bump (57.0.2979.0)

 www-client/chromium/Manifest                       |  2 +-
 ...0.2950.4.ebuild => chromium-57.0.2979.0.ebuild} | 50 ++++++++--------------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1f010d2..39a670c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-55.0.2883.75.tar.xz 511256096 SHA256 
5bcf7180935bebc7648f7e2577f612da681f7846127f79dac22630ded9984e55 SHA512 
9830b02e05ebaf120b02b11114c67196ba5c7f2d5aa917b9e5f8516b1f0cce1abd8e752c379e8ac1f16c7b7e451341486d9356d47a1b77b72ab5117390ce16b9
 WHIRLPOOL 
ab752b9e9a6c7a536424ac1384d9f0ad0f23dd40bbf6784e4185554602628e8e1f45acbb264fff33f7f00c8ee14f293bfaf23259d2db4f785c9c9c49e72b28eb
 DIST chromium-56.0.2924.21.tar.xz 513324284 SHA256 
08330d147a9340c593ac0255adac30e189e1e9ed99c43d148891058365b4182a SHA512 
acfc81177e5fdacc954cdc94b705079b8fdf19a7d90573b38b9a297eeb2d169325f460ce1ec14ea52cfa57782f818d733ece62c8ff313610730881efeba5afb7
 WHIRLPOOL 
cc2ed9362aa5f88d05e884e46897b919020044d7556c5c4217ddd527cf198d84c87d9d48281aa4d4dae94dc06490657fdcf2d9c5653f9eea3a33767e5383eac6
 DIST chromium-56.0.2924.59.tar.xz 513389580 SHA256 
3b34c4cef3a5017556064d246b14b69a8bd2277d8908a6e8b63c014d501ebac2 SHA512 
3ef43728e7ca9d5c1eb4b808bd8c0dbf37a3ee387c57d2826e39fed47ab6316e636b96fd2787c140601e87bd084df61093a85c5014e6151ca70c2e9619a1d52c
 WHIRLPOOL 
4d2f8ee6e7c5b1f3455ba9c25518178990e725dafcc75a3049a6fd5ddb17dfdf3b325c78478b7b3ca62fe7712e8e58e0f5f0f0944d32d99dc0819f99293268c0
-DIST chromium-57.0.2950.4.tar.xz 521653320 SHA256 
41a56ce7a89bfa0ee47039d18be1889781b78dfde88ad93ef19cabde20c5d8b6 SHA512 
333848375a8fbeee0bb9249a1f978caea9800f40a84c149a20263a668a3921eb74ced2d2563bc67ba902838e8865a3b552f9c03e88ff2ce87e6d88807d3fcbaf
 WHIRLPOOL 
b9b9e06f766315d17c7414813312fd54fd223a4ab5a0d0ba21604a4e808cb5ad8d63d445fdf879d0f7ab82ebaa83fda0bf6f46433ed5055b999d09ae287d9044
 DIST chromium-57.0.2970.0.tar.xz 523656564 SHA256 
7cb5255d352e729a637e4939fa2561266b709aa3c9ea66aeebd80af8672c27fb SHA512 
c059b1d5f33614c82a50394ce25c8fbd1ce2bc5ad6f9956caa9f088e73158751ad11a642edc5ba71dd7a6e432a74a036b2125dd73f290825470a23b7bc609576
 WHIRLPOOL 
98a6ad75dc49a464f532648d900cf9c4f39587bf2621b157ee762a8b2db0c1fd627253903c4e6d91c031f82150d2e760f80ceac468f35ab41ebef8db7a311a84
+DIST chromium-57.0.2979.0.tar.xz 523638884 SHA256 
b4ae30097c9fa52c366618e611ee2ee0dae35b742abbf9384099131b48357682 SHA512 
cbf14fceacc5c559c27d2b8f22c2f1bc02207de0156b54b090f6f08106771349b5dcc04e3cd80021318098b5a9e7b00cf8a5f11414e97ee1e8a0c07da10c494f
 WHIRLPOOL 
42f62f2d6de4cccdcad81370b545022daec08b9dd163639d81571e1c07f50e5f46e628e8194a8c51493ce416c1cdd0a572bf1f469d0089f612c3a22b33e2abe7

diff --git a/www-client/chromium/chromium-57.0.2950.4.ebuild 
b/www-client/chromium/chromium-57.0.2979.0.ebuild
similarity index 95%
rename from www-client/chromium/chromium-57.0.2950.4.ebuild
rename to www-client/chromium/chromium-57.0.2979.0.ebuild
index 04ae77e..771fbdb 100644
--- a/www-client/chromium/chromium-57.0.2950.4.ebuild
+++ b/www-client/chromium/chromium-57.0.2979.0.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome gnome-keyring gtk3 +hangouts kerberos neon 
pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc 
widevine"
+IUSE="component-build cups gconf gnome-keyring gtk3 +hangouts kerberos neon 
pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc 
widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
@@ -28,26 +28,25 @@ QA_FLAGS_IGNORED=".*\.nexe"
 # right tools for it, bug #469144 .
 QA_PRESTRIPPED=".*\.nexe"
 
-# Bundled:
-#      dev-libs/icu:=
-#      dev-libs/libxml2:=[icu]
-#      dev-libs/libxslt:=
-#      >=media-libs/harfbuzz-1.3.1:=[icu(+)]
 COMMON_DEPEND="
        app-arch/bzip2:=
        cups? ( >=net-print/cups-1.3.11:= )
        >=dev-libs/elfutils-0.149
        dev-libs/expat:=
-       dev-libs/glib:=
+       dev-libs/glib:2
+       dev-libs/icu:=
        >=dev-libs/jsoncpp-0.5.0-r1:=
+       dev-libs/libxml2:=[icu]
+       dev-libs/libxslt:=
        dev-libs/nspr:=
        >=dev-libs/nss-3.14.3:=
        >=dev-libs/re2-0.2016.05.01:=
-       gnome? ( >=gnome-base/gconf-2.24.0:= )
+       gconf? ( >=gnome-base/gconf-2.24.0:= )
        gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
        >=media-libs/alsa-lib-1.0.19:=
        media-libs/fontconfig:=
        media-libs/freetype:=
+       >=media-libs/harfbuzz-1.3.1:=[icu(+)]
        media-libs/libexif:=
        media-libs/libjpeg-turbo:=
        media-libs/libpng:=
@@ -60,7 +59,7 @@ COMMON_DEPEND="
        >=sys-libs/libcap-2.22:=
        virtual/udev
        x11-libs/cairo:=
-       x11-libs/gdk-pixbuf:=
+       x11-libs/gdk-pixbuf:2
        x11-libs/libdrm
        x11-libs/libX11:=
        x11-libs/libXcomposite:=
@@ -115,8 +114,6 @@ DEPEND="${COMMON_DEPEND}
                dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
                >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
                dev-python/html5lib[${PYTHON_USEDEP}]
-               dev-python/jinja[${PYTHON_USEDEP}]
-               dev-python/ply[${PYTHON_USEDEP}]
                dev-python/simplejson[${PYTHON_USEDEP}]
        ')
 "
@@ -126,8 +123,6 @@ python_check_deps() {
        has_version --host-root 
"dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
        has_version --host-root 
">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
        has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-       has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" &&
-       has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" &&
        has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
 }
 
@@ -162,9 +157,7 @@ For other desktop environments, try one of the following:
 
 PATCHES=(
        "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
-       "${FILESDIR}/${PN}-system-jinja-r14.patch"
        "${FILESDIR}/${PN}-widevine-r1.patch"
-       "${FILESDIR}/${PN}-gn-r11.patch"
 )
 
 pre_build_checks() {
@@ -257,6 +250,7 @@ src_prepare() {
                third_party/hunspell
                third_party/iccjpeg
                third_party/inspector_protocol
+               third_party/jinja2
                third_party/jstemplate
                third_party/khronos
                third_party/leveldatabase
@@ -273,6 +267,7 @@ src_prepare() {
                third_party/libyuv
                third_party/lss
                third_party/lzma_sdk
+               third_party/markupsafe
                third_party/mesa
                third_party/modp_b64
                third_party/mt19937ar
@@ -291,6 +286,7 @@ src_prepare() {
                third_party/pdfium/third_party/libpng16
                third_party/pdfium/third_party/libtiff
                third_party/pdfium/third_party/zlib_v128
+               third_party/ply
                third_party/polymer
                third_party/protobuf
                third_party/protobuf/third_party/six
@@ -319,12 +315,6 @@ src_prepare() {
                third_party/usb_ids
                third_party/xdg-utils
                third_party/yasm/run_yasm.py
-
-               # M57 bundled
-               third_party/harfbuzz-ng
-               third_party/icu
-               third_party/libxslt
-               third_party/libxml
        )
        if ! use system-ffmpeg; then
                keeplibs+=( third_party/ffmpeg )
@@ -359,14 +349,14 @@ src_configure() {
        # libevent: https://bugs.gentoo.org/593458
        local gn_system_libraries=(
                flac
-               #harfbuzz-ng
-               #icu
+               harfbuzz-ng
+               icu
                libjpeg
                libpng
                libvpx
                libwebp
-               #libxml
-               #libxslt
+               libxml
+               libxslt
                re2
                snappy
                yasm
@@ -381,7 +371,7 @@ src_configure() {
        myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true 
false)"
        myconf_gn+=" enable_widevine=$(usex widevine true false)"
        myconf_gn+=" use_cups=$(usex cups true false)"
-       myconf_gn+=" use_gconf=$(usex gnome true false)"
+       myconf_gn+=" use_gconf=$(usex gconf true false)"
        myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
        myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
        myconf_gn+=" use_kerberos=$(usex kerberos true false)"
@@ -586,7 +576,7 @@ src_install() {
        doins out/Release/*.so
 
        # Needed by bundled icu
-       doins out/Release/icudtl.dat
+       # doins out/Release/icudtl.dat
 
        doins -r out/Release/locales
        doins -r out/Release/resources
@@ -618,10 +608,8 @@ src_install() {
        sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || 
die
 
        # Install GNOME default application entry (bug #303100).
-       if use gnome; then
-               insinto /usr/share/gnome-control-center/default-apps
-               newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-       fi
+       insinto /usr/share/gnome-control-center/default-apps
+       newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
 
        readme.gentoo_create_doc
 }

Reply via email to