Use get_libdir for strict multilib, and do not complain about LDFLAGS.

This fixes bug #459688

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5DE03AE

3 files changed, 36 insertions, 7 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/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 0b96b8fb777b..3354128af8d4 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,23 @@
-EBUILD chrome-binary-plugins-9999.ebuild 2054 SHA256 808a9a9a4eaa9edf823e017376429e88bc93e129fb0231f7909507ceab5beb86 SHA512 1b112330127f82f57784843e35099a37649afa4bae41620ce275c15a6c63ae4c2a995f8a5ec86d3a4803af31aed751ab0a5b88ead98cb31461c3719ff15a4aaf WHIRLPOOL e5f4526c9f6f1ce3fdec8383cd0e48d6fd7144ac08a679a0a39ed915386ef465585e20549b9c41948ba7f69258302ff5e77466314735b6d366afa34ee42cbbf1
-MISC ChangeLog 1118 SHA256 60e0f0363c0a421892d05d5d96cc39e56e32d60863594e8a5e0649e3b44d7d74 SHA512 11a92a7f7d5d0f3c15be18f0ea4748452cb951be83a7e2d3fb0850d4083142eef429cbe9c5eefc52c761ec049dd759fb43181cb72e7b8580b6c194d1e493de8e WHIRLPOOL 7689ee0786445140b609e6b0a60f695e4d26b42944fec067cca40ee3ef09f8e0064f101fdfc7867503c683486988d2c926b606c4c27bfc2366d91dd7b07ea910
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD chrome-binary-plugins-9999.ebuild 2225 SHA256 024e7c80958ad900a028d27805f0946d8e288c2fd71a18f92a2d62d2eb947917 SHA512 e86b5390fb1bdf761899467e927a3a01424807db6c81153efecb111d7e1f970c3ebe3c7b422a23124fea5b1fa23e20916799a6bcaac34474200ff0d4a5d7a253 WHIRLPOOL 41764c0a6ba0c86cd59bd7bf916b68b6b57a810f7b154dc4c495a05c86e4207826478db490677fa8e67a474663cd7878a08cbe016bcbfc264a87fb4699334d15
+MISC ChangeLog 1308 SHA256 5bc9da629db09ea42bc52e27c1f4d5fa790a08aa610a6b3347b14160f3d4a2ee SHA512 ab092357c77f35b6be3c1211a54c6ed4d91375e1259c3142c1a39bb7df07f03a8d51f20638659ce6b1f09a1e46a423e7fdad2543f6ac23465da6ca1ea7032819 WHIRLPOOL 6683f09fe7dbb67d18a23a16fffdb0a24d5b19a5815365df19ca5dc7eb656f217dd082d2a05358c7955144b0324672b96fbbf0b81fc9c4344affd0f1ec5dcc93
 MISC metadata.xml 409 SHA256 d40d69b26dd8aefe8da69937e54e0a885d6867e28e42c5dcbe193233a84ee533 SHA512 bdf4f11c173af9f80b3475f8ea32ba966806d1e0e694bd55a6a4960717e3f3ffff69eabb060ae5ee4d3b39cdf18eeeff45c9d431c3b6ce8ae5c271c7a409aa71 WHIRLPOOL 7319320d648a8aae0eec726a8ab489bb71fe5f93dfb40847e97344a02be85a09ba931d5aeee8fdb13d899de3c90746c75a59897287c715dd771dfbe8863b803b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRLz0HAAoJEEn8cBKl3gOubZUQAL6/fZ1DAkPEEGGyLmi+hxDq
+QAoDHxLUQVat/IR5NOqoJepqwijULf65+7GsBzQrCsg0cKuVEBkdD/g+QerhrCyJ
+/jkjD4Oalq7WKfZdjPwq9jJmUS8wVSzfXptP8I5Nes8EH/LAYFU2LpoIEkw+H1IY
+h2fS7Fk2gg6oVjm3wn4WArsloCf9SJgL4fLFy64qSN0UP0AeLQje+oJ1VOp8ZjSG
++kLriYDeHh3NxC20l1R8YRh0srzXQWoTxxXwW9ppARulMm9DxBGDiq8WVr/n1/y9
+rXTQFh9mC66ZhFpaMuMiL+B7ZBQttTUq/rKAvx2R/0cAwmsuds87c0zIr4BW1glM
+c+bU/iSx0U7OEQHj9f/YGFgwVRF28LJfN/WmvgtsrEeXxmcpjLTIzk9DQyZe7BIN
+rD+i2UodoU/0gX5fYnQwth2K+v1Dsl3nWn4+dcGFw3rJYYA1LdFxGC6lUAJYdX9w
+hnGMJXzjqilfbdBl94kd16R1SAzK49E97xw+U1HKRzJ+/HSiQFEFNPLbhEnYbTs/
+5r96zVynN2pXPpDB4AQizUsyHa+2m97wpI5j8dIF5bUHqOr0i/r6aZwcbcqJKyAM
+wAN6+V1x3tqeqCv218DU9M4s7cS5CqyDWmwFib7S/2Jda+tvE8DCuppO4SAvkdaG
+VYZHj9+9HU4IbqSpMmBw
+=mbsc
+-----END PGP SIGNATURE-----
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