Dev channel bump. Use bundled icu. Remove broken widevine support (bug #547630 by Austin M. Matherne). Remove old.

(Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)

2 files changed, 13 insertions, 26 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 1ea12b17d2be..1d8aa00c3202 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1232 2015/05/06 01:58:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1233 2015/05/06 19:52:39 phajdan.jr Exp $
+
+*chromium-44.0.2391.0 (06 May 2015)
+
+  06 May 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-44.0.2376.0.ebuild, +chromium-44.0.2391.0.ebuild:
+  Dev channel bump. Use bundled icu. Remove broken widevine support (bug
+  #547630 by Austin M. Matherne). Remove old.
 
 *chromium-43.0.2357.45 (06 May 2015)
 
diff --git a/www-client/chromium/chromium-44.0.2376.0.ebuild b/www-client/chromium/chromium-44.0.2391.0.ebuild
index d231bd4f62cb..1f7e69d16033 100644
--- a/www-client/chromium/chromium-44.0.2376.0.ebuild
+++ b/www-client/chromium/chromium-44.0.2391.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2376.0.ebuild,v 1.2 2015/04/23 05:12:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2391.0.ebuild,v 1.1 2015/05/06 19:52:39 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring hidpi kerberos neon pic proprietary-codecs pulseaudio selinux +tcmalloc widevine"
+IUSE="cups gnome gnome-keyring hidpi kerberos neon pic proprietary-codecs pulseaudio selinux +tcmalloc"
 RESTRICT="proprietary-codecs? ( bindist )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
@@ -37,7 +37,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat:=
 	dev-libs/glib:=
-	dev-libs/icu:=
 	>=dev-libs/jsoncpp-0.5.0-r1:=
 	>=dev-libs/libevent-1.4.13:=
 	dev-libs/libxml2:=[icu]
@@ -93,10 +92,7 @@ DEPEND="${RDEPEND}
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
-	virtual/pkgconfig
-	widevine? ( www-plugins/chrome-binary-plugins[widevine] )"
-	# We build-dep on having widevine, because the patch
-	# below must extract the current version.
+	virtual/pkgconfig"
 
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND+="
@@ -193,20 +189,6 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
 	epatch "${FILESDIR}/${PN}-libsecret-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-libvpx-r0.patch"
-
-	if use widevine; then
-		local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")"
-		[[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version."
-		sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch"
-		epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch"
-		local WIDEVINE_SUPPORTED_ARCHS="x64 ia32"
-		local arch
-		for arch in $WIDEVINE_SUPPORTED_ARCHS; do
-			mkdir -p third_party/widevine/cdm/linux/$arch
-			cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine."
-		done
-	fi
 
 	epatch_user
 
@@ -246,6 +228,7 @@ src_prepare() {
 		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
 		'third_party/hunspell' \
 		'third_party/iccjpeg' \
+		'third_party/icu' \
 		'third_party/jstemplate' \
 		'third_party/khronos' \
 		'third_party/leveldatabase' \
@@ -331,6 +314,7 @@ src_configure() {
 
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_icu (needs http://bugs.icu-project.org/trac/ticket/11358)
 	# TODO: use_system_libsrtp (bug #459932).
 	# TODO: use_system_libusb (http://crbug.com/266149).
 	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
@@ -341,7 +325,6 @@ src_configure() {
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
 		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
 		-Duse_system_jsoncpp=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
@@ -598,9 +581,6 @@ src_install() {
 	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
 	doexe out/Release/libffmpegsumo.so || die
-	if use widevine; then
-		doexe out/Release/libwidevinecdmadapter.so || die
-	fi
 
 	# Install icons and desktop entry.
 	local branding size