Add musl-tolerating Adobe Flash 25.0.0.127 package

4 files changed, 15 insertions, 64 deletions

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 42bf1f2..51a58b4 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,9 +1,9 @@
-AUX flashplugin-lahf-fix.c 1038 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d SHA512 c56082ca6371176a3454f94a7ee5c00aba2d27c969783b26740b6ff61f42e240a34b7eeacc736f035cc101709141c4786f241f98495654a67f61544a10ce478d WHIRLPOOL f43cc3b836c8d43e6d706d847693bd34a212eb4c4ba3ee698db0f752bf36a7029f81e05664ba3ebbb8190fca414dee3fc109e586fe5e02f1c6263cd6e5bbb8b0
 AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd WHIRLPOOL 915b86d717db181a776eb9392aaae2becac4747bc0e551900bfecdeda17f9d0495f54c7173e47adf2ea92567c193c466e302cac78bd2126f10fd9956c204596a
 AUX pepper-flash 151 SHA256 11a3e7e2c04f1e55ee5db5e7e776db67b6830431f1c10423df5031033c4480d1 SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1 WHIRLPOOL 5e6c3dccc897e8d6628422351f77f16363a9c86f851fb6848651a71b59bef450067d1de1fb8b55870ca5dc88b6a70f1f04818ce41b6ccc6dd50db43f223cb838
-DIST adobe-flash-24.0.0.221-npapi.i386.tar.gz 9161831 SHA256 7495689ad778cae778f19ac085d362cbae63c7a4ad806fd9ece1844040ba9eed SHA512 54595f8baad3f9531e8f261ac89246f6a428b9c7be50019580618a8c14d650d7dea00b602f8b15881a2b8c9749df05fba38231cd7fffcd6eb66427d68539eea8 WHIRLPOOL 08a74fdb57fe4fc8d31ea01f27492cede236d7800e6ccaceb9c69cf41118c8c226fd829d0957efbc455e83922238cbfb83adbbd566db50295b950261af0d0a07
-DIST adobe-flash-24.0.0.221-npapi.x86_64.tar.gz 9698349 SHA256 087048af5fa3c46a8c283403a341d4684ef4b966f4e407195b43c24bf5ae64b1 SHA512 c3f0702e247488d82543a364cda9d143e0f9f4262b36db1e4bc0d59f2d85f87afe8d741081965056c90de2460e166d93d6f9731043a3afe3ed6953f60225aa6b WHIRLPOOL ca8a96d411455e503493ad733b28c7dafdd98d00ec08270dd011a28fe452910d3d77bf200bc0da622352e39bbe7b82e3f773dcb9ba8f3b57ca636cca276ee3dc
-DIST adobe-flash-24.0.0.221-ppapi.i386.tar.gz 8561099 SHA256 4f79523ee10b28e172b93c7e3083604916299f888ed7565bf192484dd410f58e SHA512 4ff2505990f123aeee6725fcf4031dfee04e8281ecfb6574849884bb26a7d666a1b5d7b269b6b61b27ce3cd0bffc29b8d320676455ea1bc2e40ef441aa0c9863 WHIRLPOOL bb4abe01d967eba88bb357ffa38e953acb7ce3078321610b864c971a6f00fa38df8ba224fbe476600fffdd9aad4b2e29b7eaf7b001adf7d136307878531e0fce
-DIST adobe-flash-24.0.0.221-ppapi.x86_64.tar.gz 9479634 SHA256 e420f01500273478d95953829d0fdac7225957777f6d682466aadc368c59bfd7 SHA512 6e39a56957326f8e6a01a14b6e1fc3298b1f6bfd8a14bdd9de11d7f323211b38343d66238b9ffdaa9f2ad685d2bb59c233b7c9b093ac409c5bc06bc871fa84e6 WHIRLPOOL 3095ed5ff295ce34d14ab826b63e144295d887a87a51b8d1ddf431e30d1a96d7c16c8d636744d1aa522ccc8019ba3e7f0c35dcc0bf5cec48caae577e970d29ca
-EBUILD adobe-flash-24.0.0.221-r1.ebuild 3753 SHA256 c87c33398ebd6ec0bc73312d318ed343abc8907223b65cfc652d9b321b628d15 SHA512 92b8c69a9bed097af76b35b6e3f74741e9ab6ddcd8e1bdc19c1b3bb9b38faa44e99a26c0ffa0121f725e8d04a259ccd8e652f0aa29326531698aace331963df2 WHIRLPOOL a484fe4f3034251ac76d368128bbe9e41a4e75d0dca971658fa934eda4a11246aac901337cd1c34aa230277ca3b587222c67f29e190444eab3cffc6c0e8b1157
+AUX pepper-flash-r1 143 SHA256 ba069eab3ee17b93cab566c73d94e56e6225dc7094c75925bbe0597cba2dd8f6 SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee WHIRLPOOL 5d6a1c12120519bf524da7dafa508bdaaf65d98874b09ec76925fcfe51ccdfa5886afc228a131a267c237aae0d293609963a76ac6301273da563aea396fae8b5
+DIST adobe-flash-25.0.0.127-npapi.i386.tar.gz 8484560 SHA256 2ddd617be4a970c3a35c1ab11f95993ca15a824f32d2e0a213f43a5399087a0b SHA512 d6b21299e2fc22f1bbf0edbb27d821793c5a00613689ae5011bc587be3368a0e14743aa68f3d5803df9e90f0515b710f0a0e38ec121fd6eba5106d9f566b3371 WHIRLPOOL e30945c18386b1168bc140746a77a1f91fae28dd3f0e174f400358d05655dfd566ccf8c446f659f5b81b40693a510bc5b8769fa86fb14df6111501fa993bf457
+DIST adobe-flash-25.0.0.127-npapi.x86_64.tar.gz 8995820 SHA256 f65b43312429393fb2fe5a3aedd40a39f79f71ae30ac0444f2d4acfa7b925af9 SHA512 0fa38e950e74ec784c8495afc664398b744daf255a3614ab73b3354452aaa5739264c5c03f1b1bd0965ce3cf29ac365629d7aea6019aecc1f11a4906131327b5 WHIRLPOOL 50460b3e1ff5f3c72bfdbcd3fa80d7cadcc2519c4acc276d6ac5bac395a7c6945ea01ed7b7990a61726058a6da36a4f12c0c46bd578bda92d4d88082c6e3fb59
+DIST adobe-flash-25.0.0.127-ppapi.i386.tar.gz 8529290 SHA256 dfa0731c4c8f878b0777665ad1d5d45ae306b8ec3afc8a0d84c1321c4ab7e75b SHA512 296590a9d30610ccb13016e3f4297655827620c81f451ce67c20d69b17a210af26aba8309b8fee6db9c36199803ce2702c9edef1067fd3b99f4beafb60529acd WHIRLPOOL a2af88e3231d7f86d15ba5cce12c01d28c1520c6b914f7377cc90385c7b0a430bd067cbd7d87aed223c93e250608320f242b71e795fe96241bfb5bce0889b16f
+DIST adobe-flash-25.0.0.127-ppapi.x86_64.tar.gz 9444990 SHA256 0d31c78f5e96488e548ce742d3acddf1fe05580a2a2bbc41032196a9f2c4c792 SHA512 a568ae1e3527e8b8e165d2d81a0697da9dce7425b53915098af1bb34261f01145c4b95a221cab80a17635a86b8707dcfef1a7259c9fa7f56159178507ba70f3f WHIRLPOOL 02818c77b68793a58ce8348f877b91405721e98a6d791b3ce3dbe92caafbb44accb492d85ac060f089e0b4336f82805351d4d0c29912362629dae006944bade5
+EBUILD adobe-flash-25.0.0.127.ebuild 3236 SHA256 c99b543f596079a59f7b8a5527525d91bc074e3637f9fbd8091527886c14a221 SHA512 58f49328c341541753c3c990ce67c99facba1781f78ff04892d656c111a753cd04e7a28eb5dd8fd76ffc62c0109c398e8c49076d304df0499b2f4f4534ec5b61 WHIRLPOOL b0d494119b19fa263ac65289133a099e218c9bed6ec00e391ac986be26cb0ecd9fcbaa2c4ccf82d83b32738c6895a865c1d7ec353aef4df7b89a5964196e7e8e
 MISC metadata.xml 440 SHA256 0d6eae4583c3acdc471387fd5e9ea090001657cfd9afb1945829236648a5e75a SHA512 ea2a7fdd7fe70b45ace9af628e8da68ea7fb71b0108fd307bdda38b18123530c50d72cf7d397c2da62861ef03a1fefb1694b0f69d3d4886c6c42d885097e9ee9 WHIRLPOOL bf69c0adf1a7df7db66da7650b3c696788da6f36b17e30ef15592f54cfa5f7de8b8656f09548f86ed49cb96630b720e12ff4d8d2ef4d7d2d834a1e7ca3cdefa9
diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.221-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-25.0.0.127.ebuild
index d10549e..4569ae4 100644
--- a/www-plugins/adobe-flash/adobe-flash-24.0.0.221-r1.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-25.0.0.127.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 inherit nsplugins multilib multilib-minimal
@@ -18,7 +17,7 @@ AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86
 AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
 AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
 
-IUSE="kde +nsplugin +ppapi"
+IUSE="+nsplugin +ppapi"
 REQUIRED_USE="
 	|| ( nsplugin ppapi )
 "
@@ -44,20 +43,6 @@ NPAPI_RDEPEND="
 	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-frameworks/kdelibs:4
-		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
 	x11-libs/cairo
@@ -109,16 +94,10 @@ multilib_src_install() {
 		doexe libflashplayer.so
 
 		if multilib_is_native_abi; then
-			if use kde; then
-				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
+			# 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
 
 			# The userland 'flash-player-properties' standalone app:
 			dobin usr/bin/flash-player-properties
@@ -136,14 +115,14 @@ multilib_src_install() {
 	fi
 
 	if use ppapi; then
-		exeinto /usr/$(get_libdir)/chromium-browser/PepperFlash
+		exeinto /usr/$(get_libdir)/chromium/PepperFlash
 		doexe libpepflashplayer.so
-		insinto /usr/$(get_libdir)/chromium-browser/PepperFlash
+		insinto /usr/$(get_libdir)/chromium/PepperFlash
 		doins manifest.json
 
 		if multilib_is_native_abi; then
 			dodir /etc/chromium
-			sed "${FILESDIR}"/pepper-flash \
+			sed "${FILESDIR}"/pepper-flash-r1 \
 				-e "s|@FP_LIBDIR@|$(get_libdir)|g" \
 				-e "s|@FP_PV@|${PV}|g" \
 				> "${D}"/etc/chromium/pepper-flash \
diff --git a/www-plugins/adobe-flash/files/flashplugin-lahf-fix.c b/www-plugins/adobe-flash/files/flashplugin-lahf-fix.c
deleted file mode 100644
index 9338b73..0000000
--- a/www-plugins/adobe-flash/files/flashplugin-lahf-fix.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Simple work-around for running the 64-bit Adobe Flash plug-in version 10
-   on Athlon64 processors without support for the lahf instruction.
-
-Compile with:
-cc -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so flashplugin-lahf-fix.c
-Then place the .so file in the plug-in directory (e.g. $HOME/.mozilla/plugins)
-or use LD_PRELOAD to force Firefox to load the library.
-
-   - Maks Verver <maksverver@geocities.com> July 2009 */
-
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <signal.h>
-#include <ucontext.h>
-
-static void sig_handler(int signal, siginfo_t *info, void *context) {
-	if (signal != SIGILL) return;
-	if (*(char*)info->si_addr != (char)0x9f) abort();
-	greg_t *regs = ((ucontext_t*)context)->uc_mcontext.gregs;
-	((char*)&regs[REG_RAX])[1] = ((char*)&regs[REG_EFL])[0];
-	regs[REG_RIP]++;
-}
-
-static struct sigaction old_sa, new_sa = {
-	.sa_flags     = SA_SIGINFO,
-	.sa_sigaction = &sig_handler };
-
-int _init() { sigaction(SIGILL, &new_sa, &old_sa); return 0; }
-int _fini() { sigaction(SIGILL, &old_sa, &new_sa); return 0; }
diff --git a/www-plugins/adobe-flash/files/pepper-flash-r1 b/www-plugins/adobe-flash/files/pepper-flash-r1
new file mode 100644
index 0000000..b70c40c
--- /dev/null
+++ b/www-plugins/adobe-flash/files/pepper-flash-r1
@@ -0,0 +1 @@
+CHROMIUM_FLAGS="${CHROMIUM_FLAGS} --ppapi-flash-path=/usr/@FP_LIBDIR@/chromium/PepperFlash/libpepflashplayer.so --ppapi-flash-version=@FP_PV@"