diff options
| author |   Jason A. Donenfeld <zx2c4@gentoo.org> | 2013-02-28 11:18:16 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2013-02-28 11:18:16 +0000 |
| commit | f67319c47ad6a8dc18d61772e38b82e2775f8a8e (patch) | |
| tree | 9e1a9b8c603733cd3e4a07d75696f8a5d1a5fa16 /www-plugins | |
| parent | EAPI bump, ebuild cleanups and fix bug #459560. Thanks Diego (flameeyes). (diff) | |
| download | gentoo-2-f67319c47ad6a8dc18d61772e38b82e2775f8a8e.tar.gz gentoo-2-f67319c47ad6a8dc18d61772e38b82e2775f8a8e.tar.bz2 gentoo-2-f67319c47ad6a8dc18d61772e38b82e2775f8a8e.zip | |
Use get_libdir for strict multilib, and do not complain about LDFLAGS.
This fixes bug #459688
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)
Diffstat (limited to 'www-plugins')
| -rw-r--r-- | www-plugins/chrome-binary-plugins/ChangeLog | 7 | ||||
| -rw-r--r-- | www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/www-plugins/chrome-binary-plugins/ChangeLog b/www-plugins/chrome-binary-plugins/ChangeLog index 073e87cbe0ec..bbb9c61c0338 100644 --- a/www-plugins/chrome-binary-plugins/ChangeLog +++ b/www-plugins/chrome-binary-plugins/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-plugins/chrome-binary-plugins # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v 1.5 2013/01/31 09:23:08 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v 1.6 2013/02/28 11:18:16 zx2c4 Exp $ + + 28 Feb 2013; Jason A. Donenfeld <zx2c4@gentoo.org> + chrome-binary-plugins-9999.ebuild: + Use get_libdir for strict multilib, and do not complain about LDFLAGS. This + fixes bug #459688 31 Jan 2013; Jason A. Donenfeld <zx2c4@gentoo.org> chrome-binary-plugins-9999.ebuild: diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild index b8060029c44a..83a717fcf9a2 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI=4 +inherit multilib unpacker + DESCRIPTION="Binary plugins -- native API Flash and PDF -- from Google Chrome for use in Chromium." HOMEPAGE="http://www.google.com/chrome" URI_BASE="https://dl.google.com/linux/direct/" @@ -21,7 +23,8 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/opt/google/chrome" -inherit unpacker +QA_FLAGS_IGNORED="/usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so + /usr/$(get_libdir)/chromium-browser/libpdf.so" src_unpack() { # We have to do this inside of here, since it's a live ebuild. :-( @@ -40,7 +43,7 @@ src_unpack() { src_install() { local version flapper - insinto /usr/lib/chromium-browser/ + insinto /usr/$(get_libdir)/chromium-browser/ use pdf && doins libpdf.so @@ -50,7 +53,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="${ROOT}usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so" + flapper="${ROOT}usr/$(get_libdir)/chromium-browser/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 @@ -59,6 +62,7 @@ src_install() { doins pepper-flash fi } + pkg_postinst() { use flash || return |