Next RC is released, and I reorganized the dependencies a bit: x86 no longer needs 'flash-libcompat', and amd64 no longer needs xulrunner-bin

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

5 files changed, 36 insertions, 81 deletions

diff --git a/net-www/netscape-flash/ChangeLog b/net-www/netscape-flash/ChangeLog
index 86cc7efdff56..318cf5d33651 100644
--- a/net-www/netscape-flash/ChangeLog
+++ b/net-www/netscape-flash/ChangeLog
@@ -1,6 +1,15 @@
 # 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.72 2008/09/09 03:43:10 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.73 2008/09/17 16:14:34 lack Exp $
+
+*netscape-flash-10_rc20080915 (17 Sep 2008)
+
+  17 Sep 2008; Jim Ramsay <lack@gentoo.org> files/mms.cfg,
+  -netscape-flash-10_beta20080702.ebuild,
+  -netscape-flash-10_beta20080811.ebuild,
+  +netscape-flash-10_rc20080915.ebuild:
+  Next RC is released, and I reorganized the dependencies a bit: x86 no
+  longer needs 'flash-libcompat', and amd64 no longer needs xulrunner-bin
 
   09 Sep 2008; Jim Ramsay <lack@gentoo.org> +files/mms.cfg,
   netscape-flash-10_beta20080811.ebuild:
diff --git a/net-www/netscape-flash/Manifest b/net-www/netscape-flash/Manifest
index 7c9ca6a34ffe..cbbc947f58f5 100644
--- a/net-www/netscape-flash/Manifest
+++ b/net-www/netscape-flash/Manifest
@@ -1,12 +1,10 @@
-AUX mms.cfg 4413 RMD160 78fbda45218dc24cf2bedafd492e52d51974f913 SHA1 b2d9bff0b072dc7fd88ed24bf4b5bc7efb492a81 SHA256 49bacea8d7fe59a109eeea2f03324f8c615fe6c32aee3006d7d1d56fd7a21558
-DIST flash-libcompat-0.1.tar.bz2 597818 RMD160 304735d4a28c917e415dfef6fdcfd705fad47296 SHA1 496701639f82b1cc30037afe744236d568effc90 SHA256 e8f8e7447eeddd2272f960ca44143666fc4012a251d467782a7a0151dada666c
+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-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_070208.tar.gz 3888574 RMD160 fdbcb33f387335c3aa84ff95aef64dca292910af SHA1 11343a93020898db71793ff9ed0a2f35d9ece564 SHA256 10197e6112f585355723a9a621fa354cd8b05d7d1b0636cf49a5389db4e9594f
-DIST flashplayer10_install_linux_081108.tar.gz 4035433 RMD160 bbe8385fb15f3c5cf39f5a9104e68e68a9953857 SHA1 6357d3946e6e29343c5deec05830d448e2f41a4c SHA256 93ace5371efde1cc59919b0b76b70a9e5fe02374fd5b4ebf5091e980ef186553
-EBUILD netscape-flash-10_beta20080702.ebuild 1522 RMD160 a167ab15fe1fdb010a65ffc6bdce7ff2753d580f SHA1 4ab53984c5b9b41f1fda4173215fb8fc5ee90f3b SHA256 0d653134b7b8f494fd8acf4bfcffe00eb8dbec26df2723c1129a857157dfcf75
-EBUILD netscape-flash-10_beta20080811.ebuild 3068 RMD160 f018fd827f55f70c78e061486d8766e94a45c380 SHA1 62d8918c3ec726b04363905354ad7c2f5c8b7d7e SHA256 354ddb02d284550256459c7a2ec9854fbbe09c0c750a04b30bae7c6fec9e0a16
+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-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 12283 RMD160 c5528e62efffbb6a205e242709d1a97f7055c1c8 SHA1 4e834d28487059dab077dadd7b42842e64b7e726 SHA256 597aa0dc1c59663e6e23cda18a7585c44ca135a8a4cdd42ecb7e059fd77d119c
+MISC ChangeLog 12658 RMD160 0c0c7c7430e1037d4d63cc8e1c0e79010dd5f80f SHA1 2eb1f28209427335bff3630a7befe9d13c501eaf SHA256 b0f9333ed5245f39da8f0768946d928cc48e384b763510c72a508f4377e20aec
 MISC metadata.xml 254 RMD160 1f5a6322e4956b30592a1e0caf7edc67613ecc43 SHA1 f0813ac26740fae9e0f0899b5dad74b5a6fd5b3c SHA256 740784d71bef88214e4d8508e351a376d8908f4c4b6175d98b6b77e107799f12
diff --git a/net-www/netscape-flash/files/mms.cfg b/net-www/netscape-flash/files/mms.cfg
index 463c0d2e76ea..a2dfae40025f 100644
--- a/net-www/netscape-flash/files/mms.cfg
+++ b/net-www/netscape-flash/files/mms.cfg
@@ -109,7 +109,7 @@
 # There is no default value, which falls back to the user's setting
 #ThirdPartyStorage = 
 
-# Lets you disable "Windowless" mode, which is may cause crashes in firefox
+# Lets you disable "Windowless" mode, which may cause crashes in firefox
 # version 3.01 and earlier.
 #  0 = Not Disabled (default), 1 = Disabled
 # More details:
diff --git a/net-www/netscape-flash/netscape-flash-10_beta20080702.ebuild b/net-www/netscape-flash/netscape-flash-10_beta20080702.ebuild
deleted file mode 100644
index fd433ea55937..000000000000
--- a/net-www/netscape-flash/netscape-flash-10_beta20080702.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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_beta20080702.ebuild,v 1.1 2008/07/03 13:42:46 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#beta}
-BV=${BETA:4:2}${BETA:6:2}${BETA:2:2}
-
-DESCRIPTION="Adobe Flash Player"
-SRC_URI="http://download.macromedia.com/pub/labs/flashplayer${MV}/flashplayer${MV}_install_linux_${BV}.tar.gz"
-HOMEPAGE="http://www.adobe.com/"
-IUSE=""
-SLOT="0"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="AdobeFlash-9.0.31.0"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}/install_flash_player_${MV}_linux"
-
-DEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
-			app-emulation/emul-linux-x86-gtklibs
-			app-emulation/emul-linux-x86-soundlibs
-			 app-emulation/emul-linux-x86-xlibs )
-	x86? ( x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXt
-		=x11-libs/gtk+-2*
-		media-libs/freetype
-		media-libs/fontconfig )
-	media-fonts/corefonts"
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
-src_install() {
-	exeinto /opt/netscape/plugins
-	doexe libflashplayer.so
-	inst_plugin /opt/netscape/plugins/libflashplayer.so
-}
diff --git a/net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild b/net-www/netscape-flash/netscape-flash-10_rc20080915.ebuild
index d2aaf42993e2..b5315b729232 100644
--- a/net-www/netscape-flash/netscape-flash-10_beta20080811.ebuild
+++ b/net-www/netscape-flash/netscape-flash-10_rc20080915.ebuild
@@ -1,6 +1,6 @@
 # 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_beta20080811.ebuild,v 1.3 2008/09/09 03:43:10 lack Exp $
+# $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 $
 
 inherit nsplugins versionator
 
@@ -10,12 +10,12 @@ MV=$(get_major_version)
 # convention "MMDDYY", so build that out of a proper "YYYYMMDD" beta version
 # component:
 BETA=$(get_version_component_range 2)
-BETA=${BETA#beta}
+BETA=${BETA#rc}
 BV=${BETA:4:2}${BETA:6:2}${BETA:2:2}
 
 DESCRIPTION="Adobe Flash Player"
 SRC_URI="http://download.macromedia.com/pub/labs/flashplayer${MV}/flashplayer${MV}_install_linux_${BV}.tar.gz
-mirror://gentoo/flash-libcompat-0.1.tar.bz2"
+amd64? ( mirror://gentoo/flash-libcompat-0.2.tar.bz2 )"
 HOMEPAGE="http://www.adobe.com/"
 IUSE=""
 SLOT="0"
@@ -29,8 +29,7 @@ S="${WORKDIR}/install_flash_player_${MV}_linux"
 DEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
 			app-emulation/emul-linux-x86-gtklibs
 			app-emulation/emul-linux-x86-soundlibs
-			app-emulation/emul-linux-x86-xlibs
-			|| ( net-libs/xulrunner-bin www-client/mozilla-firefox-bin ) )
+			app-emulation/emul-linux-x86-xlibs )
 	x86? ( x11-libs/libXext
 		x11-libs/libX11
 		x11-libs/libXt
@@ -43,8 +42,10 @@ DEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
 	media-fonts/corefonts"
 
 # Our new flash-libcompat suffers from the same EXESTACK problem as libcrypto
-# from app-text/acroread, so tell QA to ignore it:
-QA_EXECSTACK="opt/flash-libcompat/libcrypto.so.0.9.7"
+# from app-text/acroread, so tell QA to ignore it.
+# Apparently the flash library itseld also suffers from this issue
+QA_EXECSTACK="opt/flash-libcompat/libcrypto.so.0.9.7
+	opt/netscape/plugins/libflashplayer.so"
 
 pkg_setup() {
 	# This is a binary x86 package => ABI=x86
@@ -58,20 +59,18 @@ src_install() {
 	doexe libflashplayer.so
 	inst_plugin /opt/netscape/plugins/libflashplayer.so
 
-	# This version especially is ugly in that it hard-requires libcurl.so.3,
-	# libcrypto.so.0.9.7 and libssl.so.0.9.7, so we just provide our own 32-bit
-	# binary version of these libs.
-	exeinto /opt/flash-libcompat
-	pushd "${WORKDIR}/flash-libcompat-0.1/"
-	doexe *
-	popd
-	echo 'LDPATH="/opt/flash-libcompat"' > 99flash-libcompat
-	doenvd 99flash-libcompat
-
-	# Apparently the next release will dynamically check for libcurl.so.4 and
-	# libcurl.so.3 (and maybe the SSLs too, I hope) , so this will be slightly
-	# less ugly (especially if we can get libcurl into one of the emul-linux-x86
-	# packages)
+	# libcurl and libnss are not currently available in any emul-linux-x86
+	# packages, so for amd64 we provide these snarfed out of other binary
+	# packages.  libcurl and its ssl dependencies come from app-text/acroread;
+	# libnss and its friends come from net-libs/xulrunner-bin
+	if use amd64; then
+		exeinto /opt/flash-libcompat
+		pushd "${WORKDIR}/flash-libcompat-0.2/"
+		doexe *
+		popd
+		echo 'LDPATH="/opt/flash-libcompat"' > 99flash-libcompat
+		doenvd 99flash-libcompat
+	fi
 
 	# The magic config file!
 	insinto "/etc/adobe"