Fixing KDE install in 11.1 (Bug #375283), plus fixing up QA warnings as mentioned in bug #375239.

Package-Manager: portage-2.1.9.49/cvs/Linux i686

5 files changed, 35 insertions, 30 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 341a10144f93..fbabd474a49b 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.92 2011/07/15 11:49:18 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.93 2011/07/17 02:41:35 lack Exp $
+
+  17 Jul 2011; Jim Ramsay <lack@gentoo.org> adobe-flash-10.3.181.26.ebuild,
+  adobe-flash-10.3.181.34.ebuild, adobe-flash-11.0.1.60_beta201107131.ebuild:
+  Fixing KDE install in 11.1 (Bug #375283), plus fixing up QA warnings as
+  mentioned in bug #375239.
 
   15 Jul 2011; Jim Ramsay <lack@gentoo.org>
   adobe-flash-11.0.1.60_beta201107131.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index fe5c94be00cc..f8e3b8536c63 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -8,25 +8,25 @@ DIST flash-plugin-10.3.181.26-release.i386.rpm 5446759 RMD160 d4a4c0672121930224
 DIST flash-plugin-10.3.181.34-release.i386.rpm 5446695 RMD160 9d2db378ab8c673aadc38c21108c9ec9730650e6 SHA1 171af4caf86c0d51777d2b99aa4530ec92f61b49 SHA256 db074cb7b38dbc59e1d25f267a45d52dd09ccd85031cc0d01cd77b1420036a2a
 DIST flashplayer11_b1_install_lin_32_071311.tar.gz 6747871 RMD160 cbfe3943445f5e7b8c5e9288ecdb17c10af0c8d9 SHA1 d3f4417ad8c83afc3089aa6ff8b6c7706a0ef34b SHA256 1ccd71b27ffafc4ffa8cb4e494b972fe73378406a08e5a066d58c5a521fdfeff
 DIST flashplayer11_b1_install_lin_64_071311.tar.gz 7044701 RMD160 ed5d26c0c2f9387ed6ea3d9fdd37aa3c020a608b SHA1 8b7deb398e5e57cf2b8dcd1e498e8da07a8548ed SHA256 46dc0573bdfedc73edf2296be33fb9bfbb6e3238b54438f5b2d91d8ffe82b635
-EBUILD adobe-flash-10.3.181.26.ebuild 3970 RMD160 9326ce5646d5252a8cb526d2d3fcb2d3e81cce7d SHA1 4b9e337d45fe4e93de6b0a1cb6349dcc89ee7d6a SHA256 49b1bd5d6f32b063de3d6a2ef71d09ccaf89324ff91026da7e7e790f3ac76c13
-EBUILD adobe-flash-10.3.181.34.ebuild 3972 RMD160 b48c60333b520a15f3e0877d41436243bd3238c4 SHA1 2eed6499c6121b4146df49335cd34bf0d48dc597 SHA256 1d3293a7160a45f4c7d51509d20efae2f581f07444063b54567ab77a105d40ab
-EBUILD adobe-flash-11.0.1.60_beta201107131.ebuild 7243 RMD160 18d3cdf47370e24e177c1a5d65c7af991a52882a SHA1 7effd924669ec12204150870d90587ec2046f068 SHA256 dad1dc624bfb08c8fe2e68bf615e38fa08875e725bbafb79a0c12867a874a65a
-MISC ChangeLog 35083 RMD160 c6ac488c3914a3db44f8bc4beffe752a33ce00e4 SHA1 bcfe707a30e7e8a3863443d7da7886bf481b602c SHA256 d632c8f8e00431e3996bb41ea59746d7cd28f2f6e0109bc82f3e5b8b4b544872
+EBUILD adobe-flash-10.3.181.26.ebuild 3998 RMD160 4a4210f8a383493dca06163c0e493ce821198b2d SHA1 a9199a959a6146aa2a2b5a2f743cd688f29922e1 SHA256 871c07b8819b717a0fa02c53110370b94ac182abede109839298fce495b81acd
+EBUILD adobe-flash-10.3.181.34.ebuild 4000 RMD160 759d049feffe3561855a36eaeb6938e9c2464887 SHA1 e61920ba2503765e2bd0d0b9a27fee22f79aa6df SHA256 7b34d585a6fcc45e6f8180faac81a42a6a9eff4b6360568c6a27e1bd7dc5e941
+EBUILD adobe-flash-11.0.1.60_beta201107131.ebuild 7233 RMD160 1f47b4244c0fc37de8011e6b8564d4a2aad5a22b SHA1 d92b8bcb670133c6b75c64f2a116cdd8706dfe8a SHA256 b4d660391653b1b1f4f9cf17f6ff2a509919d282cabcdd60e04454ba5ee53179
+MISC ChangeLog 35340 RMD160 ab4253c89c9165f4190ed2a406d4f8e5aea3be02 SHA1 e9b8169ec63d8a450c1e98b6c1e572ac0c347cfc SHA256 cb01ab87dca701daacb8d9c133562ae83f66a8745081916693918ed6e09d39b1
 MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOIClNAAoJEA8o5SF9Rr6qzP0P/3EMZONUo+N1RExdUSYoX5YA
-jZ9e5SmE3KhiCS5x+HTMgEaoNKm55YPWsXTMi9bJZFJneq2gqcKgf0RpoM6GA+KI
-wf25gktAdiekgr6s6Wzt/U2USGu96dKa1zBcVg2/x33bc1wPUDycKWqFHCYbkKLu
-HAdj/0IwRt9ll3EnlCEI+StEfQGTOSnm8fV6MRP6fauDVml5D/dcBybql2jd2HL0
-Q4R2DDXWmyEqk0iWOb3+gEq5JlRhfNDTcYtKZqdnoGOAvej3CELS1N/3oQaIWOX4
-SmKy7YjkscUeVaAj/A7ilfGv8Xnt2Aet/xHIxO1FI2+ROz8Ch3+uyajU4co+mFk4
-CiwKCPmlxrHEIQijWdLmw+FgQNrq0Rx4+OS7xfjHKHUe7yIuwc/tGrSdjpk3uauC
-qsS1S26CxR7kYPufsiGu8nfrRSvLL9P4LewcFst0IzxUx2tp60UNxOkuV6NsNIuO
-+6+0G18wWDEZQ7DKJfHEe8nSFasRTjQgJ6tXfOPIgZYgakKvjv+NUegMZmn6YuNR
-EmYSIDSS/LvWQT5F+VLMjD8+0I1NMsNIDuK6bqllJL6kbXQ6pTzBRk6C4yqwRvcE
-qZZrUdjTyvs0AHs8pzxcjl766CbqPoHt9+wmZ+Mv2yGfHd7fopbg5nw7ARfzNcfF
-lrgSypIBy365AdrTHe32
-=Mr6d
+iQIcBAEBCAAGBQJOIkvxAAoJEA8o5SF9Rr6qhbcP+QGXeB1DVX3UjHPz4qVodTA9
+295uDoXAuE48U+WUMCXQo9j43VRTljqA6zETZNYy0EixKzbVUty8uuSvvSQetPOm
+8A86/a03rAhxtHQz/QBAlhsfAjHtR4NBb3/Nnth8OPZcvSwreeY2F5tPxWTEovxR
+lboHKWzpN9HGoUKCqTBD9jajDBe9g8pKEpctXwvsRoytZBHqDx+/9mEDlFk8lE9E
+JXPSF+jpnVXarbkjmfXZQ0kAHDQ31dT01fK7dJEtogj+XmKcGfUchR13eiGHz3h5
+yqK4xJk7eL3vJOW7XutxbzkjwCmjv8mywEJAQTlLiDlYqwJ0FYv/z9QMacts+ykv
+Ts4uCnfqvs3f+rKsyXQGReePuMnjDTOGP+woHAEcoO9XkriTIJk9ZwsRnTQbGFHn
+sOpfFvnqoUGvavSc9BOBszXcT5c3kJr5lI0PubRAtXIkvthy6Iv6S6kiwlOkNXdi
+vrmRuSWQ7jscDDvL6nHd80NMR7hgFUG952V2+4PWTGgEG72EbxhVkul6NLSB8oWU
+UBvTxTJSA4Z+DDKcF+4O5noG6ymUBWuI7rxd1VG2FCdmO8LIHFI9B8jOC2mcRBP4
+9zh31U5IYs7Hwtk0XUlOzbFyPo5rJBcO07I200Xt7xzAglk079CVBKpWKIEiQMro
++z4r/2JmIFHXmfLYAZ1l
+=HN/U
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild
index c86e3eaae07c..8a210536a9d3 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild,v 1.3 2011/06/17 14:07:58 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild,v 1.4 2011/07/17 02:41:35 lack Exp $
 
 EAPI=4
 inherit nsplugins rpm multilib toolchain-funcs
@@ -43,11 +43,11 @@ INSTALL_BASE32="${INSTALL_BASE}32"
 
 # Ignore QA warnings in these binary closed-source libraries, since we can't fix
 # them:
-QA_EXECSTACK="${INSTALL_BASE}32/libflashplayer.so
-	${INSTALL_BASE}/libflashplayer.so"
+QA_EXECSTACK="${INSTALL_BASE}/plugin/libflashplayer.so
+	${INSTALL_BASE32}/plugin/libflashplayer.so"
 
-QA_DT_HASH="${INSTALL_BASE}32/libflashplayer.so
-	${INSTALL_BASE}/libflashplayer.so"
+QA_DT_HASH="${INSTALL_BASE}/plugin/libflashplayer.so
+	${INSTALL_BASE32}/plugin/libflashplayer.so"
 
 src_install() {
 	if use amd64; then
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild
index 9baea7e62652..d508268abfc1 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild,v 1.1 2011/07/13 00:38:30 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild,v 1.2 2011/07/17 02:41:35 lack Exp $
 
 EAPI=4
 inherit nsplugins rpm multilib toolchain-funcs
@@ -43,11 +43,11 @@ INSTALL_BASE32="${INSTALL_BASE}32"
 
 # Ignore QA warnings in these binary closed-source libraries, since we can't fix
 # them:
-QA_EXECSTACK="${INSTALL_BASE}32/libflashplayer.so
-	${INSTALL_BASE}/libflashplayer.so"
+QA_EXECSTACK="${INSTALL_BASE}/plugin/libflashplayer.so
+	${INSTALL_BASE32}/plugin/libflashplayer.so"
 
-QA_DT_HASH="${INSTALL_BASE}32/libflashplayer.so
-	${INSTALL_BASE}/libflashplayer.so"
+QA_DT_HASH="${INSTALL_BASE}/plugin/libflashplayer.so
+	${INSTALL_BASE32}/plugin/libflashplayer.so"
 
 src_install() {
 	if use amd64; then
diff --git a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild
index d58d8cafda11..e933795b4158 100644
--- a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild,v 1.2 2011/07/15 11:49:18 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild,v 1.3 2011/07/17 02:41:35 lack Exp $
 
 EAPI=4
 inherit nsplugins multilib toolchain-funcs versionator
@@ -138,7 +138,7 @@ src_install() {
 		# The optional KDE4 KCM plugin
 		if use kde; then
 			exeinto /usr/$(get_libdir)/kde4/
-			doexe usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
+			doexe usr/lib/kde4/kcm_adobe_flash_player.so
 			insinto /usr/share/kde4/services
 			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
 		else