Old.

(Portage version: 2.2.2/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 5 insertions, 296 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index fc5bd664af24..e7bd6892aa24 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.212 2013/09/11 09:04:54 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.213 2013/09/11 13:37:14 jer Exp $
+
+  11 Sep 2013; Jeroen Roovers <jer@gentoo.org>
+  -adobe-flash-11.2.202.297.ebuild, -files/memcpy-to-memmove.sh:
+  Old.
 
   11 Sep 2013; Sergey Popov <pinkbyte@gentoo.org>
   adobe-flash-11.2.202.310.ebuild:
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.297.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.297.ebuild
deleted file mode 100644
index be37fb18cdff..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.297.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2013 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.2.202.297.ebuild,v 1.3 2013/07/10 05:18:11 ago Exp $
-
-EAPI=5
-inherit nsplugins multilib toolchain-funcs versionator
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
-
-AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
-AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
-PV_M=$(get_major_version)
-AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
-AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
-AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
-
-SRC_URI="
-	x86? (
-		!debug? ( ${AF_32_URI} )
-		debug? ( ${AF_32_DB_URI} )
-	)
-	amd64? (
-		multilib? (
-			32bit? (
-				!debug? ( ${AF_32_URI} )
-				debug? ( ${AF_32_DB_URI} )
-			)
-			64bit? ( ${AF_64_URI} )
-		)
-		!multilib? ( ${AF_64_URI} )
-	)
-"
-IUSE="-32bit +64bit debug kde multilib selinux sse2 vdpau"
-REQUIRED_USE="sse2"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-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? (
-		|| (
-			x11-libs/libvdpau[abi_x86_32]
-			>=app-emulation/emul-linux-x86-xlibs-20110129
-		)
-	)
-	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
-	app-emulation/emul-linux-x86-soundlibs"
-
-DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
-	selinux? ( sec-policy/selinux-flash )"
-RDEPEND="x86? ( $NATIVE_DEPS )
-	amd64? (
-		multilib? (
-			64bit? ( $NATIVE_DEPS )
-			32bit? ( $EMUL_DEPS )
-		)
-		!multilib? ( $NATIVE_DEPS )
-	)
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
-	${DEPEND}"
-
-# Where should this all go? (Bug #328639)
-INSTALL_BASE="opt/Adobe/flash-player"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="opt/*"
-
-any_cpu_missing_flag() {
-	local value=$1
-	grep '^flags' /proc/cpuinfo | grep -qv "$value"
-}
-
-pkg_setup() {
-	if use x86; then
-		export native_install=1
-	elif use amd64; then
-		# amd64 users may unselect the native 64bit binary, if they choose
-		# TODO: In future revisions, remove this ability now that 64-bit
-		# binaries are officially released and working.
-		if ! use multilib || use 64bit; then
-			export native_install=1
-		else
-			unset native_install
-		fi
-
-		if use multilib && use 32bit; then
-			export amd64_32bit=1
-		else
-			unset amd64_32bit
-		fi
-
-		if use multilib && ! use 32bit && ! use 64bit; then
-			eerror "You must select at least one architecture USE flag (32bit or 64bit)"
-			die "No library version selected [-32bit -64bit]"
-		fi
-
-		unset need_lahf_wrapper
-		if [[ $native_install ]]; then
-			# 64bit flash requires the 'lahf' instruction (bug #268336)
-			if any_cpu_missing_flag 'lahf_lm'; then
-				export need_lahf_wrapper=1
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ $amd64_32bit ]]; then
-		# Since the 32-bit and 64-bit packages collide, put the 32-bit one
-		# elsewhere:
-		local my_32b_src=${AF_32_URI##*>}
-		local my_64b_src=${AF_64_URI##*>}
-		if [[ $native_install ]]; then
-			unpack $my_64b_src
-		fi
-		mkdir 32bit
-		pushd 32bit >/dev/null
-		unpack $my_32b_src
-		popd >/dev/null
-	else
-		default_src_unpack
-	fi
-}
-
-src_compile() {
-	if [[ $need_lahf_wrapper ]]; then
-		# This experimental wrapper, from Maks Verver via bug #268336 should
-		# emulate the missing lahf instruction affected platforms.
-		$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
-			"${FILESDIR}/flashplugin-lahf-fix.c" \
-			|| die "Compile of flashplugin-lahf-fix.so failed"
-	fi
-}
-
-src_install() {
-	if [[ $native_install ]]; then
-		if use x86; then
-			local PKGLIB=lib
-		else
-			local PKGLIB=lib64
-		fi
-		local BASE=${INSTALL_BASE}
-
-		# The plugin itself
-		exeinto /${BASE}/flash-plugin
-		doexe libflashplayer.so
-		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
-
-		# The optional KDE4 KCM plugin
-		if use kde; then
-			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
-			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 'flash-player-properties' standalone app:
-		exeinto /${BASE}/bin
-		doexe usr/bin/flash-player-properties
-		dosym /${BASE}/bin/flash-player-properties \
-			usr/bin/flash-player-properties
-
-		# Icon and .desktop for 'flash-player-properties'
-		for icon in $(find usr/share/icons/ -name '*.png'); do
-			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
-	fi
-
-	if [[ $need_lahf_wrapper ]]; then
-		# This experimental wrapper, from Maks Verver via bug #268336 should
-		# emulate the missing lahf instruction affected platforms.
-		exeinto /${INSTALL_BASE}
-		doexe flashplugin-lahf-fix.so
-		inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
-	fi
-
-	if [[ $amd64_32bit ]]; then
-		# Only install the plugin, nothing else for 32-bit.
-		local oldabi="${ABI}"
-		ABI="x86"
-
-		# 32b plugin
-		pushd "${S}/32bit"
-			exeinto /${INSTALL_BASE}32
-			doexe libflashplayer.so
-			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
-		popd
-
-		ABI="${oldabi}"
-	fi
-
-	# The magic config file!
-	insinto "/etc/adobe"
-	doins "${FILESDIR}/mms.cfg"
-}
-
-pkg_postinst() {
-	if use amd64; then
-		if [[ $need_lahf_wrapper ]]; then
-			ewarn "Your processor does not support the 'lahf' instruction which is used"
-			ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
-			ewarn "should allow this plugin to run. If you encounter problems, please"
-			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
-			ewarn " ${CATEGORY}/$PN[+32bit -64bit]"
-			elog
-		fi
-		if has_version 'www-plugins/nspluginwrapper'; then
-			if [[ $native_install ]]; then
-				# TODO: Perhaps parse the output of 'nspluginwrapper -l'
-				# TODO: However, the 64b flash plugin makes
-				# TODO: 'nspluginwrapper -l' segfault.
-				local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
-				if [[ -f ${FLASH_WRAPPER} ]]; then
-					einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
-					nspluginwrapper -r "${FLASH_WRAPPER}"
-				fi
-			else
-				einfo "nspluginwrapper detected: Installing plugin wrapper"
-				local oldabi="${ABI}"
-				ABI="x86"
-				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
-				nspluginwrapper -i "${FLASH_SOURCE}"
-				ABI="${oldabi}"
-			fi
-		elif [[ ! $native_install ]]; then
-			elog "To use the 32-bit flash player in a native 64-bit browser,"
-			elog "you must install www-plugins/nspluginwrapper"
-		fi
-	fi
-}
diff --git a/www-plugins/adobe-flash/files/memcpy-to-memmove.sh b/www-plugins/adobe-flash/files/memcpy-to-memmove.sh
deleted file mode 100644
index b1632e583484..000000000000
--- a/www-plugins/adobe-flash/files/memcpy-to-memmove.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Quick and dirty, but inefficient shellscript that
-# turns all memcpy calls into memmove calls
-# From Ray Strode
-
-set -e
-
-INPUT="$1"
-
-MEMCPY=0x$(objdump -S -j .plt $INPUT | grep memcpy |awk '{ print $1 }')
-[ $MEMCPY = "0x" ] && echo "Can't find memcpy call in $INPUT PLT" 1>&2 && exit 1
-
-MEMMOVE=0x$(objdump -S -j .plt $INPUT | grep memmove |awk '{ print $1 }')
-[ $MEMMOVE = "0x" ] && echo "Can't find memmove call in $INPUT PLT" 1>&2 && exit 2
-
-DELTA=$(($MEMMOVE - $MEMCPY))
-MEMCPY="$(printf '%x' $MEMCPY)"
-
-TEMP_OUTPUT="$(mktemp)"
-trap "rm -f $TEMP_OUTPUT" ERR
-
-cp $INPUT $TEMP_OUTPUT
-objdump -S -j .text $INPUT | while read offset e8 byte1 byte2 byte3 byte4 call call_offset rest; do
-    test "$call_offset" = "$MEMCPY" || continue;
-
-    OFFSET=$(printf "0x%x" $((0x${offset%:} + 1)))
-    NUMBER="0x${byte4}${byte3}${byte2}${byte1}"
-    echo -n "Changing call at offset $OFFSET from [${byte1} ${byte2} ${byte3} ${byte4}]"
-    NUMBER=$(printf "0x%08x" $(($NUMBER + $DELTA)))
-
-    BYTE1=$(printf "%02x" $((($NUMBER >> 24) & 0xff)))
-    BYTE2=$(printf "%02x" $((($NUMBER >> 16) & 0xff)))
-    BYTE3=$(printf "%02x" $((($NUMBER >>  8) & 0xff)))
-    BYTE4=$(printf "%02x" $((($NUMBER >>  0) & 0xff)))
-
-    echo " to [${BYTE4} ${BYTE3} ${BYTE2} ${BYTE1}]"
-    echo -ne "\x$BYTE4\x$BYTE3\x$BYTE2\x$BYTE1" | dd of=$TEMP_OUTPUT bs=1 seek=$(($OFFSET)) count=4 conv=notrunc 2> /dev/null
-done
-
-mv $TEMP_OUTPUT $INPUT