Adobe Flash 10.0.12.36 is released (Bug #242210)

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 22 insertions, 19 deletions

diff --git a/net-www/netscape-flash/ChangeLog b/net-www/netscape-flash/ChangeLog
index 318cf5d33651..f5d8ca333062 100644
--- a/net-www/netscape-flash/ChangeLog
+++ b/net-www/netscape-flash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/netscape-flash
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.73 2008/09/17 16:14:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.74 2008/10/15 17:26:48 lack Exp $
+
+*netscape-flash-10.0.12.36 (15 Oct 2008)
+
+  15 Oct 2008; Jim Ramsay <lack@gentoo.org>
+  -netscape-flash-10_rc20080915.ebuild, +netscape-flash-10.0.12.36.ebuild:
+  Adobe Flash 10.0.12.36 is released (Bug #242210)
 
 *netscape-flash-10_rc20080915 (17 Sep 2008)
 
diff --git a/net-www/netscape-flash/Manifest b/net-www/netscape-flash/Manifest
index cbbc947f58f5..d102ac3f94a0 100644
--- a/net-www/netscape-flash/Manifest
+++ b/net-www/netscape-flash/Manifest
@@ -1,10 +1,10 @@
 AUX mms.cfg 4410 RMD160 c859fedd78b2044aaf45e41a2a3edd180c5d7501 SHA1 953db7024cf470121e126a6fbe38b75fd14e6a58 SHA256 08965b0cd942c177d7379d60331ba720191d30a799c1bec3f441bb91dbce3425
 DIST flash-libcompat-0.2.tar.bz2 1162317 RMD160 197841eb76faacb05aec3e003f5e06e00fb5a19f SHA1 8fe47ef587ae679a37757038710750eb6a3c393e SHA256 aa96a25420f6527f5c2a467222bccf5c54a5f8001edfa0ec274864fc3e94faea
+DIST flash-plugin-10.0.12.36-release.i386.rpm 4026104 RMD160 bcf8b455f99cdafdfdbe6b60149e8f57fd9f9134 SHA1 2cc0fb67079d8a761a69b7712b9dfdee8b0f7144 SHA256 c7345faf10b269b3556f2e1373c4afc35f08891f8bbd54e45d49151a8c8e4ac0
 DIST flash-plugin-7.0.68.tar.gz 1021264 RMD160 3cfcdd25c821ca6926a412ba21ae6c5745db4012 SHA1 5e05b592fd5de85e4f0de3b0789487462070f218 SHA256 dd1b8184498b0ca2b3d2ea13f8e024da654c7cf521f7d0fcd58dcf21cfabd6e1
 DIST flash-plugin-9.0.124.0-release.i386.rpm 3038166 RMD160 3abfc30b66a90123affa338b4d307d5139947845 SHA1 55b4e0726086eca49b2318b620f568a095767d27 SHA256 2fe2c0ac40b18ea26f88748c2e12b5e46ec865b077d834f0628df7c9fb45590b
-DIST flashplayer10_install_linux_091508.tar.gz 3958529 RMD160 90b47a9cce7373b88b01e40f925bba3845338d5b SHA1 81fb8bbecc0508a9b5ca09b2945a0967fad40fe8 SHA256 56dd96e1159fa31fa8c1176618a44e8da25cb8564e38a6074bd4ee9f2123744d
-EBUILD netscape-flash-10_rc20080915.ebuild 2999 RMD160 0a1bdd787d2cf9780679ff8b3813faaf55136185 SHA1 ddd656b6000eb60cbdcdc9374671b6e13710534d SHA256 d9c1ffa39097a808a5857d44572f0de88899246a4e4d7a6210137ad19e5ed06f
+EBUILD netscape-flash-10.0.12.36.ebuild 2775 RMD160 1dbe713675ac1de46228b6bf6d2aa648349f58ca SHA1 8b600193eca5f7df87bbf501b10017710f894502 SHA256 7956abb443ebe666247156e6a58beca70bfba1bcd1616d9a473d2a7359fb6bc7
 EBUILD netscape-flash-7.0.68.ebuild 1164 RMD160 266957f2a55dbc838294b441281805606a34e333 SHA1 fa64847991aaaf40a6e0dab791b5d4fa5e20d647 SHA256 022e5b24986dcdca201cdb573ed01bef3db5241a2672f2bf525cf9ffa8b83646
 EBUILD netscape-flash-9.0.124.0.ebuild 1295 RMD160 d8402bc903a15779be891c919524a4e95c7839d4 SHA1 d02a2f62d77035bb5d67185f1934c02a74f09587 SHA256 998216a08d1f0ce50e73c247d8b06558757b10d266e708b30a013b8df6be0b9a
-MISC ChangeLog 12658 RMD160 0c0c7c7430e1037d4d63cc8e1c0e79010dd5f80f SHA1 2eb1f28209427335bff3630a7befe9d13c501eaf SHA256 b0f9333ed5245f39da8f0768946d928cc48e384b763510c72a508f4377e20aec
+MISC ChangeLog 12871 RMD160 1ed57e19943f364648b27796c28235211d7af265 SHA1 30d0d8b8371418418cdd53a20f1d1c584417e30a SHA256 41ef4966e55483fe4c69f963a0b7dc2a4d1a768bd3e33c5c2e6d492c5dfd9809
 MISC metadata.xml 254 RMD160 1f5a6322e4956b30592a1e0caf7edc67613ecc43 SHA1 f0813ac26740fae9e0f0899b5dad74b5a6fd5b3c SHA256 740784d71bef88214e4d8508e351a376d8908f4c4b6175d98b6b77e107799f12
diff --git a/net-www/netscape-flash/netscape-flash-10_rc20080915.ebuild b/net-www/netscape-flash/netscape-flash-10.0.12.36.ebuild
index b5315b729232..a954195aff15 100644
--- a/net-www/netscape-flash/netscape-flash-10_rc20080915.ebuild
+++ b/net-www/netscape-flash/netscape-flash-10.0.12.36.ebuild
@@ -1,30 +1,21 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10_rc20080915.ebuild,v 1.1 2008/09/17 16:14:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.12.36.ebuild,v 1.1 2008/10/15 17:26:48 lack Exp $
 
-inherit nsplugins versionator
-
-MV=$(get_major_version)
-
-# Excellent, Adobe uses that unsortable though surprisingly popular date
-# convention "MMDDYY", so build that out of a proper "YYYYMMDD" beta version
-# component:
-BETA=$(get_version_component_range 2)
-BETA=${BETA#rc}
-BV=${BETA:4:2}${BETA:6:2}${BETA:2:2}
+inherit nsplugins rpm
 
 DESCRIPTION="Adobe Flash Player"
-SRC_URI="http://download.macromedia.com/pub/labs/flashplayer${MV}/flashplayer${MV}_install_linux_${BV}.tar.gz
+SRC_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm
 amd64? ( mirror://gentoo/flash-libcompat-0.2.tar.bz2 )"
 HOMEPAGE="http://www.adobe.com/"
 IUSE=""
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
-LICENSE="AdobeFlash-9.0.31.0"
+LICENSE="AdobeFlash-10"
 RESTRICT="strip mirror"
 
-S="${WORKDIR}/install_flash_player_${MV}_linux"
+S="${WORKDIR}"
 
 DEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
 			app-emulation/emul-linux-x86-gtklibs
@@ -43,7 +34,7 @@ DEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
 
 # Our new flash-libcompat suffers from the same EXESTACK problem as libcrypto
 # from app-text/acroread, so tell QA to ignore it.
-# Apparently the flash library itseld also suffers from this issue
+# Apparently the flash library itself also suffers from this issue
 QA_EXECSTACK="opt/flash-libcompat/libcrypto.so.0.9.7
 	opt/netscape/plugins/libflashplayer.so"
 
@@ -55,9 +46,15 @@ pkg_setup() {
 }
 
 src_install() {
+	pushd "${S}/usr/lib/flash-plugin"
 	exeinto /opt/netscape/plugins
 	doexe libflashplayer.so
 	inst_plugin /opt/netscape/plugins/libflashplayer.so
+	popd
+
+	pushd "${S}/usr/share/doc/flash-plugin-${PV}/"
+	dodoc readme.txt
+	popd
 
 	# libcurl and libnss are not currently available in any emul-linux-x86
 	# packages, so for amd64 we provide these snarfed out of other binary