Dev channel bump. Use readme.gentoo eclass (bug #487136 by pacho; patch by floppym based on pacho's original patch). Remove old.

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 30427902)

2 files changed, 55 insertions, 18 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 7b501a0773b9..996351f19fc4 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.969 2013/10/20 02:47:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.970 2013/10/23 19:08:06 phajdan.jr Exp $
+
+*chromium-32.0.1678.0 (23 Oct 2013)
+
+  23 Oct 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-32.0.1664.3-r1.ebuild, +chromium-32.0.1678.0.ebuild:
+  Dev channel bump. Use readme.gentoo eclass (bug #487136 by pacho; patch by
+  floppym based on pacho's original patch). Remove old.
 
   20 Oct 2013; Mike Gilbert <floppym@gentoo.org> chromium-32.0.1671.3.ebuild:
   Re-enable V8 snapshot on PaX systems.
diff --git a/www-client/chromium/chromium-32.0.1664.3-r1.ebuild b/www-client/chromium/chromium-32.0.1678.0.ebuild
index df1bfbe0376e..4c1636d65773 100644
--- a/www-client/chromium/chromium-32.0.1664.3-r1.ebuild
+++ b/www-client/chromium/chromium-32.0.1678.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-32.0.1664.3-r1.ebuild,v 1.1 2013/10/15 03:55:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1678.0.ebuild,v 1.1 2013/10/23 19:08:06 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,8 +9,8 @@ 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 flag-o-matic multilib multiprocessing \
-	pax-utils portability python-any-r1 toolchain-funcs versionator virtualx
+inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -46,7 +46,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	dev-libs/libxslt:=
 	dev-libs/nspr:=
 	>=dev-libs/nss-3.12.3:=
-	dev-libs/protobuf:=
+	>=dev-libs/protobuf-2.5.0:=
 	dev-libs/re2:=
 	gnome? ( >=gnome-base/gconf-2.24.0:= )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
@@ -75,7 +75,7 @@ DEPEND="${RDEPEND}
 	)
 	dev-lang/perl
 	dev-perl/JSON
-	dev-python/jinja
+	>=dev-python/jinja-2.7
 	dev-python/ply
 	dev-python/simplejson
 	>=dev-util/gperf-3.0.3
@@ -97,6 +97,30 @@ if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi
 
+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
+"
+
 pkg_setup() {
 	if [[ "${SLOT}" == "0" ]]; then
 		CHROMIUM_SUFFIX=""
@@ -126,9 +150,7 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-chromedriver-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-jinja-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r1.patch"
 
 	epatch_user
 
@@ -318,10 +340,11 @@ src_configure() {
 
 	local myarch="$(tc-arch)"
 	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
+		target_arch=x64
 	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
+		target_arch=ia32
 	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
 		# TODO: re-enable NaCl (NativeClient).
 		local CTARGET=${CTARGET:-${CHOST}}
 		if [[ $(tc-is-softfloat) == "no" ]]; then
@@ -336,19 +359,14 @@ src_configure() {
 		else
 			myconf+=" -Darmv7=0"
 		fi
-		myconf+=" -Dtarget_arch=arm
-			-Dsysroot=
+		myconf+=" -Dsysroot=
 			$(gyp_use neon arm_neon)
 			-Ddisable_nacl=1"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
 
-	if host-is-pax; then
-		# Prevent the build from failing (bug #301880, bug #487144). The performance
-		# difference is very small.
-		myconf+=" -Dv8_use_snapshot=0"
-	fi
+	myconf+=" -Dtarget_arch=${target_arch}"
 
 	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
 	# Depending on GCC version the warnings are different and we don't want
@@ -392,6 +410,10 @@ src_compile() {
 		ninja_targets+=" $test_targets"
 	fi
 
+	# Build mksnapshot and pax-mark it.
+	ninja -C out/Release -v -j $(makeopts_jobs) mksnapshot.${target_arch} || die
+	pax-mark m out/Release/mksnapshot.${target_arch}
+
 	# Even though ninja autodetects number of CPUs, we respect
 	# user's options, for debugging with -j 1 or any other reason.
 	ninja -C out/Release -v -j $(makeopts_jobs) ${ninja_targets} || die
@@ -563,4 +585,12 @@ src_install() {
 				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
 		fi
 	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
 }