summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-05-05 19:06:27 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-05-05 19:06:27 +0000
commit9c132e0488d752bea7e7283694a12f059a7ae676 (patch)
treea9c998094655eae62d3e1323eb25b3ce6d6c55b8 /www-client
parentAdd ~ia64/~sparc wrt #398985 (diff)
downloadhistorical-9c132e0488d752bea7e7283694a12f059a7ae676.tar.gz
historical-9c132e0488d752bea7e7283694a12f059a7ae676.tar.bz2
historical-9c132e0488d752bea7e7283694a12f059a7ae676.zip
Version bump for dev channel release. Fix build when subversion is not installed. Ebuild cleanups. Remove old.
Package-Manager: portage-2.1.10.49/cvs/Linux i686
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog10
-rw-r--r--www-client/chromium/Manifest15
-rw-r--r--www-client/chromium/chromium-20.0.1123.4.ebuild (renamed from www-client/chromium/chromium-20.0.1115.1.ebuild)29
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild27
-rw-r--r--www-client/chromium/files/chromium-svnversion-r0.patch11
5 files changed, 40 insertions, 52 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6360b3dc0290..b0810a6f2627 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.623 2012/05/03 14:22:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.624 2012/05/05 19:06:26 phajdan.jr Exp $
+
+*chromium-20.0.1123.4 (05 May 2012)
+
+ 05 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ +files/chromium-svnversion-r0.patch, -chromium-20.0.1115.1.ebuild,
+ +chromium-20.0.1123.4.ebuild, chromium-9999-r1.ebuild:
+ Version bump for dev channel release. Fix build when subversion is not
+ installed. Ebuild cleanups. Remove old.
*chromium-20.0.1123.2 (03 May 2012)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fe308f1987ba..683936c75c60 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -8,27 +8,28 @@ AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89
AUX chromium-media-no-sse-r0.patch 519 RMD160 8ef93ccacc63e22aa508b5a6a5fe82c48ce29617 SHA1 a7739564580e455278ba5f6725095a77e3ef06ce SHA256 71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761
AUX chromium-revert-jpeg-swizzle-r2.patch 2233 RMD160 b9347dd8a95b6972621779d97f27b35f6dba57fd SHA1 7b1d39243de3ae30dd99cf9b640f4a6ae0118ed6 SHA256 d99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2
AUX chromium-selinux-r0.patch 411 RMD160 76227dd5270a2bd49dd099709db6d43dbd5d59b3 SHA1 acf0b7b14a963447d5ab716927135ab7a1876580 SHA256 f6ea97bbbc36579a74790338aebea8d090a0729a3f3cfc36086338007a4f9545
+AUX chromium-svnversion-r0.patch 480 RMD160 0f6d600cb813427ca1848f7ac10547e84c169465 SHA1 605bfaa4c9cc6c908591a4bd84550756a7a6c2ae SHA256 f265a9ea756810f623289523d58b0c58b4ea1a001a693321b9cec4810fdc46de
AUX chromium-webkit-zlib-r0.patch 1750 RMD160 de8b0de89c3ffd497ce12d5d4b6c5c9ce3c4e007 SHA1 b97a0c30d1849160ea6f490206d00e5d34230586 SHA256 7a44c63d96b6fd4b12afcd06a81f410ff1202be5cf24278509d7cfec1668316c
AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1cdcbcd4a3517f70ba67c749da95c2a307971846 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9
AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
DIST chromium-18.0.1025.168.tar.bz2 174835030 RMD160 4637f095081ae805f06ea6937c03445ea6d5b5b1 SHA1 35db27fe50c52ef7cf7d3196a66aa34419929893 SHA256 1f1fc7bd8066835844a465f9d60c49c21173ff559c40e5d113fe9c4627fc18b9
DIST chromium-19.0.1084.36.tar.bz2 183801020 RMD160 e596d6942dd8c16f3a3abf4fc5c9fe93a2b96e7f SHA1 ed712d24e1c0225dcba4a881502feaa3ee4a3f98 SHA256 6df4d3d2c46973a55a2a1020072f2b772c2cd6491f1cb2054ddc3e7127da7883
DIST chromium-19.0.1084.41.tar.bz2 183821502 RMD160 0d19a1dc09fef8264ac10a65ff77e882695a44ed SHA1 43a1c1863f9b43372e756cc6f0d23530e02a04dc SHA256 8a4302374978d84af996f82262644c83ac822411e186d73dbc82db54a22aa496
-DIST chromium-20.0.1115.1.tar.bz2 183602521 RMD160 405a5f3270fe8d9962ed85cbd1f896195ae48dc1 SHA1 b2d86d893c8368dfc593ede97a87f6aedd56c98f SHA256 0be067af4e3eb3df2bef04b70cc78f9350bb5a23326d5a2c628e3669039785b3
DIST chromium-20.0.1123.2.tar.bz2 183824571 RMD160 a1f7a1a9533fc121969deb9b9e709498e8cc1ab2 SHA1 232e48e1ef07c16128e141f138da9829313696d2 SHA256 e5293acec0ffe8406314f1cd2b00857a7cac5e75c52bb2777147936a2ea8f758
+DIST chromium-20.0.1123.4.tar.bz2 183840254 RMD160 f43408a7cbd736104cdf7f28ea7c049c06737fa4 SHA1 0ed2737bcfd3df79c4be7d192ada6f764320046b SHA256 5b66ca3fb497d2644e6844f76370391f0c92f884c2d1406f0e53512005563ede
EBUILD chromium-18.0.1025.168.ebuild 13986 RMD160 a05fe2f7a859b3378eb0301a060ba98fa4ec3f7a SHA1 2647dae6ba2dcfd6862130ae5d012cd2a16c8be7 SHA256 3ed650c25347ee5fec1cc207a31197b7496fb9436ee6349a62015c27c6064e3b
EBUILD chromium-19.0.1084.36.ebuild 13493 RMD160 307d8d193f89fb933575b5fca251c3dacc3a271e SHA1 7e5d449a02c797da6e88ab6946670110e158b3c5 SHA256 3c6a3e5d4468dd87786de6a6943a8f689a59c7394fc417cff671c7e3e4af196c
EBUILD chromium-19.0.1084.41.ebuild 13493 RMD160 4d21d52f0f79f16d64853c97c45b79c0d6795332 SHA1 0c0496390a555b2d1c4346b3f7173e4e0f982c41 SHA256 bf272b40ac1cd435facdc119429bfafceece247a03e05c9af01073c8250ecc7c
-EBUILD chromium-20.0.1115.1.ebuild 13750 RMD160 1d0b80638f6b5bb0b62c6871e4d6eeb09fe96f21 SHA1 02b3b6bf3cda3056715be43c14e96c2d24223270 SHA256 498a854566743a21544e464c3db0e587498ceb6a0fc4fe178497636ac2627283
EBUILD chromium-20.0.1123.2.ebuild 13754 RMD160 0b826a9d46b64465638c6c77b7f4f40ced7804ad SHA1 65c813479680bac08bfb287e976b5e836d03dae1 SHA256 cccf6d5f6c51362ac12a587469c5ff616f9e68955e98f6caa80a8065487a6701
-EBUILD chromium-9999-r1.ebuild 15388 RMD160 882b0880b59f3694be193b2b14aca001c2a4dd0d SHA1 f470babb31bf9f6820972db7b56b2e5699653ff0 SHA256 8abe5b3d80fe3ff4b9fa0f68769c3f47789c5402eee4add140cf1f317e2bf07f
-MISC ChangeLog 18900 RMD160 4d7c926bdbc4d293b24ec6c45cb65133ede574fa SHA1 edb18ac5c478ca6bbd0c17f9a9bbe00e1fa0f691 SHA256 590f4c0b8b1d53fc6b0eb0b365b6702dc6f654af70d5a920647b2edfb3072651
+EBUILD chromium-20.0.1123.4.ebuild 13182 RMD160 65086d64b01ef99643ad9bb986acb132feb36692 SHA1 6b028909be102c23d20420b03bb7e4d5ee67586a SHA256 d29b9168e4e789f85284817b7dfc83cc362251a6c21f810f91ff85e4fca36e65
+EBUILD chromium-9999-r1.ebuild 14771 RMD160 66c205730824aae5b1f1ada21135e4657010dad3 SHA1 e89f0f06255c35c03ae8b8a8df7f65c14d9c2acd SHA256 3042bf3b7176fff0189ac6dc26952edf8c388d922745379efbbd69ba123f8004
+MISC ChangeLog 19234 RMD160 077800068cc166bcffd3dbf05f052b310ee60cf7 SHA1 578f6c242072d8a60cfe9773a03536b2d63b8875 SHA256 5d7f65732722fd92d08fdca55a81acd9886f51c9fb510c1d786bf5b35621eb68
MISC ChangeLog-2011 114031 RMD160 819d2187b876e03ba1a5f23369eca56e554bcfe6 SHA1 c449259648a4f2633b8812e7761e8cdeaea7f948 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54
MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREKAAYFAk+ilLcACgkQuUQtlDBCeQKFSwCdHJxrlD42ErOf8wGbCxMBPN71
-f0QAniLnM3blO/OZC+VbqGLa3v/c13VW
-=N2gW
+iEYEAREKAAYFAk+lekEACgkQuUQtlDBCeQLbWACdGrcHFr6msVgPe56JY9SRa6JB
+ccUAn2vt9bO4VyTMuBzzpttlXQJygoQx
+=mUaL
-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-20.0.1115.1.ebuild b/www-client/chromium/chromium-20.0.1123.4.ebuild
index c9717e82ca43..d7c55cedbe72 100644
--- a/www-client/chromium/chromium-20.0.1115.1.ebuild
+++ b/www-client/chromium/chromium-20.0.1123.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1115.1.ebuild,v 1.2 2012/05/03 06:01:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1123.4.ebuild,v 1.1 2012/05/05 19:06:26 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -108,6 +108,8 @@ src_prepare() {
third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
chrome/common/zip*.cc || die
+ epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
+
epatch_user
# Remove most bundled libraries. Some are still needed.
@@ -335,20 +337,10 @@ src_install() {
doexe out/Release/chromedriver || die
- # Install Native Client files on platforms that support it.
+ doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
- case "$(tc-arch)" in
- amd64)
- doexe out/Release/nacl_helper{,_bootstrap} || die
- doins out/Release/nacl_irt_x86_64.nexe || die
- doins out/Release/libppGoogleNaClPluginChrome.so || die
- ;;
- x86)
- doexe out/Release/nacl_helper{,_bootstrap} || die
- doins out/Release/nacl_irt_x86_32.nexe || die
- doins out/Release/libppGoogleNaClPluginChrome.so || die
- ;;
- esac
+ doins out/Release/nacl_irt_* || die
+ doins out/Release/libppGoogleNaClPluginChrome.so || die
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
@@ -376,9 +368,7 @@ src_install() {
popd
insinto "${CHROMIUM_HOME}"
- for x in out/Release/*.pak; do
- doins "${x}" || die
- done
+ doins out/Release/*.pak || die
doins -r out/Release/locales || die
doins -r out/Release/resources || die
@@ -386,11 +376,6 @@ src_install() {
newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
- # Chromium looks for these in its folder
- # See media_posix.cc and base_paths_linux.cc
- # dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
- # dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
- # dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
doexe out/Release/libffmpegsumo.so || die
# Install icons and desktop entry.
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 39a448fdc965..582b892f2279 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.107 2012/05/03 06:01:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.108 2012/05/05 19:06:26 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -391,20 +391,10 @@ src_install() {
doexe out/Release/chromedriver || die
- # Install Native Client files on platforms that support it.
+ doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
- case "$(tc-arch)" in
- amd64)
- doexe out/Release/nacl_helper{,_bootstrap} || die
- doins out/Release/nacl_irt_x86_64.nexe || die
- doins out/Release/libppGoogleNaClPluginChrome.so || die
- ;;
- x86)
- doexe out/Release/nacl_helper{,_bootstrap} || die
- doins out/Release/nacl_irt_x86_32.nexe || die
- doins out/Release/libppGoogleNaClPluginChrome.so || die
- ;;
- esac
+ doins out/Release/nacl_irt_* || die
+ doins out/Release/libppGoogleNaClPluginChrome.so || die
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
@@ -432,9 +422,7 @@ src_install() {
popd
insinto "${CHROMIUM_HOME}"
- for x in out/Release/*.pak; do
- doins "${x}" || die
- done
+ doins out/Release/*.pak || die
doins -r out/Release/locales || die
doins -r out/Release/resources || die
@@ -442,11 +430,6 @@ src_install() {
newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
- # Chromium looks for these in its folder
- # See media_posix.cc and base_paths_linux.cc
- # dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
- # dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
- # dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
doexe out/Release/libffmpegsumo.so || die
# Install icons and desktop entry.
diff --git a/www-client/chromium/files/chromium-svnversion-r0.patch b/www-client/chromium/files/chromium-svnversion-r0.patch
new file mode 100644
index 000000000000..992dec61db1f
--- /dev/null
+++ b/www-client/chromium/files/chromium-svnversion-r0.patch
@@ -0,0 +1,11 @@
+--- third_party/webrtc/build/common.gypi.orig 2012-05-04 18:32:52.126703414 +0200
++++ third_party/webrtc/build/common.gypi 2012-05-04 18:35:14.186709933 +0200
+@@ -98,7 +98,7 @@
+ 'defines': [
+ # TODO(leozwang): Most of team use git-svn, need to add
+ # git-svn support as well.
+- 'WEBRTC_SVNREVISION="<!(svnversion -n)"',
++ 'WEBRTC_SVNREVISION="<!(svnversion -n 2>/dev/null || echo -n 0)"',
+ ],
+ 'conditions': [
+ ['build_with_chromium==1', {