[gentoo-commits] gentoo-x86 commit in www-plugins/adobe-flash: ChangeLog adobe-flash-10.3.183.10.ebuild adobe-flash-11.1.102.55.ebuild adobe-flash-10.3.183.7.ebuild

[Jim Ramsay (lack)]

lack        11/11/28 16:27:00

  Modified:             ChangeLog adobe-flash-10.3.183.10.ebuild
                        adobe-flash-11.1.102.55.ebuild
  Removed:              adobe-flash-10.3.183.7.ebuild
  Log:
  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)

Revision  Changes    Path
1.111                www-plugins/adobe-flash/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?r1=1.110&r2=1.111

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ChangeLog	28 Nov 2011 15:54:34 -0000	1.110
+++ ChangeLog	28 Nov 2011 16:27:00 -0000	1.111
@@ -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@g.o>
+  -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)
 



1.4                  www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild?r1=1.3&r2=1.4

Index: adobe-flash-10.3.183.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- adobe-flash-10.3.183.10.ebuild	25 Sep 2011 14:41:59 -0000	1.3
+++ adobe-flash-10.3.183.10.ebuild	28 Nov 2011 16:27:00 -0000	1.4
@@ -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}"



1.2                  www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild?r1=1.1&r2=1.2

Index: adobe-flash-11.1.102.55.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adobe-flash-11.1.102.55.ebuild	28 Nov 2011 15:54:34 -0000	1.1
+++ adobe-flash-11.1.102.55.ebuild	28 Nov 2011 16:27:00 -0000	1.2
@@ -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 @@
 		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_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 @@
 			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 @@
 		# 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