diff options
| -rw-r--r-- | www-client/chromium/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 13 | ||||
| -rw-r--r-- | www-client/chromium/chromium-26.0.1403.0.ebuild | 19 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999-r1.ebuild | 19 |
4 files changed, 35 insertions, 23 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 3cbeabdeeeb1..dad3045a0a46 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/chromium # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.805 2013/02/15 02:11:35 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.806 2013/02/17 20:15:53 floppym Exp $ + + 17 Feb 2013; Mike Gilbert <floppym@gentoo.org> chromium-26.0.1403.0.ebuild, + chromium-9999-r1.ebuild: + Use the correct values for *.host as suggested by vapier in bug 410883. Move + tc-export from pkg_setup to src_configure. *chromium-25.0.1364.84 (15 Feb 2013) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 5059ef74f408..d8072607971b 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -45,15 +45,16 @@ EBUILD chromium-25.0.1364.68.ebuild 16223 SHA256 2536b65035fa8ee2bc14ebd53709053 EBUILD chromium-25.0.1364.84.ebuild 16223 SHA256 38be592a68aa2714f5bc22fb3fdd83551dc674aea4f8219344069e3f7069fc2f SHA512 b20b069b6dea4bea89fa089279503495f06cef1ece277c4b2fd0934c4983cc8a823ee82f0b7dffe6141081f962da10309e500fb4079ec8b17317a57664fac6a0 WHIRLPOOL 969717ca5c5bd8b7ad8d096a050daa479750740bfe1f4968f9f931a3d534e6d666574470490961e5198fbc6cec62bcd4d8e824dc3c705f33bf307ffa2804fdd6 EBUILD chromium-26.0.1384.2.ebuild 15686 SHA256 96b65ef658b0df34e3f8d625d6b673f9e51eba6e500f217eed9ec0728fe578e6 SHA512 ed1ec1e145aae265f668c9817b52c6e9ba3d3b5e797363027b4d29ce29a17d8903fb1d981354ecea59028ab0af99dcfa288ff13ff1db171921d246ff5d5b071b WHIRLPOOL f7ad67f1281ceb60fcadd2c46a1974b87b671336c6f981179622260eb4246b4a124c7a4cdbcaa87890826360e74b35176d8504f43bd2610fc2845a70167c9abf EBUILD chromium-26.0.1386.0.ebuild 15843 SHA256 4dbeb02dec06f6c9f455d40ad6b3249151a2afddc8c97e60758fad957d351062 SHA512 abf641a14b20cbe95e358ccdf244a335a0eaef334cbb049c7cf6492ddd4d5b6d50cd90ede6db7b09cafe3a3fdc4e7f83e4ee01f0d5fbdd2a82ea8d86dc35d8e6 WHIRLPOOL 048003587244d0a3407483de8b1dc5a7d50db2bdc0a1c9972403eb08a59e85a525236c63bd148f3e155e41b73e969b0542fe0bb1eb0e75d071696a63c281db16 -EBUILD chromium-26.0.1403.0.ebuild 15295 SHA256 1da093f37dbea13cd14a5b757f88a4e49bfc838c0786cbd8969e226fe4fa7470 SHA512 f92f1e6f9d0d9764a50d258830552f4632e3c91eeac30a3261a41f138251d00a9ed4ed53501bd3d7a847343134492f463af48be4af5c204ec27db77ee73ad650 WHIRLPOOL d9333fedd4505bf76eb21b296844054f13ea2820809cf96929131447f32059aaecc2e8287de8e3ad6c0f4bb1fa0e2a8dadc91969af496c91c487502e9807c639 -EBUILD chromium-9999-r1.ebuild 17038 SHA256 9fd18601a4014a09a6c117a60b2fed7d15f2820c6d0bbaf29baa4a9e470a0ef6 SHA512 b705f0c35481c1dcaa86a4ad9d860541d45e770b127571f6631edecd9cc199c2879557160555998e2ebfaee1ae778fcb3f9a180a2a2a43346c5ebebbe0b9dfa1 WHIRLPOOL 8838a43430fc299610e8d09ec024899607b0e52b2865b69d1e22a6a19d72b1a210483083282a7310b9e1af22450868d351b0d57ad6524d5798c7569a16086205 -MISC ChangeLog 53442 SHA256 7f2eb8f4edb883a9394432840cc15002c11256b6215cb75a6c7e6694624f0953 SHA512 a5311fd6ef53665ced52a5374a6b503a935c84cec5f880edd29912e845af010ea4768344e5bcd22052b8007f2eaee7b5591851a222ed0ad1bf83c771d9ab5172 WHIRLPOOL 564c35f8d7ed450fbe7e96e834ee5dba1a26f1d843aad98e1d756c063fd9dee3e204638a7cd185560737836e7a1d6c8bb0bad2614bd79519c3b9cb2c890e409b +EBUILD chromium-26.0.1403.0.ebuild 15440 SHA256 3d29b74e6896fad773caee3c3564d7725bc60078544e729a09b23bef72fd4671 SHA512 50052aa35812baa0cb11e62aaaeb5c62477fc9d9c97107a0ebf73efbd366aaa5790d4c685145a9c29314ed70d2980ca1d04230a5e13ee1440c4f54403f0e5837 WHIRLPOOL f68ef87ab61f1495d31353c31bcc262126c2ec88fe18055b5c5d24ccaccfde5f546dec4cba49ae54b514bf545b06b4bac4548563dffafd9bb0906f456cd24a87 +EBUILD chromium-9999-r1.ebuild 17183 SHA256 9651419f7fa4a0675db5fb23ee543488e79781f2ce0ef54d2bb2a2f3e632d0a6 SHA512 8799621d3309aae4d4f3965b974069af2cbd247eef6d9e9a796c4629423ad344b43761c12e777530b9ef50b2bb53ce2d7732ee888227cd370dd3be9bc4acfaf5 WHIRLPOOL 3cb859e5d04e0e08bc763c5d3d6bbcb92595069aa0c161490ff9651594fc170218d43bd33e8ab3828a1258db5111d4da252dd488ff9140fbee382f9ed20c1d43 +MISC ChangeLog 53672 SHA256 e2153b8df60574ed71f0d6a35088bd4eb0d6d06bf05d2c6dc6ef5164a7fa4f1f SHA512 db6c62c26e835dc769ea9040405d3057bc702243a6d6165ffe1200b158025b64cc22eb561c058ec1a76db9aa9e570b5b045b5198158f089b78c09ede65812947 WHIRLPOOL 13976e0a7785f30699c91157e2b82288b3090d03ce3a5d1e788e1d8f304a51d22ce99f121cf642be627ff42dc5ac7ad0138288d9a43c5c3742bb6378633d6efe MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b +MISC chromium-9999-r1.ebuild.orig 17038 SHA256 9fd18601a4014a09a6c117a60b2fed7d15f2820c6d0bbaf29baa4a9e470a0ef6 SHA512 b705f0c35481c1dcaa86a4ad9d860541d45e770b127571f6631edecd9cc199c2879557160555998e2ebfaee1ae778fcb3f9a180a2a2a43346c5ebebbe0b9dfa1 WHIRLPOOL 8838a43430fc299610e8d09ec024899607b0e52b2865b69d1e22a6a19d72b1a210483083282a7310b9e1af22450868d351b0d57ad6524d5798c7569a16086205 MISC metadata.xml 516 SHA256 e5ca0cf3ef65ca054555c35bbb492d02b40138a907fae82aaa236f774fdef32f SHA512 580852722eb6ce8c660ea05b4b9a6a6ca04582c1438401e92425b6733e7a9423f048818153f59394081df6f89bee349da2b3c97a61e030f995df5ae00bc41b58 WHIRLPOOL 03ac4c1574b769bdeebe082281809af638223bdcbdea1bc2faef86f484e0f26298be769f6311023642257d49eb3d31f223c445b07dba5c6aa699775fcedff8ad -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlEdmVoACgkQC77qH+pIQ6S5pQEAqw176bLr4YL9iICbrtcVtbf4 -KQoN9szq4JHe2EQcV8EBAJuzKJBKvSYj4LAayYkN8hWkxUHUklxau3PpAaQYyAr9 -=cINV +iF4EAREIAAYFAlEhOnwACgkQC77qH+pIQ6QkEgEAylULSLkieew41U3u7xhNINtO +SxsudhVskTR43E5HsmEA/1b/6+2qt9ynAqc4Ew5JMCE3pS4Zdy+P2i0A861mgK9r +=7tqO -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-26.0.1403.0.ebuild b/www-client/chromium/chromium-26.0.1403.0.ebuild index cd0fbbe73b60..bce0a7752410 100644 --- a/www-client/chromium/chromium-26.0.1403.0.ebuild +++ b/www-client/chromium/chromium-26.0.1403.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1403.0.ebuild,v 1.1 2013/02/05 10:31:43 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1403.0.ebuild,v 1.2 2013/02/17 20:15:53 floppym Exp $ EAPI="5" PYTHON_DEPEND="2:2.6" @@ -104,9 +104,6 @@ pkg_setup() { fi CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - # Make sure the build system will use the right python, bug #344367. python_set_active_version 2 python_pkg_setup @@ -323,6 +320,12 @@ src_configure() { strip-flags fi + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX RANLIB + + # Tools for building programs to be executed on the build system, bug #410883. + tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX + egyp_chromium ${myconf} || die } @@ -343,10 +346,10 @@ src_compile() { # See bug #410883 for more info about the .host mess. emake ${make_targets} BUILDTYPE=Release V=1 \ - CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \ - CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \ - LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \ - AR.host="$(tc-getAR)" || die + CC.host="${BUILD_CC}" CFLAGS.host="${BUILD_CFLAGS}" \ + CXX.host="${BUILD_CXX}" CXXFLAGS.host="${BUILD_CXXFLAGS}" \ + LINK.host="${BUILD_CXX}" LDFLAGS.host="${BUILD_LDFLAGS}" \ + AR.host="${BUILD_AR}" || die pax-mark m out/Release/chrome if use test; then diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index dc7e3c13696f..50bfe2256f69 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.164 2013/02/05 10:31:43 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.165 2013/02/17 20:15:53 floppym Exp $ EAPI="5" PYTHON_DEPEND="2:2.6" @@ -162,9 +162,6 @@ pkg_setup() { fi CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - # Make sure the build system will use the right python, bug #344367. python_set_active_version 2 python_pkg_setup @@ -381,6 +378,12 @@ src_configure() { strip-flags fi + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX RANLIB + + # Tools for building programs to be executed on the build system, bug #410883. + tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX + egyp_chromium ${myconf} || die } @@ -401,10 +404,10 @@ src_compile() { # See bug #410883 for more info about the .host mess. emake ${make_targets} BUILDTYPE=Release V=1 \ - CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \ - CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \ - LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \ - AR.host="$(tc-getAR)" || die + CC.host="${BUILD_CC}" CFLAGS.host="${BUILD_CFLAGS}" \ + CXX.host="${BUILD_CXX}" CXXFLAGS.host="${BUILD_CXXFLAGS}" \ + LINK.host="${BUILD_CXX}" LDFLAGS.host="${BUILD_LDFLAGS}" \ + AR.host="${BUILD_AR}" || die pax-mark m out/Release/chrome if use test; then |