Bug #390405: Adjusting new SRC_URI. Also changing 11.1 to drop the rpm in favour of .tar.gz distribution, and cleaning up an old version.

(Portage version: 2.1.10.31/cvs/Linux x86_64)

4 files changed, 24 insertions, 148 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 14124a0d5086..8248b2d4831c 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.110 2011/11/28 15:54:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.111 2011/11/28 16:27:00 lack Exp $
+
+  28 Nov 2011; Jim Ramsay <jim_ramsay@gentoo.org>
+  -adobe-flash-10.3.183.7.ebuild, adobe-flash-10.3.183.10.ebuild,
+  adobe-flash-11.1.102.55.ebuild:
+  Bug #390405: Adjusting new SRC_URI. Also changing 11.1 to drop the rpm in
+  favour of .tar.gz distribution, and cleaning up an old version.
 
 *adobe-flash-11.1.102.55 (28 Nov 2011)
 
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild
index 21f0e9cc040a..c69ab1e85d7b 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild
@@ -1,11 +1,11 @@
 # 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.183.10.ebuild,v 1.3 2011/09/25 14:41:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild,v 1.4 2011/11/28 16:27:00 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"
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/flash-plugin-${PV}-release.i386.rpm"
 
 DESCRIPTION="Adobe Flash Player"
 SRC_URI="${MY_32B_URI}"
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.7.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.7.ebuild
deleted file mode 100644
index b3893de0e852..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.7.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.183.7.ebuild,v 1.1 2011/09/02 15:11:07 scarabeus 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 closed-source binaries, since we can't fix them:
-QA_PREBUILT="opt/* usr/lib*/kde4/*"
-
-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."
-		#elog "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}/plugin/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/adobe-flash-11.1.102.55.ebuild b/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild
index 4438cde12cd0..157da182662e 100644
--- a/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild
@@ -1,12 +1,12 @@
 # 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.1.102.55.ebuild,v 1.1 2011/11/28 15:54:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild,v 1.2 2011/11/28 16:27:00 lack Exp $
 
 EAPI=4
-inherit nsplugins multilib toolchain-funcs versionator rpm
+inherit nsplugins multilib toolchain-funcs versionator
 
-MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/flash-plugin-${PV}-release.i386.rpm -> ${P}.i386.rpm"
-MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/flash-plugin-${PV}-release.x86_64.rpm -> ${P}.x86_64.rpm"
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
 
 DESCRIPTION="Adobe Flash Player"
 SRC_URI="x86? ( ${MY_32B_URI} )
@@ -99,14 +99,14 @@ src_unpack() {
 		local my_32b_src=${MY_32B_URI##*>}
 		local my_64b_src=${MY_64B_URI##*>}
 		if [[ $native_install ]]; then
-			rpm_unpack $my_64b_src
+			unpack $my_64b_src
 		fi
 		mkdir 32bit
 		pushd 32bit >/dev/null
-		rpm_unpack $my_32b_src
+		unpack $my_32b_src
 		popd >/dev/null
 	else
-		rpm_src_unpack
+		default_src_unpack
 	fi
 }
 
@@ -123,24 +123,21 @@ src_compile() {
 src_install() {
 	if [[ $native_install ]]; then
 		if use x86; then
-			local RPMLIB="lib"
+			local PKGLIB=lib
 		else
-			local RPMLIB="lib64"
+			local PKGLIB=lib64
 		fi
 		local BASE=${INSTALL_BASE}
 
 		# The plugin itself
 		exeinto /${BASE}/flash-plugin
-		doexe usr/${RPMLIB}/flash-plugin/libflashplayer.so
+		doexe libflashplayer.so
 		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
 
-		# Also install the 'homecleanup' script:
-		doexe usr/${RPMLIB}/flash-plugin/homecleanup
-
 		# The optional KDE4 KCM plugin
 		if use kde; then
-			exeinto /${BASE}/kde4/
-			doexe usr/${RPMLIB}/kde4/kcm_adobe_flash_player.so
+			exeinto /${BASE}/kde4
+			doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
 			dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
 				/usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
 			insinto /usr/share/kde4/services
@@ -160,13 +157,12 @@ src_install() {
 			insinto /$(dirname $icon)
 			doins $icon
 		done
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			  usr/share/pixmaps/flash-player-properties.png
 		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
-
-		# Documentation:
-		dodoc usr/${RPMLIB}/flash-plugin/README
 	fi
 
 	if [[ $need_lahf_wrapper ]]; then
@@ -185,7 +181,7 @@ src_install() {
 		# 32b plugin
 		pushd "${S}/32bit"
 			exeinto /${INSTALL_BASE}32
-			doexe usr/lib/flash-plugin/libflashplayer.so
+			doexe libflashplayer.so
 			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
 		popd