| 1 |
zx2c4 13/02/28 11:18:16 |
| 2 |
|
| 3 |
Modified: chrome-binary-plugins-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use get_libdir for strict multilib, and do not complain about LDFLAGS. |
| 6 |
|
| 7 |
This fixes bug #459688 |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.6 www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?rev=1.6&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?rev=1.6&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?r1=1.5&r2=1.6 |
| 17 |
|
| 18 |
Index: chrome-binary-plugins-9999.ebuild |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v |
| 21 |
retrieving revision 1.5 |
| 22 |
retrieving revision 1.6 |
| 23 |
diff -u -r1.5 -r1.6 |
| 24 |
--- chrome-binary-plugins-9999.ebuild 31 Jan 2013 09:23:08 -0000 1.5 |
| 25 |
+++ chrome-binary-plugins-9999.ebuild 28 Feb 2013 11:18:16 -0000 1.6 |
| 26 |
@@ -1,9 +1,11 @@ |
| 27 |
# Copyright 1999-2013 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v 1.5 2013/01/31 09:23:08 zx2c4 Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v 1.6 2013/02/28 11:18:16 zx2c4 Exp $ |
| 31 |
|
| 32 |
EAPI=4 |
| 33 |
|
| 34 |
+inherit multilib unpacker |
| 35 |
+ |
| 36 |
DESCRIPTION="Binary plugins -- native API Flash and PDF -- from Google Chrome for use in Chromium." |
| 37 |
HOMEPAGE="http://www.google.com/chrome" |
| 38 |
URI_BASE="https://dl.google.com/linux/direct/" |
| 39 |
@@ -21,7 +23,8 @@ |
| 40 |
|
| 41 |
S="${WORKDIR}/opt/google/chrome" |
| 42 |
|
| 43 |
-inherit unpacker |
| 44 |
+QA_FLAGS_IGNORED="/usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so |
| 45 |
+ /usr/$(get_libdir)/chromium-browser/libpdf.so" |
| 46 |
|
| 47 |
src_unpack() { |
| 48 |
# We have to do this inside of here, since it's a live ebuild. :-( |
| 49 |
@@ -40,7 +43,7 @@ |
| 50 |
src_install() { |
| 51 |
local version flapper |
| 52 |
|
| 53 |
- insinto /usr/lib/chromium-browser/ |
| 54 |
+ insinto /usr/$(get_libdir)/chromium-browser/ |
| 55 |
|
| 56 |
use pdf && doins libpdf.so |
| 57 |
|
| 58 |
@@ -50,7 +53,7 @@ |
| 59 |
# Since this is a live ebuild, we're forced to, unfortuantely, |
| 60 |
# dynamically construct the command line args for Chromium. |
| 61 |
version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json) |
| 62 |
- flapper="${ROOT}usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so" |
| 63 |
+ flapper="${ROOT}usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so" |
| 64 |
echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash |
| 65 |
echo -n "--ppapi-flash-path=$flapper " >> pepper-flash |
| 66 |
echo "--ppapi-flash-version=$version\"" >> pepper-flash |
| 67 |
@@ -59,6 +62,7 @@ |
| 68 |
doins pepper-flash |
| 69 |
fi |
| 70 |
} |
| 71 |
+ |
| 72 |
pkg_postinst() { |
| 73 |
use flash || return |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.6 www-plugins/chrome-binary-plugins/ChangeLog |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?rev=1.6&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?rev=1.6&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?r1=1.5&r2=1.6 |
| 83 |
|
| 84 |
Index: ChangeLog |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v |
| 87 |
retrieving revision 1.5 |
| 88 |
retrieving revision 1.6 |
| 89 |
diff -u -r1.5 -r1.6 |
| 90 |
--- ChangeLog 31 Jan 2013 09:23:08 -0000 1.5 |
| 91 |
+++ ChangeLog 28 Feb 2013 11:18:16 -0000 1.6 |
| 92 |
@@ -1,6 +1,11 @@ |
| 93 |
# ChangeLog for www-plugins/chrome-binary-plugins |
| 94 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 95 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v 1.5 2013/01/31 09:23:08 zx2c4 Exp $ |
| 96 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v 1.6 2013/02/28 11:18:16 zx2c4 Exp $ |
| 97 |
+ |
| 98 |
+ 28 Feb 2013; Jason A. Donenfeld <zx2c4@g.o> |
| 99 |
+ chrome-binary-plugins-9999.ebuild: |
| 100 |
+ Use get_libdir for strict multilib, and do not complain about LDFLAGS. This |
| 101 |
+ fixes bug #459688 |
| 102 |
|
| 103 |
31 Jan 2013; Jason A. Donenfeld <zx2c4@g.o> |
| 104 |
chrome-binary-plugins-9999.ebuild: |
Archives