diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2011-07-17 02:41:35 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2011-07-17 02:41:35 +0000 |
| commit | c020a2661dcdd4883da2090b0b9ec1d93cf5a5da (patch) | |
| tree | 459c7493eaf509798070cdccb9e393fa1b36fd74 /www-plugins/adobe-flash | |
| parent | Bump -5.11 development version (diff) | |
| download | gentoo-2-c020a2661dcdd4883da2090b0b9ec1d93cf5a5da.tar.gz gentoo-2-c020a2661dcdd4883da2090b0b9ec1d93cf5a5da.tar.bz2 gentoo-2-c020a2661dcdd4883da2090b0b9ec1d93cf5a5da.zip | |
Fixing KDE install in 11.1 (Bug #375283), plus fixing up QA warnings as mentioned in bug #375239.
(Portage version: 2.1.9.49/cvs/Linux i686)
Diffstat (limited to 'www-plugins/adobe-flash')
4 files changed, 18 insertions, 13 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/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 |