From f7af96b1f4d7468cd5800783768c2e404f676140 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 18 Oct 2013 18:46:07 +0000 Subject: Bump. Migrate postinst message to readme.gentoo eclass. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) --- www-client/google-chrome/ChangeLog | 11 +- .../google-chrome-30.0.1599.101_p1.ebuild | 42 ++++- .../google-chrome-31.0.1650.16_beta1.ebuild | 154 ------------------ .../google-chrome-31.0.1650.26_beta1.ebuild | 180 +++++++++++++++++++++ .../google-chrome-32.0.1671.3_alpha1.ebuild | 44 +++-- 5 files changed, 259 insertions(+), 172 deletions(-) delete mode 100644 www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild create mode 100644 www-client/google-chrome/google-chrome-31.0.1650.26_beta1.ebuild (limited to 'www-client') diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog index 34ad8781f8a6..30d51e8c1cc6 100644 --- a/www-client/google-chrome/ChangeLog +++ b/www-client/google-chrome/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-client/google-chrome # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.330 2013/10/15 21:50:40 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.331 2013/10/18 18:46:06 floppym Exp $ + +*google-chrome-31.0.1650.26_beta1 (18 Oct 2013) + + 18 Oct 2013; Mike Gilbert + +google-chrome-31.0.1650.26_beta1.ebuild, + -google-chrome-31.0.1650.16_beta1.ebuild, + google-chrome-30.0.1599.101_p1.ebuild, + google-chrome-32.0.1671.3_alpha1.ebuild: + Bump. Migrate postinst message to readme.gentoo eclass. *google-chrome-30.0.1599.101_p1 (15 Oct 2013) *google-chrome-32.0.1671.3_alpha1 (15 Oct 2013) diff --git a/www-client/google-chrome/google-chrome-30.0.1599.101_p1.ebuild b/www-client/google-chrome/google-chrome-30.0.1599.101_p1.ebuild index 6e32d581e4ac..64027f398d9a 100644 --- a/www-client/google-chrome/google-chrome-30.0.1599.101_p1.ebuild +++ b/www-client/google-chrome/google-chrome-30.0.1599.101_p1.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/google-chrome/google-chrome-30.0.1599.101_p1.ebuild,v 1.1 2013/10/15 21:50:40 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-30.0.1599.101_p1.ebuild,v 1.2 2013/10/18 18:46:06 floppym Exp $ EAPI="4" @@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW" -inherit chromium eutils multilib pax-utils unpacker +inherit readme.gentoo chromium eutils multilib pax-utils unpacker DESCRIPTION="The web browser from Google" HOMEPAGE="http://www.google.com/chrome" @@ -88,6 +88,33 @@ done QA_PREBUILT="*" S=${WORKDIR} +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: + - media-fonts/arphicfonts + - media-fonts/bitstream-cyberbit + - media-fonts/droid + - media-fonts/ipamonafont + - media-fonts/ja-ipafonts + - media-fonts/takao-fonts + - media-fonts/wqy-microhei + - media-fonts/wqy-zenhei + +Depending on your desktop environment, you may need +to install additional packages to get icons on the Downloads page. + +For KDE, the required package is kde-base/oxygen-icons. + +For other desktop environments, try one of the following: + - x11-themes/gnome-icon-theme + - x11-themes/tango-icon-theme + +Please notice the bundled flash player (PepperFlash). +You can (de)activate all flash plugins via chrome://plugins +" + pkg_nofetch() { eerror "Please wait 24 hours before reporting a bug for google-chrome fetch failures." } @@ -124,6 +151,8 @@ src_install() { insinto /usr/share/icons/hicolor/${size}x${size}/apps newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png done + + readme.gentoo_create_doc } any_cpu_missing_flag() { @@ -143,10 +172,7 @@ pkg_preinst() { } pkg_postinst() { - chromium_pkg_postinst - - einfo - elog "Please notice the bundled flash player (PepperFlash)." - elog "You can (de)activate all flash plugins via chrome://plugins" - einfo + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog } diff --git a/www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild b/www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild deleted file mode 100644 index 264099bb2c8e..000000000000 --- a/www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.16_beta1.ebuild,v 1.1 2013/10/09 23:12:09 floppym Exp $ - -EAPI="4" - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" - -inherit chromium eutils multilib pax-utils unpacker - -DESCRIPTION="The web browser from Google" -HOMEPAGE="http://www.google.com/chrome" - -case ${PV} in - *_alpha*) - SLOT="unstable" - MY_PV=${PV/_alpha/-} - ;; - *_beta*) - SLOT="beta" - MY_PV=${PV/_beta/-} - ;; - *_p*) - SLOT="stable" - MY_PV=${PV/_p/-} - ;; - *) - die "Invalid value for \${PV}: ${PV}" - ;; -esac - -MY_PN="${PN}-${SLOT}" -MY_P="${MY_PN}_${MY_PV}" - -SRC_URI=" - amd64? ( - http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb - ) - x86? ( - http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb - ) -" - -LICENSE="google-chrome" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+plugins" -RESTRICT="bindist mirror strip" - -RDEPEND=" - app-arch/bzip2 - app-misc/ca-certificates - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/libgcrypt - dev-libs/nspr - dev-libs/nss - gnome-base/gconf:2 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype - net-print/cups - sys-apps/dbus - >=sys-devel/gcc-4.4.0[cxx] - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - >=x11-libs/libX11-1.5.0 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/pango - x11-misc/xdg-utils -" - -# Add blockers for the other slots. -for x in 0 beta stable; do - if [[ ${SLOT} != ${x} ]]; then - RDEPEND+=" !${CATEGORY}/${PN}:${x}" - fi -done - -QA_PREBUILT="*" -S=${WORKDIR} - -pkg_nofetch() { - eerror "Please wait 24 hours before reporting a bug for google-chrome fetch failures." -} - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_install() { - CHROME_HOME="opt/google/chrome" - - mv opt usr "${D}" || die - cd "${D}" || die - - pax-mark m "${CHROME_HOME}/chrome" - chmod u+s "${CHROME_HOME}/chrome-sandbox" || die - rm -rf usr/share/menu || die - mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die - dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0" - - pushd "${CHROME_HOME}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - if use plugins ; then - local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" - sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ - -i "${CHROME_HOME}/${PN}" || die - fi - - domenu "${CHROME_HOME}/${PN}.desktop" || die - local size - for size in 16 22 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png - done -} - -any_cpu_missing_flag() { - local value=$1 - grep '^flags' /proc/cpuinfo | grep -qv "$value" -} - -pkg_preinst() { - chromium_pkg_preinst - if any_cpu_missing_flag sse2; then - ewarn "The bundled PepperFlash plugin requires a CPU that supports the" - ewarn "SSE2 instruction set, and at least one of your CPUs does not" - ewarn "support this feature. Disabling PepperFlash." - sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \ - -i "${D}${CHROME_HOME}google-chrome" || die - fi -} - -pkg_postinst() { - chromium_pkg_postinst - - einfo - elog "Please notice the bundled flash player (PepperFlash)." - elog "You can (de)activate all flash plugins via chrome://plugins" - einfo -} diff --git a/www-client/google-chrome/google-chrome-31.0.1650.26_beta1.ebuild b/www-client/google-chrome/google-chrome-31.0.1650.26_beta1.ebuild new file mode 100644 index 000000000000..3bc9a09295d7 --- /dev/null +++ b/www-client/google-chrome/google-chrome-31.0.1650.26_beta1.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.26_beta1.ebuild,v 1.1 2013/10/18 18:46:06 floppym Exp $ + +EAPI="4" + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr + sv sw ta te th tr uk vi zh_CN zh_TW" + +inherit readme.gentoo chromium eutils multilib pax-utils unpacker + +DESCRIPTION="The web browser from Google" +HOMEPAGE="http://www.google.com/chrome" + +case ${PV} in + *_alpha*) + SLOT="unstable" + MY_PV=${PV/_alpha/-} + ;; + *_beta*) + SLOT="beta" + MY_PV=${PV/_beta/-} + ;; + *_p*) + SLOT="stable" + MY_PV=${PV/_p/-} + ;; + *) + die "Invalid value for \${PV}: ${PV}" + ;; +esac + +MY_PN="${PN}-${SLOT}" +MY_P="${MY_PN}_${MY_PV}" + +SRC_URI=" + amd64? ( + http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb + ) + x86? ( + http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb + ) +" + +LICENSE="google-chrome" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+plugins" +RESTRICT="bindist mirror strip" + +RDEPEND=" + app-arch/bzip2 + app-misc/ca-certificates + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/libgcrypt + dev-libs/nspr + dev-libs/nss + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + net-print/cups + sys-apps/dbus + >=sys-devel/gcc-4.4.0[cxx] + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + >=x11-libs/libX11-1.5.0 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + x11-libs/pango + x11-misc/xdg-utils +" + +# Add blockers for the other slots. +for x in 0 beta stable; do + if [[ ${SLOT} != ${x} ]]; then + RDEPEND+=" !${CATEGORY}/${PN}:${x}" + fi +done + +QA_PREBUILT="*" +S=${WORKDIR} + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: + - media-fonts/arphicfonts + - media-fonts/bitstream-cyberbit + - media-fonts/droid + - media-fonts/ipamonafont + - media-fonts/ja-ipafonts + - media-fonts/takao-fonts + - media-fonts/wqy-microhei + - media-fonts/wqy-zenhei + +Depending on your desktop environment, you may need +to install additional packages to get icons on the Downloads page. + +For KDE, the required package is kde-base/oxygen-icons. + +For other desktop environments, try one of the following: + - x11-themes/gnome-icon-theme + - x11-themes/tango-icon-theme + +Please notice the bundled flash player (PepperFlash). +You can (de)activate all flash plugins via chrome://plugins +" + +pkg_nofetch() { + eerror "Please wait 24 hours before reporting a bug for google-chrome fetch failures." +} + +pkg_setup() { + chromium_suid_sandbox_check_kernel_config +} + +src_install() { + CHROME_HOME="opt/google/chrome" + + mv opt usr "${D}" || die + cd "${D}" || die + + pax-mark m "${CHROME_HOME}/chrome" + chmod u+s "${CHROME_HOME}/chrome-sandbox" || die + rm -rf usr/share/menu || die + mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die + dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0" + + pushd "${CHROME_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + if use plugins ; then + local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" + sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ + -i "${CHROME_HOME}/${PN}" || die + fi + + domenu "${CHROME_HOME}/${PN}.desktop" || die + local size + for size in 16 22 24 32 48 64 128 256 ; do + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png + done + + readme.gentoo_create_doc +} + +any_cpu_missing_flag() { + local value=$1 + grep '^flags' /proc/cpuinfo | grep -qv "$value" +} + +pkg_preinst() { + chromium_pkg_preinst + if any_cpu_missing_flag sse2; then + ewarn "The bundled PepperFlash plugin requires a CPU that supports the" + ewarn "SSE2 instruction set, and at least one of your CPUs does not" + ewarn "support this feature. Disabling PepperFlash." + sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \ + -i "${D}${CHROME_HOME}google-chrome" || die + fi +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} diff --git a/www-client/google-chrome/google-chrome-32.0.1671.3_alpha1.ebuild b/www-client/google-chrome/google-chrome-32.0.1671.3_alpha1.ebuild index 5edf831b7b2f..0dff13ecc4ed 100644 --- a/www-client/google-chrome/google-chrome-32.0.1671.3_alpha1.ebuild +++ b/www-client/google-chrome/google-chrome-32.0.1671.3_alpha1.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/google-chrome/google-chrome-32.0.1671.3_alpha1.ebuild,v 1.1 2013/10/15 21:50:40 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-32.0.1671.3_alpha1.ebuild,v 1.2 2013/10/18 18:46:06 floppym Exp $ EAPI="4" @@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW" -inherit chromium eutils multilib pax-utils unpacker +inherit readme.gentoo chromium eutils multilib pax-utils unpacker DESCRIPTION="The web browser from Google" HOMEPAGE="http://www.google.com/chrome" @@ -91,6 +91,33 @@ done QA_PREBUILT="*" S=${WORKDIR} +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: + - media-fonts/arphicfonts + - media-fonts/bitstream-cyberbit + - media-fonts/droid + - media-fonts/ipamonafont + - media-fonts/ja-ipafonts + - media-fonts/takao-fonts + - media-fonts/wqy-microhei + - media-fonts/wqy-zenhei + +Depending on your desktop environment, you may need +to install additional packages to get icons on the Downloads page. + +For KDE, the required package is kde-base/oxygen-icons. + +For other desktop environments, try one of the following: + - x11-themes/gnome-icon-theme + - x11-themes/tango-icon-theme + +Please notice the bundled flash player (PepperFlash). +You can (de)activate all flash plugins via chrome://plugins +" + pkg_nofetch() { eerror "Please wait 24 hours before reporting a bug for google-chrome fetch failures." } @@ -108,7 +135,7 @@ src_install() { pax-mark m "${CHROME_HOME}/chrome" chmod u+s "${CHROME_HOME}/chrome-sandbox" || die rm -rf usr/share/menu || die - mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die + mv usr/share/doc/${PN} usr/share/doc/${PF} || die dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0" pushd "${CHROME_HOME}/locales" > /dev/null || die @@ -126,6 +153,8 @@ src_install() { for size in 16 22 24 32 48 64 128 256 ; do newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png done + + readme.gentoo_create_doc } any_cpu_missing_flag() { @@ -145,10 +174,7 @@ pkg_preinst() { } pkg_postinst() { - chromium_pkg_postinst - - einfo - elog "Please notice the bundled flash player (PepperFlash)." - elog "You can (de)activate all flash plugins via chrome://plugins" - einfo + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog } -- cgit v1.2.3-65-gdbad