--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- www-plugins/adobe-flash/adobe-flash-11.2.202.635.ebuild
+++ www-plugins/adobe-flash/adobe-flash-23.0.0.162_beta.ebuild
@@ -2,34 +2,39 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit nsplugins toolchain-funcs multilib-minimal
 
 DESCRIPTION="Adobe Flash Player"
 HOMEPAGE="
 	http://www.adobe.com/products/flashplayer.html
 	http://get.adobe.com/flashplayer/
-	https://helpx.adobe.com/security/products/flash-player.html#version11
+	https://helpx.adobe.com/security/products/flash-player.html
+	http://labs.adobe.com/downloads/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"
+if [[ ${PV} == *_beta ]]; then
+	AF_URI="https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer"
+	AF_32_URI="${AF_URI}/linux32/libflashplayer.so -> ${P}.i386.so"
+	AF_64_URI="${AF_URI}/linux64/libflashplayer.so -> ${P}.x86_64.so"
+else
+	AF_URI="https://fpdownload.macromedia.com/get/flashplayer/pdc"
+	AF_DB_URI="https://fpdownload.macromedia.com/pub/flashplayer/updaters"
+	AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV%%.*}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+	AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV%%.*}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+	AF_32_DB_URI="${AF_DB_URI}/${PV%%.*}/flashplayer_${PV%%.*}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
+fi
 
 SRC_URI="
-	abi_x86_32? (
-		!debug? ( ${AF_32_URI} )
-		debug? ( ${AF_32_DB_URI} )
-	)
+	abi_x86_32? ( ${AF_32_URI} )
 	abi_x86_64? ( ${AF_64_URI} )
 "
-IUSE="debug kde selinux cpu_flags_x86_sse2"
+IUSE="selinux cpu_flags_x86_sse2"
 REQUIRED_USE="
 	cpu_flags_x86_sse2
-	debug? ( abi_x86_32 )
 	|| ( abi_x86_64 abi_x86_32 )
 "
 SLOT="0"
@@ -40,65 +45,22 @@ RESTRICT="strip mirror"
 
 S="${WORKDIR}"
 
-NATIVE_DEPS="
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	kde? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		kde-base/kdelibs
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXpm
-	)
-	media-libs/fontconfig
-	media-libs/freetype
-	>=sys-libs/glibc-2.4
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-
 DEPEND="
 	amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
+	dev-libs/glib:2=[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0=[${MULTILIB_USEDEP}]
+	dev-libs/nss:0=[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0=[${MULTILIB_USEDEP}]
+	media-libs/freetype:2=[${MULTILIB_USEDEP}]
+	media-libs/mesa:0=[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2=[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2=[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0=[${MULTILIB_USEDEP}]
+	x11-libs/libXt:0=[${MULTILIB_USEDEP}]
+	x11-libs/pango:0=[${MULTILIB_USEDEP}]
 "
 RDEPEND="
 	${DEPEND}
-	abi_x86_64? ( ${NATIVE_DEPS} )
-	abi_x86_32? (
-		amd64? (
-			>=dev-libs/atk-2.10.0[abi_x86_32(-)]
-			>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-			>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
-			>=dev-libs/nss-3.15.4[abi_x86_32(-)]
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
-			>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
-			>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-			>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-			>=x11-libs/pango-1.36.3[abi_x86_32(-)]
-		)
-		x86? ( ${NATIVE_DEPS} )
-	)
 	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-flash )
 "
@@ -126,9 +88,9 @@ src_unpack() {
 		cd "${BUILD_DIR}" || die
 
 		# we need to filter out the other archive(s)
-		local other_abi
-		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
-		unpack ${files[@]//*${other_abi}*/}
+		local my_abi
+		[[ ${ABI} == amd64 ]] && my_abi=x86_64 || my_abi=i386
+		ln -sv "${DISTDIR}"/${P}.${my_abi}.so libflashplayer.so
 	}
 
 	multilib_parallel_foreach_abi multilib_src_unpack
@@ -157,32 +119,9 @@ multilib_src_install() {
 		# emulate the missing lahf instruction affected platforms.
 		doexe flashplugin-lahf-fix.so
 	fi
+}
 
-	if multilib_is_native_abi; then
-		if use kde; then
-			local pkglibdir=lib
-			[[ -d usr/lib64 ]] && pkglibdir=lib64
-
-			exeinto /usr/$(get_libdir)/kde4
-			doexe usr/${pkglibdir}/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:
-		dobin usr/bin/flash-player-properties
-
-		# Icon and .desktop for 'flash-player-properties'
-		insinto /usr/share
-		doins -r usr/share/{icons,applications}
-		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
-			/usr/share/pixmaps/flash-player-properties.png
-	fi
-
+multilib_src_install_all() {
 	# The magic config file!
 	insinto "/etc/adobe"
 	doins "${FILESDIR}/mms.cfg"