[gentoo-commits] proj/betagarden:master commit in: www-client/chromium-bin-debian/

[Sebastian Pipping]

commit:     b5a1e190bcaa4358a8c7300de65b95a6128e85c6
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  5 17:35:54 2017 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Mar  5 17:36:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=b5a1e190

www-client/chromium-bin-debian: 56.0.2924.76_p5, remove broken old

 .../chromium-bin-debian-53.0.2785.143_p1.ebuild    | 111 ---------------------
 ... => chromium-bin-debian-56.0.2924.76_p5.ebuild} |  26 ++---
 2 files changed, 14 insertions(+), 123 deletions(-)

diff --git a/www-client/chromium-bin-debian/chromium-bin-debian-53.0.2785.143_p1.ebuild b/www-client/chromium-bin-debian/chromium-bin-debian-53.0.2785.143_p1.ebuild
deleted file mode 100644
index 74ca9e0..0000000
--- a/www-client/chromium-bin-debian/chromium-bin-debian-53.0.2785.143_p1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 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_URI="mirror://debian/pool/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64.deb
-	mirror://debian/pool/main/c/crystalhd/libcrystalhd3_0.0~git20110715.fdd2f19-11_amd64.deb
-	mirror://debian/pool/main/f/ffmpeg/libavcodec57_3.2-2_amd64.deb
-	mirror://debian/pool/main/f/ffmpeg/libavformat57_3.2-2_amd64.deb
-	mirror://debian/pool/main/f/ffmpeg/libavutil55_3.2-2_amd64.deb
-	mirror://debian/pool/main/f/ffmpeg/libswresample2_3.2-2_amd64.deb
-	mirror://debian/pool/main/libs/libssh/libssh-gcrypt-4_0.7.3-1_amd64.deb
-	mirror://debian/pool/main/n/numactl/libnuma1_2.0.11-1_amd64.deb
-	mirror://debian/pool/main/s/shine/libshine3_3.1.0-2.1_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/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/game-music-emu
-	media-libs/harfbuzz
-	media-libs/libbluray
-	>=media-libs/libjpeg-turbo-1.3.1
-	media-libs/libvpx
-	media-libs/openjpeg:0/5
-	media-libs/schroedinger
-	media-libs/soxr
-	media-libs/x265
-	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-apps/pciutils
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+
-	x11-libs/libva
-	x11-libs/libvdpau
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	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
-}
-
-src_install() {
-	mv usr etc "${D}"/ || die
-
-	local libdir=$(get_libdir)
-	[[ "${libdir}" != lib ]] && {
-		mv "${D}"/usr/{lib,"${libdir}"} || die
-	}
-
-	# Make it find ffmpeg
-	mv "${D}"/usr/${libdir}/x86_64{-linux-gnu,} || die
-
-	# 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-55.0.2883.75_p3.ebuild b/www-client/chromium-bin-debian/chromium-bin-debian-56.0.2924.76_p5.ebuild
similarity index 75%
rename from www-client/chromium-bin-debian/chromium-bin-debian-55.0.2883.75_p3.ebuild
rename to www-client/chromium-bin-debian/chromium-bin-debian-56.0.2924.76_p5.ebuild
index 3dca8ba..c273d6e 100644
--- a/www-client/chromium-bin-debian/chromium-bin-debian-55.0.2883.75_p3.ebuild
+++ b/www-client/chromium-bin-debian/chromium-bin-debian-56.0.2924.76_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,16 +12,18 @@ DESCRIPTION="Chromium build from Debian unstable"
 HOMEPAGE="http://packages.debian.org/sid/chromium"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64.deb
 	mirror://debian/pool/main/c/crystalhd/libcrystalhd3_0.0~git20110715.fdd2f19-11_amd64.deb
-	mirror://debian/pool/main/f/ffmpeg/libavcodec57_3.2-2_amd64.deb
-	mirror://debian/pool/main/f/ffmpeg/libavformat57_3.2-2_amd64.deb
-	mirror://debian/pool/main/f/ffmpeg/libavutil55_3.2-2_amd64.deb
-	mirror://debian/pool/main/f/ffmpeg/libswresample2_3.2-2_amd64.deb
+	mirror://debian/pool/main/f/ffmpeg/libavcodec57_3.2.4-1_amd64.deb
+	mirror://debian/pool/main/f/ffmpeg/libavformat57_3.2.4-1_amd64.deb
+	mirror://debian/pool/main/f/ffmpeg/libavutil55_3.2.4-1_amd64.deb
+	mirror://debian/pool/main/f/ffmpeg/libswresample2_3.2.4-1_amd64.deb
 	mirror://debian/pool/main/i/icu/libicu57_57.1-5_amd64.deb
-	mirror://debian/pool/main/libe/libevent/libevent-2.0-5_2.0.21-stable-2.1_amd64.deb
-	mirror://debian/pool/main/libs/libssh/libssh-gcrypt-4_0.7.3-1_amd64.deb
-	mirror://debian/pool/main/n/numactl/libnuma1_2.0.11-1_amd64.deb
-	mirror://debian/pool/main/r/re2/libre2-3_20161101+dfsg-2_amd64.deb
+	mirror://debian/pool/main/libe/libevent/libevent-2.0-5_2.0.21-stable-3_amd64.deb
+	mirror://debian/pool/main/libo/libopenmpt/libopenmpt0_0.2.7386~beta20.3-3_amd64.deb
+	mirror://debian/pool/main/libs/libssh/libssh-gcrypt-4_0.7.3-2_amd64.deb
+	mirror://debian/pool/main/n/numactl/libnuma1_2.0.11-2.1_amd64.deb
+	mirror://debian/pool/main/r/re2/libre2-3_20170101+dfsg-1_amd64.deb
 	mirror://debian/pool/main/s/shine/libshine3_3.1.0-2.1_amd64.deb
+	mirror://debian/pool/main/x/x265/libx265-95_2.1-2+b2_amd64.deb
 	"
 
 LICENSE="BSD"
@@ -37,7 +39,6 @@ RDEPEND="
 	dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib:2
-	!dev-libs/icu:0/57
 	dev-libs/libevent
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -100,8 +101,9 @@ src_install() {
 		mv "${D}"/usr/{lib,"${libdir}"} || die
 	}
 
-	# Make it find ffmpeg
-	mv "${D}"/usr/${libdir}/x86_64{-linux-gnu,} || die
+	# Make it find Debian libraries, sourced by /usr/bin/chromium
+	echo 'export LD_LIBRARY_PATH="/usr/lib64/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