1 |
voyageur 09/08/29 22:15:14 |
2 |
|
3 |
Modified: ChangeLog chromium-bin-9999.ebuild |
4 |
Added: chromium-bin-4.0.204.0_p24859.ebuild |
5 |
Log: |
6 |
amd64 package now available! Removed the emul-* parts and added ~amd64 |
7 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.21 www-client/chromium-bin/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.21&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.21&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?r1=1.20&r2=1.21 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v |
19 |
retrieving revision 1.20 |
20 |
retrieving revision 1.21 |
21 |
diff -u -r1.20 -r1.21 |
22 |
--- ChangeLog 28 Aug 2009 15:03:27 -0000 1.20 |
23 |
+++ ChangeLog 29 Aug 2009 22:15:13 -0000 1.21 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for www-client/chromium-bin |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.20 2009/08/28 15:03:27 voyageur Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.21 2009/08/29 22:15:13 voyageur Exp $ |
29 |
+ |
30 |
+*chromium-bin-4.0.204.0_p24859 (29 Aug 2009) |
31 |
+ |
32 |
+ 29 Aug 2009; Bernard Cafarelli <voyageur@g.o> |
33 |
+ +chromium-bin-4.0.204.0_p24859.ebuild, chromium-bin-9999.ebuild: |
34 |
+ amd64 package now available! Removed the emul-* parts and added ~amd64 |
35 |
|
36 |
*chromium-bin-4.0.204.0_p24732 (28 Aug 2009) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.14 www-client/chromium-bin/chromium-bin-9999.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.14&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.14&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?r1=1.13&r2=1.14 |
46 |
|
47 |
Index: chromium-bin-9999.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v |
50 |
retrieving revision 1.13 |
51 |
retrieving revision 1.14 |
52 |
diff -u -r1.13 -r1.14 |
53 |
--- chromium-bin-9999.ebuild 25 Aug 2009 09:09:40 -0000 1.13 |
54 |
+++ chromium-bin-9999.ebuild 29 Aug 2009 22:15:13 -0000 1.14 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2009 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.13 2009/08/25 09:09:40 voyageur Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.14 2009/08/29 22:15:13 voyageur Exp $ |
60 |
|
61 |
EAPI="2" |
62 |
inherit eutils multilib |
63 |
@@ -9,27 +9,16 @@ |
64 |
HOMEPAGE="http://code.google.com/chromium/" |
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
-KEYWORDS="-* ~x86" |
68 |
+KEYWORDS="-* ~amd64 ~x86" |
69 |
IUSE="" |
70 |
|
71 |
-AMD64_DEPEND="amd64? ( |
72 |
- || ( www-plugins/adobe-flash[32bit] |
73 |
- www-client/mozilla-firefox-bin |
74 |
- net-libs/xulrunner-bin ) |
75 |
- >=app-emulation/emul-linux-x86-gtklibs-20081109 |
76 |
- app-emulation/emul-linux-x86-soundlibs |
77 |
- )" |
78 |
- |
79 |
-DEPEND="app-arch/unzip |
80 |
- net-misc/curl |
81 |
- ${AMD64_DEPEND}" |
82 |
+DEPEND="app-arch/unzip" |
83 |
RDEPEND="media-fonts/corefonts |
84 |
>=sys-devel/gcc-4.2 |
85 |
- x86? ( >=dev-libs/nspr-4.7 |
86 |
- >=dev-libs/nss-3.12 |
87 |
- gnome-base/gconf |
88 |
- x11-libs/pango ) |
89 |
- ${AMD64_DEPEND}" |
90 |
+ >=dev-libs/nspr-4.7 |
91 |
+ >=dev-libs/nss-3.12 |
92 |
+ gnome-base/gconf |
93 |
+ x11-libs/pango" |
94 |
|
95 |
S=${WORKDIR} |
96 |
|
97 |
@@ -43,15 +32,13 @@ |
98 |
opt/chromium.org/chrome-linux/libavformat.so.52 |
99 |
opt/chromium.org/chrome-linux/libavutil.so.50" |
100 |
|
101 |
-pkg_setup() { |
102 |
- # This is a binary x86 package |
103 |
- has_multilib_profile && ABI="x86" |
104 |
-} |
105 |
- |
106 |
src_unpack() { |
107 |
LV=`curl --silent http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/LATEST` |
108 |
elog "Installing/updating to version ${LV}" |
109 |
- wget -c "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${LV}/chrome-linux.zip" -O "${T}"/${PN}-${LV}.zip |
110 |
+ if use amd64; then |
111 |
+ arch_path="-64" |
112 |
+ fi |
113 |
+ wget -c "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux${arch_path}/${LV}/chrome-linux.zip" -O "${T}"/${PN}-${LV}.zip |
114 |
unzip -qo "${T}"/${PN}-${LV}.zip || die "Unpack failed" |
115 |
chmod -fR a+rX,u+w,g-w,o-w chrome-linux/ |
116 |
} |
117 |
@@ -67,28 +54,8 @@ |
118 |
|
119 |
# Create symlinks for needed libraries |
120 |
dodir ${CHROMIUM_HOME}/lib |
121 |
- if use x86; then |
122 |
- NSS_DIR=../../../usr/$(get_libdir)/nss |
123 |
- NSPR_DIR=../../../usr/$(get_libdir)/nspr |
124 |
- elif use amd64; then |
125 |
- # amd64: we still miss gconf |
126 |
- if has_version www-client/mozilla-firefox-bin; then |
127 |
- einfo "Using NSS/NSPR libraries from www-client/mozilla-firefox-bin" |
128 |
- NSS_DIR=../../../opt/firefox |
129 |
- NSPR_DIR=../../../opt/firefox |
130 |
- elif has_version net-libs/xulrunner-bin; then |
131 |
- einfo "Using NSS/NSPR libraries from net-libs/xulrunner-bin" |
132 |
- NSS_DIR=../../../opt/xulrunner |
133 |
- NSPR_DIR=../../../opt/xulrunner |
134 |
- elif has_version www-plugins/adobe-flash; then |
135 |
- einfo "Using NSS/NSPR libraries from www-plugins/adobe-flash" |
136 |
- NSS_DIR=../../../opt/flash-libcompat |
137 |
- NSPR_DIR=../../../opt/flash-libcompat |
138 |
- else |
139 |
- die "One of these packages is needed: www-client/mozilla-firefox-bin, net-libs/xulrunner-bin, www-plugins/adobe-flash[32bit]" |
140 |
- fi |
141 |
- |
142 |
- fi |
143 |
+ NSS_DIR=../../../usr/$(get_libdir)/nss |
144 |
+ NSPR_DIR=../../../usr/$(get_libdir)/nspr |
145 |
|
146 |
dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/lib/libnspr4.so.0d |
147 |
dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/lib/libplc4.so.0d |
148 |
|
149 |
|
150 |
|
151 |
1.1 www-client/chromium-bin/chromium-bin-4.0.204.0_p24859.ebuild |
152 |
|
153 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.204.0_p24859.ebuild?rev=1.1&view=markup |
154 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.204.0_p24859.ebuild?rev=1.1&content-type=text/plain |
155 |
|
156 |
Index: chromium-bin-4.0.204.0_p24859.ebuild |
157 |
=================================================================== |
158 |
# Copyright 1999-2009 Gentoo Foundation |
159 |
# Distributed under the terms of the GNU General Public License v2 |
160 |
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.204.0_p24859.ebuild,v 1.1 2009/08/29 22:15:13 voyageur Exp $ |
161 |
|
162 |
EAPI="2" |
163 |
inherit eutils multilib |
164 |
|
165 |
# Latest revision id can be found at |
166 |
# http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/LATEST |
167 |
MY_PV="${PV/[0-9.]*\_p}" |
168 |
|
169 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
170 |
HOMEPAGE="http://code.google.com/chromium/" |
171 |
SRC_URI="x86? ( http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${MY_PV}/chrome-linux.zip -> ${PN}-x86-${MY_PV}.zip ) |
172 |
amd64? ( http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${MY_PV}/chrome-linux.zip -> ${PN}-amd64-${MY_PV}.zip )" |
173 |
LICENSE="GPL-2" |
174 |
SLOT="0" |
175 |
KEYWORDS="-* ~amd64 ~x86" |
176 |
IUSE="" |
177 |
|
178 |
DEPEND="app-arch/unzip" |
179 |
RDEPEND="media-fonts/corefonts |
180 |
>=sys-devel/gcc-4.2 |
181 |
>=dev-libs/nspr-4.7 |
182 |
>=dev-libs/nss-3.12 |
183 |
gnome-base/gconf |
184 |
x11-libs/pango" |
185 |
|
186 |
S=${WORKDIR} |
187 |
|
188 |
QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome" |
189 |
|
190 |
# Ogg/Theora/Vorbis-only FFmpeg binaries |
191 |
QA_TEXTRELS="opt/chromium.org/chrome-linux/libavcodec.so.52 |
192 |
opt/chromium.org/chrome-linux/libavformat.so.52 |
193 |
opt/chromium.org/chrome-linux/libavutil.so.50" |
194 |
QA_PRESTRIPPED="opt/chromium.org/chrome-linux/libavcodec.so.52 |
195 |
opt/chromium.org/chrome-linux/libavformat.so.52 |
196 |
opt/chromium.org/chrome-linux/libavutil.so.50" |
197 |
|
198 |
src_install() { |
199 |
declare CHROMIUM_HOME=/opt/chromium.org |
200 |
|
201 |
dodir ${CHROMIUM_HOME} |
202 |
cp -R chrome-linux/ "${D}"${CHROMIUM_HOME} || die "Unable to install chrome-linux folder" |
203 |
|
204 |
# Plugins symlink |
205 |
dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins |
206 |
|
207 |
# Create symlinks for needed libraries |
208 |
dodir ${CHROMIUM_HOME}/lib |
209 |
NSS_DIR=../../../usr/$(get_libdir)/nss |
210 |
NSPR_DIR=../../../usr/$(get_libdir)/nspr |
211 |
|
212 |
dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/lib/libnspr4.so.0d |
213 |
dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/lib/libplc4.so.0d |
214 |
dosym ${NSPR_DIR}/libplds4.so ${CHROMIUM_HOME}/lib/libplds4.so.0d |
215 |
dosym ${NSS_DIR}/libnss3.so ${CHROMIUM_HOME}/lib/libnss3.so.1d |
216 |
dosym ${NSS_DIR}/libnssutil3.so ${CHROMIUM_HOME}/lib/libnssutil3.so.1d |
217 |
dosym ${NSS_DIR}/libsmime3.so ${CHROMIUM_HOME}/lib/libsmime3.so.1d |
218 |
dosym ${NSS_DIR}/libssl3.so ${CHROMIUM_HOME}/lib/libssl3.so.1d |
219 |
|
220 |
# Create chromium-bin wrapper |
221 |
make_wrapper chromium-bin ./chrome ${CHROMIUM_HOME}/chrome-linux ${CHROMIUM_HOME}/lib:${CHROMIUM_HOME}/chrome-linux |
222 |
newicon "${FILESDIR}"/chromium.png ${PN}.png |
223 |
make_desktop_entry chromium-bin "Chromium (bin)" ${PN}.png "Network;WebBrowser" |
224 |
} |
225 |
|
226 |
pkg_postinst() { |
227 |
ewarn "This binary requires the C++ runtime from >=sys-devel/gcc-4.2" |
228 |
ewarn "If you get the \"version \`GLIBCXX_3.4.9' not found\" error message," |
229 |
ewarn "switch your active gcc to a version >=4.2 with gcc-config" |
230 |
} |