From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21AFB138330 for ; Mon, 5 Sep 2016 04:52:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B056E0941; Mon, 5 Sep 2016 04:52:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 100C3E0941 for ; Mon, 5 Sep 2016 04:52:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 536183407D0 for ; Mon, 5 Sep 2016 04:52:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA271246F for ; Mon, 5 Sep 2016 04:52:45 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1473051162.c52485a2413414510b9239a0b8e89bae5834c18d.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild X-VCS-Directories: www-plugins/chrome-binary-plugins/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c52485a2413414510b9239a0b8e89bae5834c18d X-VCS-Branch: master Date: Mon, 5 Sep 2016 04:52:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 42668e68-5721-4f43-8cfc-d7fa30afda3d X-Archives-Hash: 7becd5282e3c4718ed8ceb9037063f7b commit: c52485a2413414510b9239a0b8e89bae5834c18d Author: Mike Gilbert gentoo org> AuthorDate: Mon Sep 5 04:52:23 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Sep 5 04:52:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52485a2 www-plugins/chrome-binary-plugins: change install location Install in /usr/lib64/chromium, where they may be detected by QtWebEngine. Bug: https://bugs.gentoo.org/592896 Package-Manager: portage-2.3.0_p24 .../chrome-binary-plugins-53.0.2785.92.ebuild | 7 ++++--- .../chrome-binary-plugins-53.0.2785.92_beta.ebuild | 9 +++++---- .../chrome-binary-plugins-54.0.2840.8_alpha.ebuild | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild index 94dadcf..2757b38 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92.ebuild @@ -53,10 +53,11 @@ pkg_nofetch() { src_install() { local version flapper - insinto /usr/$(get_libdir)/chromium-browser/ + insinto /usr/$(get_libdir)/chromium if use widevine; then - doins libwidevinecdm.so + doins libwidevinecdm.so libwidevinecdmadapter.so + dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version doins widevine.version fi @@ -67,7 +68,7 @@ src_install() { # Since this is a live ebuild, we're forced to, unfortuantely, # dynamically construct the command line args for Chromium. version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json) - flapper="${EPREFIX}/usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so" + flapper="${EPREFIX}/usr/$(get_libdir)/chromium/PepperFlash/libpepflashplayer.so" echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash echo -n "--ppapi-flash-path=$flapper " >> pepper-flash echo "--ppapi-flash-version=$version\"" >> pepper-flash diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild index 07c207f..2757b38 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-53.0.2785.92_beta.ebuild @@ -31,7 +31,7 @@ MY_PN="google-chrome-${SLOT}" MY_P="${MY_PN}_${MY_PV}" SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" LICENSE="google-chrome" IUSE="+flash +widevine" @@ -53,10 +53,11 @@ pkg_nofetch() { src_install() { local version flapper - insinto /usr/$(get_libdir)/chromium-browser/ + insinto /usr/$(get_libdir)/chromium if use widevine; then - doins libwidevinecdm.so + doins libwidevinecdm.so libwidevinecdmadapter.so + dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version doins widevine.version fi @@ -67,7 +68,7 @@ src_install() { # Since this is a live ebuild, we're forced to, unfortuantely, # dynamically construct the command line args for Chromium. version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json) - flapper="${EPREFIX}/usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so" + flapper="${EPREFIX}/usr/$(get_libdir)/chromium/PepperFlash/libpepflashplayer.so" echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash echo -n "--ppapi-flash-path=$flapper " >> pepper-flash echo "--ppapi-flash-version=$version\"" >> pepper-flash diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild index d7fd45a..27b7eea 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-54.0.2840.8_alpha.ebuild @@ -53,10 +53,10 @@ pkg_nofetch() { src_install() { local version - insinto /usr/$(get_libdir)/chromium-browser/ - + insinto /usr/$(get_libdir)/chromium if use widevine; then - doins libwidevinecdm.so + doins libwidevinecdm.so libwidevinecdmadapter.so + dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version doins widevine.version fi