summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-07-10 10:47:31 +0000
committerJeroen Roovers <jer@gentoo.org>2013-07-10 10:47:31 +0000
commit46fb39b3611180070cd81831ad65d8a5e890fd3e (patch)
tree5f4d4a44c834ccee31684aa78712f0ee8da637c3 /www-plugins
parentMake USE=gif as default wrt bug #422793 (diff)
downloadhistorical-46fb39b3611180070cd81831ad65d8a5e890fd3e.tar.gz
historical-46fb39b3611180070cd81831ad65d8a5e890fd3e.tar.bz2
historical-46fb39b3611180070cd81831ad65d8a5e890fd3e.zip
Old.
Package-Manager: portage-2.2.0_alpha187/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'www-plugins')
-rw-r--r--www-plugins/adobe-flash/ChangeLog6
-rw-r--r--www-plugins/adobe-flash/Manifest27
-rw-r--r--www-plugins/adobe-flash/adobe-flash-10.3.183.90.ebuild123
-rw-r--r--www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild255
-rw-r--r--www-plugins/adobe-flash/adobe-flash-11.2.202.291.ebuild266
5 files changed, 10 insertions, 667 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 2a765ec2e412..a33ccf9b374f 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.206 2013/07/10 05:18:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.207 2013/07/10 10:47:30 jer Exp $
+
+ 10 Jul 2013; Jeroen Roovers <jer@gentoo.org> -adobe-flash-10.3.183.90.ebuild,
+ -adobe-flash-11.2.202.291-r1.ebuild, -adobe-flash-11.2.202.291.ebuild:
+ Old.
10 Jul 2013; Agostino Sarubbo <ago@gentoo.org>
adobe-flash-11.2.202.297.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 4da387499e34..f37cab47e695 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,36 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX flashplugin-lahf-fix.c 1038 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d SHA512 c56082ca6371176a3454f94a7ee5c00aba2d27c969783b26740b6ff61f42e240a34b7eeacc736f035cc101709141c4786f241f98495654a67f61544a10ce478d WHIRLPOOL f43cc3b836c8d43e6d706d847693bd34a212eb4c4ba3ee698db0f752bf36a7029f81e05664ba3ebbb8190fca414dee3fc109e586fe5e02f1c6263cd6e5bbb8b0
AUX memcpy-to-memmove.sh 1418 SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096 SHA512 1686108fc6a1f5438e0d054de55e95829f53e551bb11efbc2632e62cd4432edf93a26dced2409512bbc641d61c840e0d5f241c6716811dbff00f32586f4aaeac WHIRLPOOL 28c8d1cc1f557a812c1bfd078068d7e8fb40604e7060705446d6317dc6e76375cec81190ec42e979f2e6a43516466d0454f45152de31d43f7dd5fc9854db9296
AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd WHIRLPOOL 915b86d717db181a776eb9392aaae2becac4747bc0e551900bfecdeda17f9d0495f54c7173e47adf2ea92567c193c466e302cac78bd2126f10fd9956c204596a
-DIST adobe-flash-10.3.183.90.i386.tar.gz 5466785 SHA256 b8b6496bcccbea57026b1926157436bc167dfaa8bf9d4a3c51f308f90255d4bc SHA512 b05dafa959ccf3d1291d769c4b60f00d75ea81a29e8162185eefdcafb09cf4392f5112e2ef0263d29a83c2c68571d32fb9af35cf548e6ccc79373cb6b1503d6f WHIRLPOOL 1030ddaac37da8a78fb020fd87510c2debb615987d7dae105ed7ba0e24796d1c36b75491a19bfe71533598673956bbfb03e31cc9d102f92068ebaeb5737937cc
-DIST adobe-flash-11.2.202.291-debug.i386.tar.gz 7401909 SHA256 55b83ecfcc6ed307d25c2371c93354eacf93655fef35bd9938f2edfb8edda8e2 SHA512 37c8431aea9693a9dfddc8adc0a4798d3b54deec06e0fc9539dee0810ffb055375f43023c39eb065da5a40a78b1414ab990e3523807e24ab1fa092077319141d WHIRLPOOL 429ae28ef504080496fb55448f535e16266a01f6745f44c22e8bc3faefcdc7d184146c165f7e0bf641271779ceb31c9696856caa9d8a6fa333a4836c4127767a
-DIST adobe-flash-11.2.202.291.i386.tar.gz 6923403 SHA256 513abbfd9e4d7115c00264d82654ad226aa22f44e837301ccd0dd0e81de3a1f6 SHA512 f4aa275b6c97a4cb04a8bb5aafcb53bc193e69a78e78b34f79a84abec76bb52de512b311d75f037a4c8fee7bf8b370d37e53d75dbf54eaff91f7ad7d4c939cf5 WHIRLPOOL 34c099d12a449de15e0a9b22bd62f6f360f63dead1ec0ae3c444281e20fc5b94b8d7cd09a91caa56aa12de80ab2e2bc7b178923244317b3d267f5a3d1760e711
-DIST adobe-flash-11.2.202.291.x86_64.tar.gz 7234043 SHA256 eb2c827e334a6d21b6285f78c81c335bd51c412b6c7459e599d543bac6f40ab7 SHA512 d882c5b11a2fa7d4a47dbede3ef32270d8aa30e0eb294f8594ffbebf4640a2959e21f145a0fa536b61ba76ed41c8d1cc3c01f9a0c96308e013db1fb0083052a8 WHIRLPOOL 349f320699a7cc70af27611cf3812afdc4fa85ad046944c0a86f8c3909b9370006e4fd089551449cc828ee5abefa597b19e783002dcf5cf1e0cdc2c51f959548
DIST adobe-flash-11.2.202.297-debug.i386.tar.gz 7401822 SHA256 0a6829a7b43fe2397db508aadd7619d303ca6345127d67a6635c1d9891ddbda8 SHA512 e090cde6345efdcbabc39054bc44f7ed389bd707f03be2b11b2c1fabb0d5822904370bcfdee01eb8d363527780329d73205c961e43d1b483d690ef694f9a4d07 WHIRLPOOL 4858f6858718e499dc8441f6b3ad681854546be83d2fdf261673136f101e69d4808fc859ee99044f7f9bc6aa6fa52efbe6bcfd203cfeda8a49daa2178888097f
DIST adobe-flash-11.2.202.297.i386.tar.gz 6923530 SHA256 9e20d25df0bc008d02b5fc5d78a972de8f4c7f738e165e3163ef64255611f256 SHA512 8c8770631b4d5ba2094750299ebb379747999af13f32f1d46ebf889eda419da2be889bdeffe72f331ad90e321141a04c12d40de6b9f4bca337450e6725594a8f WHIRLPOOL 59b926bbc36296e2fb0cc43ababa12d7b581e8ac432816107bad596f5260ff0e3d12a94b1669295689f8e26ecb7392b0cecc884aa23550585fc575714a9bf493
DIST adobe-flash-11.2.202.297.x86_64.tar.gz 7233858 SHA256 085223761c7cc608c60a12851aab8352ec87ae085412566f30f79b6b0a7ed149 SHA512 dfe73e3d6e56dd625ac78a02ac6070b9ca08f76fc312ee8bc7a8c3afb933f256e9f1ea732017ac8cc7526a902d0d98e4de56f78bfa3208a6a17bd67fe0711ae5 WHIRLPOOL 1d7367369281222bc4689e7fe0725483a3f24ee6dfc7344693cf03c5456571c7aa75ecef32e43730ded3fc287a014d62ff34e9ecfa45e153d659c7ea6de7c73d
-EBUILD adobe-flash-10.3.183.90.ebuild 3554 SHA256 3e0cfc0d2ba587e667236b275757e01cfa4451b6368a11475999114cdd08d2cb SHA512 9e94a5614b77288103c511da813b928f0493ad69c2bc292c23a78bd0ad401392a2f6dcdc3120ca9909c4a9d9d7c6dd751649bfffdd483a71b2ea0c77a9a3dc24 WHIRLPOOL 8b89d9f3253a9338ef07baca1fea74ccb71c6270a78e37d6c4b8653051cec9901dbfcd8f023887bc6b8c29501c90f091af7426ade213f598dbd50ad52139a68f
-EBUILD adobe-flash-11.2.202.291-r1.ebuild 7439 SHA256 7e013af2380233a4423522cdd5169189c09c3e9b9d91eb8b635e4fee42b150ee SHA512 2a9f8a6dbcf57c0f005e6b1be8ad9a27d42f6ab37d5c6679b9a2b363861f49a8974ac94a67e6a9446389cb591eb873986c89ef7c2cf8fc5b7ac28571fbd341d6 WHIRLPOOL 47e50265b52d00c8398292cb74be068713876310e70fb15ca38cf9a1ec8fc0c210aceefee6f0dbdb0786d0fb0df0ad6026c5bf8964bd49b9a71903d0a018cf81
-EBUILD adobe-flash-11.2.202.291.ebuild 8087 SHA256 92816dd00c11e292b22fd1f0f57abb9402c1cf221d84f1e604b5492fbeae1d4f SHA512 6799460709c57c86e7cdc1a5cad39ac3f777a457cd22b519cfe0e03cce920831676ae13275af19c544b8f1d0ca84af53442bf67b8d2c920f376e57b8b8e35103 WHIRLPOOL 2ad480d57364eac84b9af8c80b10c62a195a51fda74b6bb3f3e03d9240ed2cb2f5d17a620656072c1f5a39576f2997760c4b79d13212e2636a7b37326c778eca
EBUILD adobe-flash-11.2.202.297.ebuild 7434 SHA256 f409b6fc8c3f0e77f3e130cb4284184b992654226279f80d90f38e87607fb5a8 SHA512 eb2aa9405a959311ad9535990f8646d9e259d76b527f5f8270aa89ec109e65e810fe9b736a8888f097d324c1eb3494d016a46b0ac468c5535a2018532121cb88 WHIRLPOOL a28c9602f74a37f6eb7a6859e589fe8878b2298bd547dee8ee3b66bdcc6bcb53c08e95e5c13c86509f20bc1143985fa23ea005e5cdc25da54e039ad5aea71377
-MISC ChangeLog 52517 SHA256 4d9de08b8baa058b990ea32a396eafd46f34bc93892d69932783c56a545e598c SHA512 40d5605c3874dee2506986800bcf77cb58617819edec101f1727b14433b40f155961f33ff38953ccbe6b780a473707091bda568a2dc619772d88688f1ce352cf WHIRLPOOL 373e3bb2433ff4543f2df4f118d919c7829c2ae5e66f570e2d1c6693a0e7b17b103289ef65835b8304ee998377187cb03b58fe9c7bb1d6de79e64c04f6d4817a
+MISC ChangeLog 52678 SHA256 729be10bb4134d2e30f0373a218738f0916836b5af8b20aee2c9725d4607a8eb SHA512 f3285c652bd8d6ae5378379f1deb37d4ea77d8519f4c74e9242bf881303b4186d49b74bd2feb97931a38b04c16caf1e6a81e28b5f82fd851e7eff0ad144cab4e WHIRLPOOL 3e7f305396e2b405c88971b09d009035fb9c25b1cc368be0df69689520d04ef1ae61e6ca1e349a584216cfa20ba41c9079045865360a3cb26cafd4b7a9d6a9fe
MISC metadata.xml 910 SHA256 ce8ddbe474e3b8e3cb069714254b6315f4a315092ea26f4c012f2516fbf4c7f3 SHA512 1ad409756e0c76fa4e5b6b7570eaceac505a7d922d307b0a0ed1a92212c08933d8519f58db5c54a2b3fa321cc647e7f98d3d7ab7755899f054139abb09618984 WHIRLPOOL 36af66ef3e829090c20e9d97ad78228725580979a91a6c1c2708d1ea877dd5d81dffe39c13f79dc0719883f042ae3997a90931f946b0d044a4c1141601e4cec3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCgAGBQJR3O6FAAoJELp701BxlEWf/gsP/0XximohNazpVO62J1nZtDUK
-9G4cFM3+8yNUEK0UQGiZ16YUd07UnvYaRlDiubPfPK1/40lakgGlUZoylXJHr5w7
-FNcVkl/F0b+fW+SfWX+P4YO+354Frc2UzMSfFcia4unea2OwhcscLFucj3VevJ0K
-myByf8tuTeHfRGy1HdX8LjNFwDxkBkLqNfrlc/Nbr0hiSj2w//lI5vTSRcS+mT/v
-rc2DCFqyBFNswP80Q6/bKY/169iqWFp0RYGXXMqyNy+DHcIpPjoDOoleI3UQUUDi
-7VNNaaVEjA25/8n9RTgudcit77gphv9Smuye8UY9m+qjPuEUi+/1UeFrsrPPdhYN
-TFQ1+MZAkwqVNR3dScc0aHb5/XxSLbLH+EyNlz/vXZCrX5um2UYAZNvjpwFT/Msh
-1+qrEZ3i8CN6eqWkbL5XQil4LjNNUhKwhn6czHvXkwcrgqV1WQ6Kac7GV/EtcDuj
-nK9cqjuVVVNNu7+pO9nmHniX8Jk9IWOdawDgLzsguCNoWN/eSbnwQ3exF2+r8mjK
-/0F94l3ZN41hR6wDqELCG7BkESu5vNEo20FG0aLPBoDaleTfLI2T1Cymwh1z19rk
-6vifFz0xJaqcozd8ITJg3NXr/hdMxhv2vhjLXEnnKNn4cDnac5npItVVP5SUdW+7
-UU0obcbI0xAUVJ44xOGZ
-=/mgP
+iEYEAREIAAYFAlHdO8MACgkQVWmRsqeSphNenQCeKxfkLWT2eRDBaWUyAYsH8m/+
+24kAn1usWBLYBLcEmBWiNTocypA5Qlru
+=G4/h
-----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.90.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.90.ebuild
deleted file mode 100644
index 8c35489cbb52..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.90.ebuild
+++ /dev/null
@@ -1,123 +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-10.3.183.90.ebuild,v 1.1 2013/06/12 00:31:31 jer Exp $
-
-EAPI=4
-inherit nsplugins multilib toolchain-funcs versionator
-
-MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.tar.gz -> ${P}.i386.tar.gz"
-
-DESCRIPTION="Adobe Flash Player"
-SRC_URI="${MY_32B_URI}"
-HOMEPAGE="http://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html"
-IUSE="selinux kde vdpau"
-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? (
- || (
- 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? ( www-plugins/nspluginwrapper )
- selinux? ( sec-policy/selinux-flash )"
-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 libflashplayer.so
- 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
-
- 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
-
- 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
-}
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild
deleted file mode 100644
index c20c58cb82f0..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.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.291-r1.ebuild,v 1.5 2013/06/18 23:44:18 jer Exp $
-
-EAPI=4
-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/adobe-flash-11.2.202.291.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.291.ebuild
deleted file mode 100644
index c30c41511d84..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.291.ebuild
+++ /dev/null
@@ -1,266 +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.291.ebuild,v 1.3 2013/06/12 10:39:13 ago Exp $
-
-EAPI=4
-inherit nsplugins multilib toolchain-funcs versionator
-
-AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
-MY_32B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
-MY_64B_URI="${AF_URI}/${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} )
-amd64? (
- multilib? (
- 32bit? ( ${MY_32B_URI} )
- 64bit? ( ${MY_64B_URI} )
- )
- !multilib? ( ${MY_64B_URI} )
-)"
-HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
-IUSE="multilib -32bit +64bit selinux vdpau kde +sse2check"
-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_pretend() {
- if any_cpu_missing_flag 'sse2'; then
- eerror "This version of adobe-flash requires a CPU that supports the"
- eerror "SSE2 instruction set, and at least one of your CPUs does not"
- eerror "support this feature."
- eerror ""
- if use sse2check; then
- eerror "You should mask this version and use adobe-flash-10.3.* instead."
- eerror "To do so, add the following line to your package.mask file:"
- eerror " =${CATEGORY}/${P}"
- eerror ""
- eerror "Or if you are trying to build a binary package for another host"
- eerror "that does support SSE2 instructions, you may override this"
- eerror "check by setting USE=\"-sse2check\""
- eerror ""
- die "${P} requires CPU with SSE2"
- else
- eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash"
- eerror "will not function unless all of the CPUs on the system where it"
- eerror "is installed support the SSE2 instruction set."
- fi
- fi
-}
-
-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=${MY_32B_URI##*>}
- local my_64b_src=${MY_64B_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'
- # However, the 64b flash plugin makes
- # '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
-}