1 |
commit: d1880e9f04fbccc4e8ebed81252c43ec9ea64daf |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 27 18:56:50 2017 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 27 18:57:58 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=d1880e9f |
7 |
|
8 |
www-client/chromium-bin-debian: Do not block media-libs/libwebp:0/7 |
9 |
|
10 |
.../chromium-bin-debian-56.0.2924.76_p5-r2.ebuild | 126 --------------------- |
11 |
... chromium-bin-debian-58.0.3029.96_p1-r1.ebuild} | 2 +- |
12 |
2 files changed, 1 insertion(+), 127 deletions(-) |
13 |
|
14 |
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 |
15 |
deleted file mode 100644 |
16 |
index 959722a..0000000 |
17 |
--- a/www-client/chromium-bin-debian/chromium-bin-debian-56.0.2924.76_p5-r2.ebuild |
18 |
+++ /dev/null |
19 |
@@ -1,126 +0,0 @@ |
20 |
-# Copyright 1999-2017 Gentoo Foundation |
21 |
-# Distributed under the terms of the GNU General Public License v2 |
22 |
- |
23 |
-EAPI=5 |
24 |
- |
25 |
-inherit eutils multilib unpacker |
26 |
- |
27 |
-MY_PV=${PV/_p/-} |
28 |
-MY_PN=${PN%%-bin-debian} |
29 |
- |
30 |
-DESCRIPTION="Chromium build from Debian unstable" |
31 |
-HOMEPAGE="http://packages.debian.org/sid/chromium" |
32 |
-SRC_PREFIX="http://snapshot.debian.org/archive/debian/20170303T152738Z/pool" |
33 |
-SRC_URI="${SRC_PREFIX}/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64.deb |
34 |
- ${SRC_PREFIX}/main/c/crystalhd/libcrystalhd3_0.0~git20110715.fdd2f19-11_amd64.deb |
35 |
- ${SRC_PREFIX}/main/f/ffmpeg/libavcodec57_3.2.4-1_amd64.deb |
36 |
- ${SRC_PREFIX}/main/f/ffmpeg/libavformat57_3.2.4-1_amd64.deb |
37 |
- ${SRC_PREFIX}/main/f/ffmpeg/libavutil55_3.2.4-1_amd64.deb |
38 |
- ${SRC_PREFIX}/main/f/ffmpeg/libswresample2_3.2.4-1_amd64.deb |
39 |
- ${SRC_PREFIX}/main/i/icu/libicu57_57.1-5_amd64.deb |
40 |
- ${SRC_PREFIX}/main/libb/libbluray/libbluray1_0.9.3-3_amd64.deb |
41 |
- ${SRC_PREFIX}/main/libe/libevent/libevent-2.0-5_2.0.21-stable-3_amd64.deb |
42 |
- ${SRC_PREFIX}/main/libo/libopenmpt/libopenmpt0_0.2.7386~beta20.3-3_amd64.deb |
43 |
- ${SRC_PREFIX}/main/libs/libssh/libssh-gcrypt-4_0.7.3-2_amd64.deb |
44 |
- ${SRC_PREFIX}/main/n/numactl/libnuma1_2.0.11-2.1_amd64.deb |
45 |
- ${SRC_PREFIX}/main/r/re2/libre2-3_20170101+dfsg-1_amd64.deb |
46 |
- ${SRC_PREFIX}/main/s/shine/libshine3_3.1.0-2.1_amd64.deb |
47 |
- ${SRC_PREFIX}/main/x/x265/libx265-95_2.1-2+b2_amd64.deb |
48 |
- " |
49 |
- |
50 |
-LICENSE="BSD" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="~amd64" |
53 |
-IUSE="" |
54 |
- |
55 |
-DEPEND="app-arch/dpkg" |
56 |
-RDEPEND=" |
57 |
- app-accessibility/speech-dispatcher |
58 |
- app-arch/snappy |
59 |
- app-crypt/mit-krb5 |
60 |
- dev-libs/atk |
61 |
- dev-libs/expat |
62 |
- dev-libs/glib:2 |
63 |
- dev-libs/libevent |
64 |
- dev-libs/libxml2 |
65 |
- dev-libs/libxslt |
66 |
- dev-libs/nspr |
67 |
- dev-libs/nss |
68 |
- gnome-base/libgnome-keyring |
69 |
- media-libs/alsa-lib |
70 |
- media-libs/chromaprint:0/1 |
71 |
- media-libs/flac |
72 |
- media-libs/fontconfig |
73 |
- media-libs/freetype |
74 |
- media-libs/game-music-emu |
75 |
- media-libs/harfbuzz |
76 |
- >=media-libs/libjpeg-turbo-1.3.1 |
77 |
- media-libs/libpng:0/16 |
78 |
- media-libs/libvpx:0/4 |
79 |
- media-libs/libwebp:0/6 |
80 |
- media-libs/openjpeg:0/5 |
81 |
- media-libs/schroedinger |
82 |
- media-libs/soxr |
83 |
- media-libs/x265 |
84 |
- media-libs/xvid |
85 |
- media-libs/zvbi |
86 |
- >=media-sound/pulseaudio-2.0 |
87 |
- media-sound/twolame |
88 |
- media-sound/wavpack |
89 |
- net-print/cups |
90 |
- sys-apps/dbus |
91 |
- >=sys-devel/gcc-4.9:*[cxx] |
92 |
- sys-libs/zlib |
93 |
- x11-libs/cairo |
94 |
- x11-libs/gdk-pixbuf |
95 |
- x11-libs/gtk+ |
96 |
- x11-libs/libva |
97 |
- x11-libs/libvdpau |
98 |
- x11-libs/libX11 |
99 |
- x11-libs/libXScrnSaver |
100 |
- x11-libs/libxcb |
101 |
- x11-libs/libXcomposite |
102 |
- x11-libs/libXcursor |
103 |
- x11-libs/libXext |
104 |
- x11-libs/libXfixes |
105 |
- x11-libs/libXi |
106 |
- x11-libs/libXrandr |
107 |
- x11-libs/libXrender |
108 |
- x11-libs/libXtst |
109 |
- x11-libs/pango |
110 |
- " |
111 |
- |
112 |
-S=${WORKDIR} |
113 |
- |
114 |
-src_prepare() { |
115 |
- epatch "${FILESDIR}"/${PN}-53.0.2785.143_p1-gentoo.patch |
116 |
- epatch "${FILESDIR}"/${PN}-56.0.2924.76_p5-enable-remote-extensions.patch |
117 |
-} |
118 |
- |
119 |
-src_install() { |
120 |
- mv usr etc "${D}"/ || die |
121 |
- |
122 |
- local libdir=$(get_libdir) |
123 |
- [[ "${libdir}" != lib ]] && { |
124 |
- mv "${D}"/usr/{lib,"${libdir}"} || die |
125 |
- } |
126 |
- |
127 |
- # Make it find Debian libraries, sourced by /usr/bin/chromium |
128 |
- # While at it, we move them somewhere with less risk of collision |
129 |
- mv "${D}"/usr/lib64/{,chromium/}x86_64-linux-gnu/ || die |
130 |
- echo 'export LD_LIBRARY_PATH="/usr/lib64/chromium/x86_64-linux-gnu/${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"' \ |
131 |
- > "${D}"/etc/chromium.d/ld-library-path |
132 |
- |
133 |
- # Link to Flash (not in RDEPEND) |
134 |
- local flash_plugin_dir=/usr/${libdir}/firefox/plugins |
135 |
- dodir "${flash_plugin_dir}" |
136 |
- ln -s ../../nsbrowser/plugins/libflashplayer.so "${D}"/${flash_plugin_dir}/libflashplayer.so || die |
137 |
- |
138 |
- # Otherwise: |
139 |
- # [14345:14345:0708/125539:FATAL:zygote_host_impl_linux.cc(140)] |
140 |
- # The SUID sandbox helper binary was found, but is not configured correctly. |
141 |
- # Rather than run without sandboxing I'm aborting now. You need to make sure |
142 |
- # that /usr/lib/chromium/chromium-sandbox is owned by root and has mode 4755. |
143 |
- # Aborted |
144 |
- chmod 4755 "${D}"/usr/${libdir}/${MY_PN}/chrome-sandbox || die |
145 |
-} |
146 |
|
147 |
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 |
148 |
similarity index 98% |
149 |
rename from www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1.ebuild |
150 |
rename to www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1-r1.ebuild |
151 |
index 4e0a9e8..49246e5 100644 |
152 |
--- a/www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1.ebuild |
153 |
+++ b/www-client/chromium-bin-debian/chromium-bin-debian-58.0.3029.96_p1-r1.ebuild |
154 |
@@ -22,6 +22,7 @@ SRC_URI="${SRC_PREFIX}/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64 |
155 |
${SRC_PREFIX}/main/libe/libevent/libevent-2.0-5_2.0.21-stable-3_amd64.deb |
156 |
${SRC_PREFIX}/main/libo/libopenmpt/libopenmpt0_0.2.7386~beta20.3-3_amd64.deb |
157 |
${SRC_PREFIX}/main/libs/libssh/libssh-gcrypt-4_0.7.3-2_amd64.deb |
158 |
+ ${SRC_PREFIX}/main/libw/libwebp/libwebp6_0.5.2-1_amd64.deb |
159 |
${SRC_PREFIX}/main/n/numactl/libnuma1_2.0.11-2.1_amd64.deb |
160 |
${SRC_PREFIX}/main/r/re2/libre2-3_20170101+dfsg-1_amd64.deb |
161 |
${SRC_PREFIX}/main/s/shine/libshine3_3.1.0-2.1_amd64.deb |
162 |
@@ -57,7 +58,6 @@ RDEPEND=" |
163 |
>=media-libs/libjpeg-turbo-1.3.1 |
164 |
media-libs/libpng:0/16 |
165 |
media-libs/libvpx:0/4 |
166 |
- media-libs/libwebp:0/6 |
167 |
media-libs/openjpeg:0/5 |
168 |
media-libs/schroedinger |
169 |
media-libs/soxr |