summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2017-08-27 20:56:50 +0200
committerSebastian Pipping <sping@gentoo.org>2017-08-27 20:57:58 +0200
commitd1880e9f04fbccc4e8ebed81252c43ec9ea64daf (patch)
treee355ba107516d392abc73aa7236b499ba2084dca
parentsys-apps/jchroot: Add missing keywords (diff)
downloadbetagarden-d1880e9f04fbccc4e8ebed81252c43ec9ea64daf.tar.gz
betagarden-d1880e9f04fbccc4e8ebed81252c43ec9ea64daf.tar.bz2
betagarden-d1880e9f04fbccc4e8ebed81252c43ec9ea64daf.zip
www-client/chromium-bin-debian: Do not block media-libs/libwebp:0/7
-rw-r--r--www-client/chromium-bin-debian/Manifest2
-rw-r--r--www-client/chromium-bin-debian/chromium-bin-debian-56.0.2924.76_p5-r2.ebuild126
-rw-r--r--www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1-r1.ebuild (renamed from www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1.ebuild)2
3 files changed, 2 insertions, 128 deletions
diff --git a/www-client/chromium-bin-debian/Manifest b/www-client/chromium-bin-debian/Manifest
index 1fbf0ca..c7f5d30 100644
--- a/www-client/chromium-bin-debian/Manifest
+++ b/www-client/chromium-bin-debian/Manifest
@@ -1,4 +1,3 @@
-DIST chromium_56.0.2924.76-5_amd64.deb 46557568 SHA256 4f6671f704ccadd74561764913f5ac33bca025023c26a65ccd68e3ec16d96dfb SHA512 88ca5241a50e90e0eade1c659981fddfd49d7c5b4f654bf9efd6ceefa659f7f2dfd2280e490510daca22027012b64d1b31cec4e8066fb9c81cbd2ac3eda87354 WHIRLPOOL a1754a87f1718fb38f3fc8185f396aa8f0140b02b9a32b820d14eb51354e2c57bc86f76ca7f079427043919eb41344f24f942e64125359ea2552b14cc029e6f2
DIST chromium_58.0.3029.96-1_amd64.deb 50462520 SHA256 a41ec9090b69d94a418a0ece572ccb547359b24fa3d743b70f2bd1e00e1d8ea8 SHA512 254b290ff5fae72f0d196ace270c76d4be4ae570c0329b05ece0eeddca505326a4fab13215afe2346c1f6a53bb0fd332d347e837e7534aec8f4aacfeebbbb7a8 WHIRLPOOL cf9407aabcc6660ade5cc682ffa0f632d334f8ebf1608bc791985a0f55dfe00bca2863444ab05f4681f211b242e3cd42f46b2c16958fd7284828fe7d5cd6e03d
DIST chromium_60.0.3112.78-1_amd64.deb 51803220 SHA256 f5ce4ed70b6d155be2dec122166850ca0f3bcf1d8d010d848f2b37ee0d0694a0 SHA512 734066671f80d3dce31fc9f639d563b2543f87840e992bb6a11c399837d98975b7f349213add04a374b668dd567f88631dd7ed4c10a31840762df91906850375 WHIRLPOOL bfa47b822c00e0c2602bd18c40dae22ca6b9ab58e74b61c71ce7e5bb31edb60d41f0f576b135841338ee7ecbeed7eca287a0c49e00c6352bef54466bed48c878
DIST libavcodec57_3.2.4-1_amd64.deb 4430598 SHA256 69453bee89b7be639b89644bd2bddcec06b5828de3d7f9a4a686a081219557be SHA512 2413b9c9fbdccde315315397e54267bf1c60ea825683d7f0cae10fa0532ee4eac8bf5e6fcbff1c6b362804384e1adc8ab27437867ea7e51de09864d192ae1203 WHIRLPOOL 7f6c22062c687962b0992687e51af009a3cc33cab00e989a27f7d72fc4db25b2166ef772f8c285f54a49a2bd5027551309ee7891ee7485c6363160284a37f0bf
@@ -14,4 +13,5 @@ DIST libre2-3_20170101+dfsg-1_amd64.deb 176914 SHA256 52961aaa8b5b41c249b23bd559
DIST libshine3_3.1.0-2.1_amd64.deb 25534 SHA256 c4c0424db497df8f0ebbaa7947862436337a209924fdbfd7d8f898c21a5e569d SHA512 3a06ffd084f676a49360d209475e97b6494fe0106715ba302262824407a3f62046551a54259f13fa0b234bbcc8de370a2ddc28b3e2625661325fdaa7cbddd3e2 WHIRLPOOL fc33714ce6e4d960059dfabea91354ebfc637dff3302e9560881bd1470e8ea0496a3f149bfc70e969f5d70714a77f3bc9e618957e2be1ee0957107046132a7ae
DIST libssh-gcrypt-4_0.7.3-2_amd64.deb 169636 SHA256 203c6b1ab8b0626e1065f82c374870ecfa388f1684f13e5eb2f88e87a65768ad SHA512 c378d7d149b737744dcf65c558879b72ddf6c83a679d32107cf151f26309ba0d062dea4ba24c5d028f0a274785945d3921fcce7c421328fc897f3ab2c7d4c834 WHIRLPOOL 916e3ebb5698cf54782e5deb6337d5fa28c4c748290254b6649a63c9a3fa2d2588dda696252c021d0aba53f71a0b96fc84c8112e7807fcbfabdbeab9302c945e
DIST libswresample2_3.2.4-1_amd64.deb 87266 SHA256 a96ce111cbfb922779972089528da400a6bfa6f179bf535f1aa070855ae2eec6 SHA512 ece815a3199983a06b8dff42414f636e420152dbc2bca361e19feca72f73483ddd6cadef6af23d9b772b0f76636026f28ae5e5c3ce58a316be8c7a4690a56a3d WHIRLPOOL 6fc092a7ea4a52815dc8d7fdd827ea6e73c3e665cf2833feb5ad958b66b1557fd2ac092651cb0cbabf5e3bb3c839b2eac93c5d70abbe281c84a7acd20bfd53e6
+DIST libwebp6_0.5.2-1_amd64.deb 234562 SHA256 d749a9c12cc8272ef6e6a50113bd883573633c8fdd0ef1511f29883de797664f SHA512 26bef225ff78028ebb61fb32ee5ed7fd99dc62e56368b8958bce8c15c4cf91849da004f7bb9a1f659a422f662f801a7bf75fbc176d2a37c08b41ffcca5de98ed WHIRLPOOL 93db92c68cfbf8317bb88b89a598b5ee5d53bd96ecbe77dc2b8bd482036c678d9c5acd87c43c218a276dd82c6e65ba83d1f2d818fa309d6c8aae9ce57897be71
DIST libx265-95_2.1-2+b2_amd64.deb 985532 SHA256 615f56b029e8acf3b35a1e042dabbbeb868419a5d588e76c96657393187bc3ab SHA512 900b535af05bd7fb5ecc24f068f901fac804711586cdbcec1949a8b0cb637d7c729490e5d2b6f326c4de22bc3ca1abfa630e343e3e92c27a32eff0409bda2b9b WHIRLPOOL 2fedfa2189c73b1387e141cd8410708701a3194e2c609555a90abe8f289e9d87ec1d873cd987268b3a8f33a06383cf0f858af17b58227f87e51b3a1968e3ec55
diff --git a/www-client/chromium-bin-debian/chromium-bin-debian-56.0.2924.76_p5-r2.ebuild b/www-client/chromium-bin-debian/chromium-bin-debian-56.0.2924.76_p5-r2.ebuild
deleted file mode 100644
index 959722a..0000000
--- a/www-client/chromium-bin-debian/chromium-bin-debian-56.0.2924.76_p5-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib unpacker
-
-MY_PV=${PV/_p/-}
-MY_PN=${PN%%-bin-debian}
-
-DESCRIPTION="Chromium build from Debian unstable"
-HOMEPAGE="http://packages.debian.org/sid/chromium"
-SRC_PREFIX="http://snapshot.debian.org/archive/debian/20170303T152738Z/pool"
-SRC_URI="${SRC_PREFIX}/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64.deb
- ${SRC_PREFIX}/main/c/crystalhd/libcrystalhd3_0.0~git20110715.fdd2f19-11_amd64.deb
- ${SRC_PREFIX}/main/f/ffmpeg/libavcodec57_3.2.4-1_amd64.deb
- ${SRC_PREFIX}/main/f/ffmpeg/libavformat57_3.2.4-1_amd64.deb
- ${SRC_PREFIX}/main/f/ffmpeg/libavutil55_3.2.4-1_amd64.deb
- ${SRC_PREFIX}/main/f/ffmpeg/libswresample2_3.2.4-1_amd64.deb
- ${SRC_PREFIX}/main/i/icu/libicu57_57.1-5_amd64.deb
- ${SRC_PREFIX}/main/libb/libbluray/libbluray1_0.9.3-3_amd64.deb
- ${SRC_PREFIX}/main/libe/libevent/libevent-2.0-5_2.0.21-stable-3_amd64.deb
- ${SRC_PREFIX}/main/libo/libopenmpt/libopenmpt0_0.2.7386~beta20.3-3_amd64.deb
- ${SRC_PREFIX}/main/libs/libssh/libssh-gcrypt-4_0.7.3-2_amd64.deb
- ${SRC_PREFIX}/main/n/numactl/libnuma1_2.0.11-2.1_amd64.deb
- ${SRC_PREFIX}/main/r/re2/libre2-3_20170101+dfsg-1_amd64.deb
- ${SRC_PREFIX}/main/s/shine/libshine3_3.1.0-2.1_amd64.deb
- ${SRC_PREFIX}/main/x/x265/libx265-95_2.1-2+b2_amd64.deb
- "
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="app-arch/dpkg"
-RDEPEND="
- app-accessibility/speech-dispatcher
- app-arch/snappy
- app-crypt/mit-krb5
- dev-libs/atk
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/libevent
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- gnome-base/libgnome-keyring
- media-libs/alsa-lib
- media-libs/chromaprint:0/1
- media-libs/flac
- media-libs/fontconfig
- media-libs/freetype
- media-libs/game-music-emu
- media-libs/harfbuzz
- >=media-libs/libjpeg-turbo-1.3.1
- media-libs/libpng:0/16
- media-libs/libvpx:0/4
- media-libs/libwebp:0/6
- media-libs/openjpeg:0/5
- media-libs/schroedinger
- media-libs/soxr
- media-libs/x265
- media-libs/xvid
- media-libs/zvbi
- >=media-sound/pulseaudio-2.0
- media-sound/twolame
- media-sound/wavpack
- net-print/cups
- sys-apps/dbus
- >=sys-devel/gcc-4.9:*[cxx]
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+
- x11-libs/libva
- x11-libs/libvdpau
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libxcb
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango
- "
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-53.0.2785.143_p1-gentoo.patch
- epatch "${FILESDIR}"/${PN}-56.0.2924.76_p5-enable-remote-extensions.patch
-}
-
-src_install() {
- mv usr etc "${D}"/ || die
-
- local libdir=$(get_libdir)
- [[ "${libdir}" != lib ]] && {
- mv "${D}"/usr/{lib,"${libdir}"} || die
- }
-
- # Make it find Debian libraries, sourced by /usr/bin/chromium
- # While at it, we move them somewhere with less risk of collision
- mv "${D}"/usr/lib64/{,chromium/}x86_64-linux-gnu/ || die
- echo 'export LD_LIBRARY_PATH="/usr/lib64/chromium/x86_64-linux-gnu/${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"' \
- > "${D}"/etc/chromium.d/ld-library-path
-
- # Link to Flash (not in RDEPEND)
- local flash_plugin_dir=/usr/${libdir}/firefox/plugins
- dodir "${flash_plugin_dir}"
- ln -s ../../nsbrowser/plugins/libflashplayer.so "${D}"/${flash_plugin_dir}/libflashplayer.so || die
-
- # Otherwise:
- # [14345:14345:0708/125539:FATAL:zygote_host_impl_linux.cc(140)]
- # The SUID sandbox helper binary was found, but is not configured correctly.
- # Rather than run without sandboxing I'm aborting now. You need to make sure
- # that /usr/lib/chromium/chromium-sandbox is owned by root and has mode 4755.
- # Aborted
- chmod 4755 "${D}"/usr/${libdir}/${MY_PN}/chrome-sandbox || die
-}
diff --git a/www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1.ebuild b/www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1-r1.ebuild
index 4e0a9e8..49246e5 100644
--- a/www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1.ebuild
+++ b/www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1-r1.ebuild
@@ -22,6 +22,7 @@ SRC_URI="${SRC_PREFIX}/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64
${SRC_PREFIX}/main/libe/libevent/libevent-2.0-5_2.0.21-stable-3_amd64.deb
${SRC_PREFIX}/main/libo/libopenmpt/libopenmpt0_0.2.7386~beta20.3-3_amd64.deb
${SRC_PREFIX}/main/libs/libssh/libssh-gcrypt-4_0.7.3-2_amd64.deb
+ ${SRC_PREFIX}/main/libw/libwebp/libwebp6_0.5.2-1_amd64.deb
${SRC_PREFIX}/main/n/numactl/libnuma1_2.0.11-2.1_amd64.deb
${SRC_PREFIX}/main/r/re2/libre2-3_20170101+dfsg-1_amd64.deb
${SRC_PREFIX}/main/s/shine/libshine3_3.1.0-2.1_amd64.deb
@@ -57,7 +58,6 @@ RDEPEND="
>=media-libs/libjpeg-turbo-1.3.1
media-libs/libpng:0/16
media-libs/libvpx:0/4
- media-libs/libwebp:0/6
media-libs/openjpeg:0/5
media-libs/schroedinger
media-libs/soxr