Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/betagarden:master commit in: www-client/chromium-bin-debian/
Date: Sat, 30 Jan 2016 15:54:18
Message-Id: 1454169236.da4ad416c1882936c0ea88907d008b5436b0a0c9.sping@gentoo
1 commit: da4ad416c1882936c0ea88907d008b5436b0a0c9
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 30 15:53:21 2016 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 30 15:53:56 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=da4ad416
7
8 www-client/chromium-bin-debian: 48.0.2564.82_p2
9
10 ... => chromium-bin-debian-48.0.2564.82_p2.ebuild} | 34 ++++++++++++++++++----
11 1 file changed, 28 insertions(+), 6 deletions(-)
12
13 diff --git a/www-client/chromium-bin-debian/chromium-bin-debian-42.0.2311.135_p2.ebuild b/www-client/chromium-bin-debian/chromium-bin-debian-48.0.2564.82_p2.ebuild
14 similarity index 62%
15 rename from www-client/chromium-bin-debian/chromium-bin-debian-42.0.2311.135_p2.ebuild
16 rename to www-client/chromium-bin-debian/chromium-bin-debian-48.0.2564.82_p2.ebuild
17 index 06092b5..f08152d 100644
18 --- a/www-client/chromium-bin-debian/chromium-bin-debian-42.0.2311.135_p2.ebuild
19 +++ b/www-client/chromium-bin-debian/chromium-bin-debian-48.0.2564.82_p2.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2015 Gentoo Foundation
22 +# Copyright 1999-2016 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Id$
25
26 @@ -11,7 +11,17 @@ MY_PN=${PN%%-bin-debian}
27
28 DESCRIPTION="Chromium build from Debian unstable"
29 HOMEPAGE="http://packages.debian.org/sid/chromium"
30 -SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64.deb"
31 +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64.deb
32 + mirror://debian/pool/main/c/crystalhd/libcrystalhd3_0.0~git20110715.fdd2f19-11_amd64.deb
33 + mirror://debian/pool/main/f/ffmpeg/libavcodec-ffmpeg56_2.8.5-1+b1_amd64.deb
34 + mirror://debian/pool/main/f/ffmpeg/libavformat-ffmpeg56_2.8.5-1+b1_amd64.deb
35 + mirror://debian/pool/main/f/ffmpeg/libavutil-ffmpeg54_2.8.5-1+b1_amd64.deb
36 + mirror://debian/pool/main/f/ffmpeg/libswresample-ffmpeg1_2.8.5-1+b1_amd64.deb
37 + mirror://debian/pool/main/g/game-music-emu/libgme0_0.6.0-3_amd64.deb
38 + mirror://debian/pool/main/g/gnutls28/libgnutls30_3.4.8-2_amd64.deb
39 + mirror://debian/pool/main/k/krb5/libgssapi-krb5-2_1.13.2+dfsg-4_amd64.deb
40 + mirror://debian/pool/main/libs/libssh/libssh-gcrypt-4_0.6.3-4+deb8u1_amd64.deb
41 + mirror://debian/pool/main/s/shine/libshine3_3.1.0-2.1_amd64.deb"
42
43 LICENSE="BSD"
44 SLOT="0"
45 @@ -21,6 +31,9 @@ IUSE=""
46 DEPEND="app-arch/dpkg"
47 RDEPEND="
48 app-accessibility/speech-dispatcher
49 + app-arch/snappy
50 + app-crypt/mit-krb5
51 + dev-libs/atk
52 dev-libs/expat
53 dev-libs/glib:2
54 dev-libs/libevent
55 @@ -33,20 +46,26 @@ RDEPEND="
56 media-libs/flac
57 media-libs/fontconfig
58 media-libs/freetype
59 + media-libs/libbluray
60 >=media-libs/libjpeg-turbo-1.3.1
61 - media-libs/harfbuzz
62 media-libs/libvpx
63 - media-libs/speex
64 + media-libs/openjpeg:0/5
65 + media-libs/schroedinger
66 + media-libs/soxr
67 + media-libs/x265
68 + media-libs/zvbi
69 >=media-sound/pulseaudio-2.0
70 + media-sound/twolame
71 + media-sound/wavpack
72 <net-libs/libsrtp-1.5
73 net-print/cups
74 sys-apps/dbus
75 >=sys-devel/gcc-4.9[cxx]
76 sys-apps/pciutils
77 - sys-libs/libcap
78 x11-libs/cairo
79 x11-libs/gdk-pixbuf
80 x11-libs/gtk+
81 + x11-libs/libva
82 x11-libs/libX11
83 x11-libs/libXScrnSaver
84 x11-libs/libXcomposite
85 @@ -65,13 +84,16 @@ S=${WORKDIR}
86 QA_PREBUILT="usr/lib*/${MY_PN}/*"
87
88 src_install() {
89 - mv "${S}"/{usr,etc} "${D}"/ || die
90 + mv usr etc "${D}"/ || die
91
92 local libdir=$(get_libdir)
93 [[ "${libdir}" != lib ]] && {
94 mv "${D}"/usr/{lib,"${libdir}"} || die
95 }
96
97 + # Make it find ffmpeg
98 + mv "${D}"/usr/${libdir}/x86_64{-linux-gnu,} || die
99 +
100 echo sid > "${D}"/etc/debian_version || die
101
102 # Link to Flash (not in RDEPEND)