summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-12-14 10:11:40 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-12-14 10:11:40 +0000
commit8f77f7b6e605e983ffded1d3f621437fe1e1c8f7 (patch)
tree1cf517d7f14e32207c6042ba737350c69f7ac8d2 /www-client
parentstable x86, bug 348269 (diff)
downloadhistorical-8f77f7b6e605e983ffded1d3f621437fe1e1c8f7.tar.gz
historical-8f77f7b6e605e983ffded1d3f621437fe1e1c8f7.tar.bz2
historical-8f77f7b6e605e983ffded1d3f621437fe1e1c8f7.zip
Version bump for dev channel release. Remove old.
Package-Manager: portage-2.1.9.24/cvs/Linux i686
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/Manifest16
-rw-r--r--www-client/chromium/chromium-9.0.597.19.ebuild (renamed from www-client/chromium/chromium-9.0.597.0.ebuild)29
3 files changed, 32 insertions, 21 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index faabf6e67d8b..a782f20ec8d6 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.240 2010/12/14 09:37:23 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.241 2010/12/14 10:11:40 phajdan.jr Exp $
+
+*chromium-9.0.597.19 (14 Dec 2010)
+
+ 14 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-9.0.597.0.ebuild, +chromium-9.0.597.19.ebuild:
+ Version bump for dev channel release. Remove old.
14 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
chromium-8.0.552.224.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 93fdc5b1d41b..c4c2cc727769 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c
AUX chromium-launcher.sh 648 RMD160 d9331083750789d5c514c0fa1843037337ac476a SHA1 015efb2faacfc000c23644323c56795acfb7bc7e SHA256 3ae91f5bee0107adf3511205a062465901c7daaa13e3758ae970a6da4f0fa12c
AUX chromium-locale-glib-r0.patch 14967 RMD160 4764e11584bc796004acdfb6f997b01d5045ad8f SHA1 aba8d20bff1753303749f7e1c710529de8077c18 SHA256 afdc118a01b0ca7ba6d524d8e30fde8f6bf2cb2ec29959a788e5636066a53b06
@@ -13,19 +10,12 @@ AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SH
AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
DIST chromium-8.0.552.215.tar.bz2 135971053 RMD160 fd971365dc103e227a50743877068705d6097e1c SHA1 fc039b5cb6a75dd967e152d9b5ab3274d5e94b46 SHA256 fb34f28446ef6835f54f2b0749c040dedf95646858c27a72031dae39b500a44f
DIST chromium-8.0.552.224.tar.bz2 135345394 RMD160 e7bed4bc0b4d851e83bfc351ceca9af4ae739dad SHA1 4544ec2f753893e9a5426e4bad353bad8fd25f8a SHA256 c10b5f7cbafbc430ba25f6cdc00af5c86c6216b280101df2036a89474b75a848
-DIST chromium-9.0.597.0.tar.bz2 142457016 RMD160 39deb1321d35d80ef7d7a0eab9b5456ebb6064c0 SHA1 819608b9fad4c6971b0a852979e9552e7510d7a1 SHA256 f913af88393395012d67e454376e081d6ea3bfa384fa684ba9503d813f70053d
DIST chromium-9.0.597.16.tar.bz2 141678073 RMD160 62c5f53528cb8d7794e0e4a30c0a9b42fc304613 SHA1 3958b30cd2687121d9f55adebd1d8da80065ea48 SHA256 469704126f081b97c4d56204babeb5898a4eea9d5802534c333cd12013a856ee
+DIST chromium-9.0.597.19.tar.bz2 141604890 RMD160 9333fe36501215c2c3f717525216ec1f04ffd8b7 SHA1 01086ba4d186893b0a909be5f4c19c6dbf599baf SHA256 b3a1ae7aed12f8ab4d46ac9571259e1666e2abdd24c0a5d08638ea1b94d3c681
EBUILD chromium-8.0.552.215.ebuild 8603 RMD160 5e9da9d8720bcbdea61e7b88098a8954a7c96241 SHA1 3c0e72fdb99230bae9b248d5643540a6294e1d5d SHA256 f8f0ff88c24a9cc3c6a39ff58bbe535bf7ad78b91fa8f1042cc85847c860a4c5
EBUILD chromium-8.0.552.224.ebuild 8604 RMD160 9988a86d71b35e9f9115fddf554a188144a81fda SHA1 15003035abee24fc449ec8eda588cf2d517a9408 SHA256 cc0102933342499851307e378718e9ad4652d3367396bf963cc2da6444bd99cc
-EBUILD chromium-9.0.597.0.ebuild 9322 RMD160 d524d3b395a61716d37e91ddc5af3b6e4e8e659b SHA1 d7f1b334287cd3c18932e288390710f74d4b386b SHA256 6d48c2388ef5d6dd322e67e54b7ef5c12080dbbc4aa5eb4d863436c361435b51
EBUILD chromium-9.0.597.16.ebuild 9758 RMD160 5c8e2fc44cd84335e24c9297cb767384c7a81955 SHA1 88cc9b3672534fc7e2cc9b0bbbb7431a899565fd SHA256 8499f95128af69e5cf8a83c8c51ceaedcc4e20b759d38dac0c660b7f06ef46fd
+EBUILD chromium-9.0.597.19.ebuild 9762 RMD160 e5772c1a18f6d8775e684975421c153c6e19b3ee SHA1 f08a9f9a84d7b907307852568096d556db187263 SHA256 40edca7e1d4038eda8dd4f14a86e6f06704b47a51cef2c0940ab6fa516d86b49
EBUILD chromium-9999.ebuild 11360 RMD160 de86664824c5d6229959f69765567af3bcee89cf SHA1 c8540296db206ab2e6c4fb88df2ccb98e983a66b SHA256 93c331424c5fa68389ca925642d4bf4cf4d28a70ce98c16f6d747ba35db6a21d
-MISC ChangeLog 53194 RMD160 fb7e2e022f26bf0ff527f2adb887307324d8905e SHA1 7014076979b9eb32338ee9019570fe2317121443 SHA256 e12e5251b99866320745b192b5a54c4b061bebcf7b0d8118fbe6c5a9a863b64e
+MISC ChangeLog 53402 RMD160 58a14c21e3827527d009692a90c938171348a292 SHA1 da836f88083424e5ce030f84fb6b97c6a88bc37e SHA256 75b19a8897117a865a14896a2a093b6267085d11ca8ffc0dffdc922fd575e742
MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0HO2kACgkQNQqtfCuFneNtfQCgkkiA/pfLoEy70Pxklooz/QLV
-uHwAniy/HXAVfP+8dt6KO3+WjuWw4iRN
-=DJ1S
------END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-9.0.597.0.ebuild b/www-client/chromium/chromium-9.0.597.19.ebuild
index 8b1f217a294e..d9a429f9c926 100644
--- a/www-client/chromium/chromium-9.0.597.0.ebuild
+++ b/www-client/chromium/chromium-9.0.597.19.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.0.ebuild,v 1.1 2010/12/02 10:12:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.19.ebuild,v 1.1 2010/12/14 10:11:40 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
inherit eutils flag-o-matic multilib pax-utils portability python \
- toolchain-funcs versionator
+ toolchain-funcs versionator virtualx
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/"
@@ -84,6 +84,7 @@ pkg_setup() {
# Make sure the build system will use the right python, bug #344367.
python_set_active_version 2
+ python_pkg_setup
# Prevent user problems like bug #299777.
if ! grep -q /dev/shm <<< $(get_mounts); then
@@ -106,6 +107,9 @@ src_prepare() {
# Make sure we don't use bundled libvpx headers.
epatch "${FILESDIR}"/${PN}-system-vpx-r1.patch
+ # Small fixes to make tests compile, to be upstreamed.
+ epatch "${FILESDIR}"/${PN}-tests-r0.patch
+
remove_bundled_lib "third_party/bzip2"
remove_bundled_lib "third_party/codesighs"
remove_bundled_lib "third_party/icu"
@@ -120,9 +124,6 @@ src_prepare() {
remove_bundled_lib "third_party/lzma_sdk"
remove_bundled_lib "third_party/molokocacao"
remove_bundled_lib "third_party/ocmock"
- remove_bundled_lib "third_party/pyftpdlib"
- remove_bundled_lib "third_party/simplejson"
- remove_bundled_lib "third_party/tlslite"
remove_bundled_lib "third_party/yasm"
# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
# TODO: also remove third_party/zlib. For now the compilation fails if we
@@ -259,12 +260,26 @@ src_configure() {
}
src_compile() {
- emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
+ emake chrome chrome_sandbox base_unittests net_unittests \
+ BUILDTYPE=Release V=1 || die
+ pax-mark m out/Release/chrome
+ if use test; then
+ emake base_unittests net_unittests \
+ BUILDTYPE=Release V=1 || die
+ pax-mark m out/Release/{base_unittests,net_unittests}
+ fi
+}
+
+src_test() {
+ # Make test failures non-fatal for now. This needs more investigation.
+ maketype=out/Release/base_unittests virtualmake \
+ || eerror "base_unittests failed"
+ maketype=out/Release/net_unittests virtualmake \
+ || eerror "net_unittests failed"
}
src_install() {
exeinto "${CHROMIUM_HOME}"
- pax-mark m out/Release/chrome
doexe out/Release/chrome
doexe out/Release/chrome_sandbox || die
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"