Version bump: 10.3.181.14 is released. This does not include a 64-bit native version (again), but does include a small gtk utility (and a Kde4 kcm add-on) to manage some user settings. (Bug #367031)

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

4 files changed, 147 insertions, 13 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index e5574ac651b6..77cffb0e82a6 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,14 @@
 # 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.76 2011/04/20 19:08:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.77 2011/05/14 00:57:51 lack Exp $
+
+*adobe-flash-10.3.181.14 (14 May 2011)
+
+  14 May 2011; Jim Ramsay <lack@gentoo.org> +adobe-flash-10.3.181.14.ebuild,
+  metadata.xml:
+  Version bump: 10.3.181.14 is released. This does not include a 64-bit native
+  version (again), but does include a small gtk utility (and a Kde4 kcm add-on)
+  to manage some user settings. (Bug #367031)
 
   20 Apr 2011; Christoph Mende <angelos@gentoo.org>
   adobe-flash-10.2.159.1.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 4fa391bada61..2c0cea2b2c4b 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d
 AUX memcpy-to-memmove.sh 1418 RMD160 322005bfe0717630b945eb71ae4aa808a1d14d5e SHA1 72ee58862db06ee235055123137604619273819f SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096
 AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a
@@ -8,6 +5,7 @@ DIST flash-plugin-10.1.102.64-release.i386.rpm 4902583 RMD160 5646d4dadf7b77145b
 DIST flash-plugin-10.2.152.27-release.i386.rpm 4961334 RMD160 4fd7007ce17b0eeb37fad487c59dc9f9f02854be SHA1 3feeb3e941361b63ff9da0e08bfc202dfbc82da2 SHA256 dac2f8a19558db70f928e0c681cbbabbc27970aa58faccbe7f8b99096b62a915
 DIST flash-plugin-10.2.153.1-release.i386.rpm 4961820 RMD160 f71f3e3afb09eab067cb253f8d40b6e6aaeb0ec3 SHA1 fb3228371ddfc00c31d6121974e23da2e02b4b22 SHA256 9899252732cc94b3bc0ae7e145c6c5e94255e123bd8d5298f9ec40cb10f63568
 DIST flash-plugin-10.2.159.1-release.i386.rpm 4961766 RMD160 fe0c39821d262c2e66e4aea89e50c3df57d64dfb SHA1 a43d0c90680231401b7cced8464edf8f0c3420b6 SHA256 e920f1e78ba8fbec55737c11bca8de7c91a20fa24b65ba0808fd05f44bf7ab4e
+DIST flash-plugin-10.3.181.14-release.i386.rpm 5446685 RMD160 2a2b4d456c1bc6e60b90359a10f25bac8d92fd3a SHA1 a4ee2ed30358ba3291a62e6f2e9f9de8845bdd08 SHA256 8e9d223874877a8d66322676737591b89abe6af0a2a84b437f2da6bfd4c33223
 DIST flashplayer10_2_p3_64bit_linux_111710.tar.gz 4310219 RMD160 a57e8c4555545ca348f4b33e8c042c3f66e905f4 SHA1 a53ee83c02421f900fe25fd3738efd77932e542c SHA256 ef05f679f8977144621560587ffdf9bc81812e9941dea422e977070c9cd05ff0
 DIST install_flash_player_9.tar.gz 3065784 RMD160 a36518cecaa5ed20743aebb61224567e9cf9291f SHA1 e4c6c77061c0899743284a758480fee95cfb8601 SHA256 a19c1765c44e515c435a5ad3c2d3b9444926bfc771710b204f4bfdcf4868cf51
 EBUILD adobe-flash-10.1.102.64.ebuild 5420 RMD160 e0bbbe87ca4235bc18b04c859579d68de5ab6c6e SHA1 dd4b522423baf8fee8831c87077a14db1d325ca9 SHA256 cf7b0fc677882be410a7a71f25f0f25aa904c7ebcd99141a7ca145890018f85b
@@ -18,13 +16,7 @@ EBUILD adobe-flash-10.2.153.1.ebuild 5200 RMD160 0e289e9c429ac45ecfa7150825a1296
 EBUILD adobe-flash-10.2.153.1_p201011173.ebuild 7063 RMD160 72f48b72a412dec40fb5224e8bf38d10c4df967a SHA1 632f0a8458c59c4cae4436e48afa9e40a4c46359 SHA256 9a710652bae58c550439c1b53120efd21918786154f69112932d018350a0347c
 EBUILD adobe-flash-10.2.159.1.ebuild 5203 RMD160 517edb0d526593d8175a2930877199a452fd4626 SHA1 90a3f5cc0d6a9282cfa8cb2fbd548f4160ab747b SHA256 07dd4f85690cc0c3ad1ebc08922c221aee811a996a2963bf82a413c27e3aecfd
 EBUILD adobe-flash-10.2.159.1_p201011173.ebuild 7063 RMD160 37873f2c83eeb0eb06089958580fb8f2deab25a9 SHA1 a17550a27fa665bff135645cab194641974491ac SHA256 e9886879abfd1ebce26529545ada71cb1b253fd3f92ccb8ef2281e7d99b15a74
+EBUILD adobe-flash-10.3.181.14.ebuild 3952 RMD160 0aa8a15db92959184035ac02584b12aaad790043 SHA1 9c093bf27b9e4dd69feb6874dd1c2257012130da SHA256 461fa4763158946a4730713ff476250b3fa620156cae8ac3170382f87e96ff76
 EBUILD adobe-flash-9.0.289.0.ebuild 1784 RMD160 4ab05470e71f2d6eb9bbbea082e0b315439a1a43 SHA1 ed5c641d06bb52b99f670c921ad00d249b46c87a SHA256 945cfbb1141497499aafed9b371df02d05d35c0fe5dccd9316e0e05de83a2b87
-MISC ChangeLog 32146 RMD160 325c96b94f3db0c11a7a769f8fff99a045d22699 SHA1 b3ceb341d3a338fc91bdf5af7d947cb4a4442af9 SHA256 1491ea17a67e3b9c06e053098be6b922a60917ac28a8cc8669f7843f04d576d7
-MISC metadata.xml 871 RMD160 ac48ff7d977e5186b001c20b6e8e0efa8b08cbce SHA1 fa5753208d813b3b5567e857777ab91a3dde2f0f SHA256 2b80f87d99387c862da9e79507dc7b06b827a402d5d2344126ee627712cf85e0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk2vLzwACgkQmWq1bYTyC0MKfgEAp0hB+m+StFF0j7WrLtpnBvAJ
-zDh0SyDqsgDeyoycrEMA/02S96hoe+J+IRtsStcz/O8kS85Lo2tjopru9cbu/Jph
-=WWON
------END PGP SIGNATURE-----
+MISC ChangeLog 32482 RMD160 029559783e8f2678fa8bcbf7d625d3fe7c5bc88e SHA1 7164200277124ab4013f32d85e20a8e0965cd097 SHA256 967a6190bbe56e133eaf620b88bfeb6e6219eb1aca0f621bd1e461ec5e02b956
+MISC metadata.xml 1043 RMD160 435bb0fd20191315bc00a4e46d13d518885e6e64 SHA1 af071ce66b4686d66cfa2bd49ddd36a9c515a57e SHA256 f9fc17d7fa7eaf21b9d5af6e5c15080d390af3856505538e469e323283845f7f
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.181.14.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.181.14.ebuild
new file mode 100644
index 000000000000..bde3c65433b2
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.181.14.ebuild
@@ -0,0 +1,130 @@
+# 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.14.ebuild,v 1.1 2011/05/14 00:57:51 lack Exp $
+
+EAPI=4
+inherit nsplugins rpm multilib toolchain-funcs
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="${MY_32B_URI}"
+HOMEPAGE="http://www.adobe.com/flashplayer"
+IUSE="vdpau kde"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10.3"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
+	kde? ( kde-base/kcmshell )
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( www-plugins/nspluginwrapper )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? ( $EMUL_DEPS )
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	${DEPEND}"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+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_DT_HASH="${INSTALL_BASE}32/libflashplayer.so
+	${INSTALL_BASE}/libflashplayer.so"
+
+src_install() {
+	if use amd64; then
+		local oldabi="${ABI}"
+		ABI="x86"
+		BASE=${INSTALL_BASE32}
+	else
+		BASE=${INSTALL_BASE}
+	fi
+
+	# The plugin itself
+	exeinto /${BASE}/plugin
+	doexe usr/lib/flash-plugin/libflashplayer.so
+	doexe usr/lib/flash-plugin/homecleanup
+	inst_plugin /${BASE}/plugin/libflashplayer.so
+
+	# The optional KDE4 KCM plugin
+	if use kde && ! use amd64; then
+		exeinto /usr/$(get_libdir)/kde4/
+		doexe usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
+		insinto /usr/share/kde4/services
+		doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
+	else
+		# No KDE applet, so allow the GTK utility to show up in KDE:
+		sed -i usr/share/applications/flash-player-properties.desktop \
+			-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
+	fi
+
+	# The userland 'properties' standalone app:
+	exeinto /${BASE}/bin
+	doexe usr/bin/flash-player-properties
+	for icon in $(find usr/share/icons/ -name '*.png'); do
+		insinto /$(dirname $icon)
+		doins $icon
+	done
+	elog "Done with icons."
+	insinto usr/share/applications
+	sed -i usr/share/applications/flash-player-properties.desktop \
+		-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+	doins usr/share/applications/flash-player-properties.desktop
+
+	dodoc "usr/lib/flash-plugin/README"
+	dodoc "usr/share/doc/flash-plugin-${PV}/readme.txt"
+
+	if use amd64; then
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64; then
+		elog "Adobe has no stable 64-bit native version at this time. The beta"
+		elog "64-bit native release (codenamed \"square\") is installed as part"
+		elog "of the unstable testing version of this package:"
+		elog "  ${CATEGORY}/${P}_p...."
+		elog
+		if has_version 'www-plugins/nspluginwrapper'; then
+			elog "nspluginwrapper detected: Installing plugin wrapper"
+			local oldabi="${ABI}"
+			ABI="x86"
+			local FLASH_SOURCE="${ROOT}/${INSTALL_BASE32}/libflashplayer.so"
+			nspluginwrapper -i "${FLASH_SOURCE}"
+			ABI="${oldabi}"
+			elog
+		else
+			elog "To use the 32-bit flash player in a native 64-bit firefox,"
+			elog "you must install www-plugins/nspluginwrapper."
+			elog
+		fi
+	fi
+
+	ewarn "Flash player is closed-source, with a long history of security"
+	ewarn "issues.  Please consider only running flash applets you know to"
+	ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
+	ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
+}
diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index 378f9b217409..fc4422b3fdce 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -19,5 +19,9 @@
 
 		<flag name='vdpau'>Enables VDPAU support to offload video processing
 			(32-bit flash player only)</flag>
+
+		<!-- www-plugins/adobe-flash-10.3 has a KDE KCM thingy -->
+		<flag name='kde'>Enables a KCM plugin for configuring flash player
+			preferences (32-bit KDE4 only)</flag>
 	</use>
 </pkgmetadata>