# ChangeLog for www-client/chromium
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.476 2011/10/25 21:49:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.477 2011/10/26 09:26:44 phajdan.jr Exp $
+
+*chromium-16.0.912.12 (26 Oct 2011)
+
+ 26 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-16.0.912.0.ebuild, +chromium-16.0.912.12.ebuild,
+ chromium-9999-r1.ebuild:
+ Version bump for dev channel release. Further reduce number of differences
+ between live and non-live ebuilds. Remove old.
25 Oct 2011; Mike Gilbert <floppym@gentoo.org> chromium-15.0.874.102.ebuild:
Stable on amd64 wrt bug 388461. Arch tested by ago.
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
DIST chromium-14.0.835.202.tar.bz2 155892873 RMD160 af580b4fa74416a66a701343dcd9fa7815e46041 SHA1 e1c2d7cacaa256b1d343ee012d07170dbb3beb2f SHA256 8fcbeda57e45c990257c0ef2a021fad5e58dca1686688ffaccc2d6fa421fe0db
DIST chromium-15.0.874.100.tar.bz2 151359223 RMD160 7afc1d06ec17233621f4eb27d9324f2e35387f7b SHA1 f621cc6798c2ef2a50606caa6de3fff02dc1d4bf SHA256 2a5294db10a32167f72b45a6eb15950541cd76ad3e4b8eaf93cb81cec78d45e1
DIST chromium-15.0.874.102.tar.bz2 151371123 RMD160 dfca6a43e773666334c5a40d50fc86c5ee3c335b SHA1 961392fbde1f99a40b860454565e8be3b752a3cf SHA256 63c94003a2152d9b7ec51e9126d6848c3d1ec7088ba6879f47f4b594b00ad878
-DIST chromium-16.0.912.0.tar.bz2 154388454 RMD160 93459c8dfcc9024e82d43411500bc225ac4bb810 SHA1 5b3a021ca4ee32c3dcb69e47716a2ea75f5d6452 SHA256 a6996196f5e8301ca3ac4851a04dd94210815dccc5c5d779fdff9142893185b7
+DIST chromium-16.0.912.12.tar.bz2 154564973 RMD160 219b54529981a44d263518247c6cd7c3379c6c1b SHA1 9bd700be444edf6769ce8428174d00b2519d48ff SHA256 9c67182ce2a77cc9bae62ace8b8985bf3deb5066e6fb5fc40a0dcd5e3dc737c7
DIST chromium-16.0.912.4.tar.bz2 154512361 RMD160 8819d50c05b4eae4da7f70010d9af6251499dfd2 SHA1 aace46aef9e57880efa6e73b3f7943e46e1bef28 SHA256 18456509f7d33cc988fde4ad3fe1498ff54aa7c383285ce4422a7bf539eaf156
EBUILD chromium-14.0.835.202.ebuild 13789 RMD160 7a3c1f7d22f9285e5f89ec3a557d5dbf7e7cb118 SHA1 bc2a1024a5c347b283c4d932f7c2fcb29d24b64a SHA256 3b81df285e1053d7b7850edb5fcc79523f79ed236a269d1ca55c60df4d8338bb
EBUILD chromium-15.0.874.100.ebuild 14256 RMD160 0ccedd6afe484844a8bc32753dbbc025c6772c59 SHA1 151dec37489bb19c546309d773b2cea3cc9df62d SHA256 99b66cc4eae4cb903db33bee80fdd666853b36139a9db86eac8272589921233a
EBUILD chromium-15.0.874.102.ebuild 14142 RMD160 1c4a9330122e3ca2ec2ea7f5d8c6549ac0fb4481 SHA1 f1db9ed04c432ca6db1a5a8b4d460f6252c1bf5e SHA256 22c8518b24468e1a81a8eaf98d94c47b0c76873ddaa8b8c7f54aef198713135f
-EBUILD chromium-16.0.912.0.ebuild 15531 RMD160 27e59c752973378d9969872536ad17f2ce05defb SHA1 7c93d6425a228d77b0680d2b8c52a31beb515fbf SHA256 71458295f6d5d399f52d89e9e1e279e2b693502e85e1a192dc0ba191fd463a95
+EBUILD chromium-16.0.912.12.ebuild 16453 RMD160 008d8dfad41de45b1e10149b85e764e587040160 SHA1 cea18d7ecfa11935d0ebbc420405f5c762453689 SHA256 529e13335db4087e0b6e5369cf9db0786f0e5e657866ca8ed08d650be8b4bf6a
EBUILD chromium-16.0.912.4.ebuild 15480 RMD160 960ac59265d804d5aef7e12024a3645e4f674128 SHA1 5c90f0d0f5a3a09d5d8374edc1d9c5c289045926 SHA256 378b74a63774420eb7c14708712feded7bc6e141cc2eb2cb9708fbaa9933510d
-EBUILD chromium-9999-r1.ebuild 17998 RMD160 2f6b35b70de797e2e0e0a19e62234aa868f60ed4 SHA1 5768086623816f951b6f2344c3659dfbc10d5d07 SHA256 751af1a7e32c225fd90e424cdf96646c9ae8afce93a3a4129b7e957d5730a30e
-MISC ChangeLog 105088 RMD160 e3d4e7571314b7c9e94c6a142692c3924fecc88f SHA1 43b4c8911db390e12276b19e787577b36d1a392d SHA256 75fc24bf72252ac166f7901b719461a794be4743b94c7d2c7ec431bf5af13394
+EBUILD chromium-9999-r1.ebuild 18324 RMD160 b3264ec9143e0f372a3701db033a5d01020771a0 SHA1 541c77000cf9f931deeedaa5fbf8cf0e96de061b SHA256 e2f3cd6325774da624866c58e0d202d7ac79d2e167915483d0919036902fd7d1
+MISC ChangeLog 105398 RMD160 a6a1e5d0dd44d08b2afaf410f4f409bfa0ae0b94 SHA1 9d31f02eb113a6a0d4ce64075b1e5203fa9a3ffc SHA256 f728d08a9a65d2f2d6900eede74235d895eefca3cb27e705498e3c3c7ed03410
MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk6nLtcACgkQC77qH+pIQ6TT4wD/fCSDnDkHTjTx2yXi2171jaa2
-f9a6Rq6xZW6fjlxM4YsA/iPMj0xjEoIxplv7pcwYtQR43DKU7FOXXM/B6WFTfXSW
-=1r8v
+iEYEAREKAAYFAk6n0lsACgkQuUQtlDBCeQISIQCeJRpkPohKmGzhv2qUp7X5ERyb
+3T4An2pXUI0GFxyM26dXLFfx3Gr1U0RH
+=sAyF
-----END PGP SIGNATURE-----
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.0.ebuild,v 1.1 2011/10/19 21:49:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.12.ebuild,v 1.1 2011/10/26 09:26:44 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
+SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bindist chromedriver cups gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio"
# en_US is ommitted on purpose from the list below. It must always be available.
LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
DEPEND="${RDEPEND}
dev-lang/nacl-toolchain-newlib
dev-lang/perl
+ dev-python/simplejson
>=dev-util/gperf-3.0.3
>=dev-util/pkgconfig-0.23
- dev-python/simplejson
>=sys-devel/bison-2.4.3
sys-devel/flex
>=sys-devel/make-3.81-r2
test? ( dev-python/pyftpdlib )"
RDEPEND+="
+ !=www-client/chromium-9999
x11-misc/xdg-utils
virtual/ttf-fonts"
}
pkg_setup() {
- CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+ if [[ "${SLOT}" == "0" ]]; then
+ CHROMIUM_SUFFIX=""
+ else
+ CHROMIUM_SUFFIX="-${SLOT}"
+ 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
}
src_compile() {
- emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
+ emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die
pax-mark m out/Release/chrome
- if use chromedriver; then
- emake chromedriver BUILDTYPE=Release V=1 || die
- fi
if use test; then
emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
doexe out/Release/chrome_sandbox || die
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
- if use chromedriver; then
- doexe out/Release/chromedriver || die
- fi
+ doexe out/Release/chromedriver || die
# Install Native Client files on platforms that support it.
insinto "${CHROMIUM_HOME}"
esac
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ fi
# It is important that we name the target "chromium-browser",
# xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
# keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
# Allow users to override command-line options, bug #357629.
dodir /etc/chromium || die
doins -r out/Release/locales || die
doins -r out/Release/resources || die
- newman out/Release/chrome.1 chromium.1 || die
- newman out/Release/chrome.1 chromium-browser.1 || die
+ 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
for SIZE in 16 22 24 32 48 64 128 256 ; do
insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
- chromium-browser.png || die
+ chromium-browser${CHROMIUM_SUFFIX}.png || die
done
local mime_types="text/html;text/xml;application/xhtml+xml;"
mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- make_desktop_entry chromium-browser "Chromium" chromium-browser \
+ make_desktop_entry \
+ chromium-browser${CHROMIUM_SUFFIX} \
+ "Chromium${CHROMIUM_SUFFIX}" \
+ chromium-browser${CHROMIUM_SUFFIX} \
"Network;WebBrowser" \
"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
if use gnome; then
dodir /usr/share/gnome-control-center/default-apps || die
insinto /usr/share/gnome-control-center/default-apps
- doins "${FILESDIR}"/chromium-browser.xml || die
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+ "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+ fi
fi
}
# Copyright 1999-2011 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.63 2011/10/24 14:20:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.64 2011/10/26 09:26:44 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
}
pkg_setup() {
- SUFFIX="-${SLOT}"
- CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${SUFFIX}"
+ if [[ "${SLOT}" == "0" ]]; then
+ CHROMIUM_SUFFIX=""
+ else
+ CHROMIUM_SUFFIX="-${SLOT}"
+ 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
esac
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
- sed "s:chromium-browser:chromium-browser${SUFFIX}:g" \
- -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
- sed "s:chromium.desktop:chromium${SUFFIX}.desktop:g" \
- -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
- sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${SUFFIX}:" \
- -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ fi
# It is important that we name the target "chromium-browser",
# xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${SUFFIX} || die
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
# keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${SUFFIX} || die
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
# Allow users to override command-line options, bug #357629.
dodir /etc/chromium || die
doins -r out/Release/locales || die
doins -r out/Release/resources || die
- newman out/Release/chrome.1 chromium${SUFFIX}.1 || die
- newman out/Release/chrome.1 chromium-browser${SUFFIX}.1 || die
+ 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
for SIZE in 16 22 24 32 48 64 128 256 ; do
insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
- chromium-browser${SUFFIX}.png || die
+ chromium-browser${CHROMIUM_SUFFIX}.png || die
done
local mime_types="text/html;text/xml;application/xhtml+xml;"
mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- make_desktop_entry chromium-browser${SUFFIX} "Chromium ${SLOT}" chromium-browser${SUFFIX} \
+ make_desktop_entry \
+ chromium-browser${CHROMIUM_SUFFIX} \
+ "Chromium${CHROMIUM_SUFFIX}" \
+ chromium-browser${CHROMIUM_SUFFIX} \
"Network;WebBrowser" \
"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
if use gnome; then
dodir /usr/share/gnome-control-center/default-apps || die
insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser${SUFFIX}.xml || die
- sed "s:chromium-browser:chromium-browser${SUFFIX}:g" -i \
- "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${SUFFIX}.xml
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+ "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+ fi
fi
}