From: Jeroen Roovers Date: Tue, 25 Nov 2014 21:52:38 +0000 (+0000) Subject: Version bump (bug #530692). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8460c1531eabfe8b75a3a4046c126d46a628fea;p=gentoo.git Version bump (bug #530692). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog index 332abedc66ec..caa53b02e920 100644 --- a/www-plugins/adobe-flash/ChangeLog +++ b/www-plugins/adobe-flash/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-plugins/adobe-flash # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.277 2014/11/13 11:18:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.278 2014/11/25 21:52:22 jer Exp $ + +*adobe-flash-11.2.202.424 (25 Nov 2014) + + 25 Nov 2014; Jeroen Roovers + +adobe-flash-11.2.202.424.ebuild: + Version bump (bug #530692). 13 Nov 2014; Jeroen Roovers -adobe-flash-11.2.202.411.ebuild: diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index d6242ee1a03d..7cd27b6bc733 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -6,13 +6,17 @@ AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8f DIST adobe-flash-11.2.202.418-debug.i386.tar.gz 7406631 SHA256 a08c8be032a240da2f238ee52ab55a766ae722c571a42be4517b0360df6c099c SHA512 6e2b3ccca4ebffc4d20c20db6e5a54b3c256af79dde0b1ec965f4bb216cdf178708a3b22d5cf81a489c61a12adb4287d7b5afd2509b05032991d147bd9dada40 WHIRLPOOL eea747ff4ac0f17b7ef00bfd05071d646769dcd60d5d8f14793df5b08464717965ad3077b666f931f42e32fbfea9610197a8011fa029c3645ea8c3ca71bbb12b DIST adobe-flash-11.2.202.418.i386.tar.gz 6925123 SHA256 e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e SHA512 edf5a793cf9c342a51fb518659cdd09e4e2a659610942508bae80d4025e7a7a3e6d725e53c6832a1acb339eeb833ae7a1017c7394b5646e8082c93f6efb8e06b WHIRLPOOL 70b53411c62b3519f575b7c1d34739e6d54ed8281c11f04a50e13cb0363bcb79aa03fb95d268e49ebcdf2af0d8865439e8c26e657bee7383353e95ff5bb3af2b DIST adobe-flash-11.2.202.418.x86_64.tar.gz 7241108 SHA256 36a55ea92cb80090f7053077344b619eb0c53c4ca05098bb4a69a9ab4c8bf130 SHA512 673201e76b21330f8823b0f999910e6716ea233b4e99acac44aeb4d31cc4a0311d558d3818febf5c798bf1e5b621c5f8384cb0ffda6eb6d0e8bec2cd80d3d4fa WHIRLPOOL 2903b6fb5372d98606f05f0969ff19516aa5a4251bba672676128ffcdcaceaec90fba355d63e3c6b03dddc341e0e5cae902a4feeac0fc1e093b0a8f42cd09167 +DIST adobe-flash-11.2.202.424-debug.i386.tar.gz 7406275 SHA256 d4f056ba44125a1dcfa2b43b7404f1b70af6055b2fef1f7fd72138ca1e4a4a01 SHA512 9275430585efc060f2375659dfbc45e407d91906083c4e24f3da86858b1cf7d3f90e32c550acc3de4832885a1ba4cee7b1e1a8afed37c44399f11c1fe4945d64 WHIRLPOOL 84fe138360753fee334687e878421af9eb5f0fd4b294f3429667d1b94116e67734f2a123eecce3fcf9e1a080a3682aa5efb70748e5a511141af163236f9dc8a2 +DIST adobe-flash-11.2.202.424.i386.tar.gz 6926508 SHA256 5661d38963f1636a1c858184df657a20a7ce24f7d2f42f61c91b61f30ffb94ff SHA512 c18a0df282aeff7165006a622e79eda21e0c773120221d2529e9ebc73fd3c27b3b77c67fc06896ceca257b262f3a30f3b21f9258f1de34ffac4c11da740c1e4c WHIRLPOOL f776f01ffd4cb144633aaa06d5d222ffddc3b48137334a4cab2d9cf71033f90cb93d634f10bd99117e27b852e4450b1e9045334d45e7bfc72a1e682040510bfc +DIST adobe-flash-11.2.202.424.x86_64.tar.gz 7241264 SHA256 e8c3768ec878da19f3de9dc75c22b3ef0a9cefa4fc799a4fe809efbde83973da SHA512 7ce511e58f74d4d92c8c29907e080eafc54ab9cbe7e64f3320639ac236a1c18a7237e23b8d9af60e9eee62b1e42016dfd50655c7cf26bb568475a6a80482b254 WHIRLPOOL f8f83ea6440cb4bcdcac9d1503fbeb00c675cdeb7001c41f02411eb34ab8361996b5443d2926a3193ef9326cfd690f1953574b5ec186373b3fc165fe7997dde0 EBUILD adobe-flash-11.2.202.418.ebuild 7046 SHA256 ba116a57911c4eefc86b9c3229a899384fdd82eb139ae75e1228bd16d68e9c44 SHA512 86948fff13abfd5aa1259ef3352f1af7f5af1844beedaad20e9c0804ba22aea8465adaff84941461180beb93571f170ce5cc77050007244aa8f2eee16aae855d WHIRLPOOL 1cb09bb40b6765443ed7f111ec171fafe624615ff19d6f6b2b99ad9882cb72f84767f4480b13ae371c4e9a3e25e3a8865672933be02a7f4e4fff500512ef22c5 -MISC ChangeLog 61827 SHA256 cad5f50633d70bf5302e252c90b712a5b73992a6b2e39ae7c3d7f513cd771347 SHA512 9b8cc73853d85a12ffa79224e4198b92c8c37e72aa954761889438715a6d1f32f65b86e83ba72c04201edbadae896d83221991db40eaa2b89bd1eddd7b106fc2 WHIRLPOOL 77826b101788f402d1c8fe2bbdff21d41df784b4b1f37d18b1682961407d917ab78bc35204f9f6153eaf59e2ccb9e432bb77270360b521ab1fb2bc270babe374 +EBUILD adobe-flash-11.2.202.424.ebuild 7048 SHA256 e4cf4cf91a2347d5186ed99fc4be95096428cbcae19127747299e371834be7ea SHA512 e91b8f4d4b8f7b34431c3b96e7fc76b3f4250ec706e4a9512bfa1ad7896a6c6bb6aaca16c17dae86b6b399fda8a7ef65e1debf175ebe52e71db3b752e17a6a29 WHIRLPOOL 3ac9d919be74dbd8e3520672c0d2c69464629a54d9d604f90997486aab8007b8e1b3d8644b10c27bc41dcc46df9e9a9eafaba63cd9c45a4a12406f81616d3a68 +MISC ChangeLog 61982 SHA256 f540f891f308620dd0a298b2858e716c53c1029c6115995405d8b61a9afc6c7d SHA512 b2d10ed40652528a18281b79fd1e2e7c2658797f5886e7514640222a90b04cb0f4d5fac7b9343456ad69cacf0662df1157014fae58de26918c12f214fcbce6a1 WHIRLPOOL a81f1b07c3947c7e6953fcd8ed4ea1aa725a9beede9c9faf0083eb02759d0ff83542ca74fab7405bc77fa236a7982ca85164ea3763a55429e1bc2a6602758559 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRkk40ACgkQVWmRsqeSphN2uACfTjZdDmlGzLv2yBZ0iRJ9mpCD -rMEAn3H2OssxZQPYJhum5IvxV3sUANfd -=a/Bo +iEYEAREIAAYFAlR0+iYACgkQVWmRsqeSphM5TACfVRqgOl/TNkxL+anWS6D2adbV +Qy0AnjPUwWecqu1xQpvCwSAFO58YM39k +=kTcM -----END PGP SIGNATURE----- diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.424.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.424.ebuild new file mode 100644 index 000000000000..2097451dc16e --- /dev/null +++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.424.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2014 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.424.ebuild,v 1.1 2014/11/25 21:52:22 jer Exp $ + +EAPI=5 +inherit nsplugins toolchain-funcs versionator multilib multilib-minimal + +DESCRIPTION="Adobe Flash Player" +HOMEPAGE=" + http://www.adobe.com/products/flashplayer.html + http://get.adobe.com/flashplayer/ +" + +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=" + abi_x86_32? ( + !debug? ( ${AF_32_URI} ) + debug? ( ${AF_32_DB_URI} ) + ) + abi_x86_64? ( ${AF_64_URI} ) +" +IUSE="debug kde selinux sse2" +REQUIRED_USE=" + sse2 debug? ( abi_x86_32 ) + || ( abi_x86_64 abi_x86_32 ) +" +SLOT="0" + +KEYWORDS="-* ~amd64 ~x86" +LICENSE="AdobeFlash-11.x" +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 ) ) ) +" +RDEPEND=" + ${DEPEND} + abi_x86_64? ( ${NATIVE_DEPS} ) + abi_x86_32? ( + amd64? ( + || ( + ( + >=dev-libs/atk-2.10.0[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/pango-1.36.3[abi_x86_32(-)] + ) + app-emulation/emul-linux-x86-gtklibs[-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(-)] + ) + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) + || ( + ( + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[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(-)] + ) + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + ) + ) + x86? ( ${NATIVE_DEPS} ) + ) + || ( media-fonts/liberation-fonts media-fonts/corefonts ) + selinux? ( sec-policy/selinux-flash ) +" + +# Ignore QA warnings in these closed-source binaries, since we can't fix them: +QA_PREBUILT="usr/*" + +any_cpu_missing_flag() { + local value=${1} + grep '^flags' /proc/cpuinfo | grep -qv "${value}" +} + +pkg_setup() { + unset need_lahf_wrapper + if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then + export need_lahf_wrapper=1 + fi +} + +src_unpack() { + local files=( ${A} ) + + multilib_src_unpack() { + mkdir -p "${BUILD_DIR}" || die + 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}*/} + } + + multilib_parallel_foreach_abi multilib_src_unpack +} + +src_configure() { :; } + +multilib_src_compile() { + if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then + # This experimental wrapper, from Maks Verver via bug #268336 should + # emulate the missing lahf instruction affected platforms. + set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \ + -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c" + echo "${@}" >&2 + "${@}" || die "Compile of flashplugin-lahf-fix.so failed" + fi +} + +multilib_src_install() { + # PLUGINS_DIR comes from nsplugins.eclass + exeinto /usr/$(get_libdir)/${PLUGINS_DIR} + doexe libflashplayer.so + + if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then + # This experimental wrapper, from Maks Verver via bug #268336 should + # 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 + + # The magic config file! + insinto "/etc/adobe" + doins "${FILESDIR}/mms.cfg" +} + +unregister_pluginwrapper() { + # 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/${PLUGINS_DIR}/npwrapper.libflashplayer.so" + if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then + einfo "Removing 32-bit plugin wrapper" + nspluginwrapper -r "${FLASH_WRAPPER}" + fi +} + +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}[abi_x86_32,-abi_x86_64]" + elog + fi + # needed to clean up upgrades from older installs + if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then + unregister_pluginwrapper + fi + if has_version 'www-plugins/nspluginwrapper'; then + if use abi_x86_32 && ! use abi_x86_64; then + einfo "nspluginwrapper detected: Installing plugin wrapper" + local oldabi="${ABI}" + ABI="x86" + local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so" + nspluginwrapper -i "${FLASH_SOURCE}" + ABI="${oldabi}" + fi + elif use abi_x86_32; then + elog "To use the 32-bit flash player in a native 64-bit browser," + elog "you must install www-plugins/nspluginwrapper" + fi + fi +} + +pkg_prerm() { + use amd64 && use abi_x86_32 && ! use abi_x86_64 && \ + unregister_pluginwrapper +}