# ChangeLog for www-plugins/adobe-flash
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.110 2011/11/28 15:54:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.111 2011/11/28 16:27:00 lack Exp $
+
+ 28 Nov 2011; Jim Ramsay <jim_ramsay@gentoo.org>
+ -adobe-flash-10.3.183.7.ebuild, adobe-flash-10.3.183.10.ebuild,
+ adobe-flash-11.1.102.55.ebuild:
+ Bug #390405: Adjusting new SRC_URI. Also changing 11.1 to drop the rpm in
+ favour of .tar.gz distribution, and cleaning up an old version.
*adobe-flash-11.1.102.55 (28 Nov 2011)
AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a
DIST adobe-flash-11.0.1.152.i386.tar.gz 6742944 RMD160 453259b677d5a799d0443ae81d0cf07e8e3bc147 SHA1 051f7974e4152a225e18c963f638e71090ec20ea SHA256 3532ee49eda0845597084a805e11985f9fd9c5f7b5b72f592ceb18529da918c1
DIST adobe-flash-11.0.1.152.x86_64.tar.gz 7042512 RMD160 9dad755ef66d2c7784f92a33e4d9aa3345ab30ea SHA1 d081c36e2a25ab2da9be6e54d9121808af5679e7 SHA256 5756a4ac9811e0362da2b0c208a458b417883e9f9c3773c70e61c935609b64dc
-DIST adobe-flash-11.1.102.55.i386.rpm 6733489 RMD160 6279dd624579a0eaaeabe66fe976b6b580728fe8 SHA1 6e837e30e8bac2b02738476179d6b4c67e49919d SHA256 902aeffae418676edf1c417a663db37f3b7fb65ffddf1ad5c6af7f27bde04178
-DIST adobe-flash-11.1.102.55.x86_64.rpm 7035287 RMD160 253961386b60cc66373d3607b9c6f1c2ac513b0e SHA1 7ac28b2a68b36323f73ddc0b3f7e0623d31eebf6 SHA256 6483d4842a3fdb05f3666d06a7c151646d60c4b6dd5f9205e1ea9fa18ebdf511
+DIST adobe-flash-11.1.102.55.i386.tar.gz 6748255 RMD160 48030f8c4c091dcab81a6e8778fed83c8b885a35 SHA1 dd5e52e32fda58c1ff155899c56cf7c08a2f782f SHA256 678e2270cb12821b3685af22428e1122b2d130bc8f12ecc714d3636a00b5ed23
+DIST adobe-flash-11.1.102.55.x86_64.tar.gz 7043207 RMD160 a7a6d880e167d0df0905a7fdd4729858935f6ec7 SHA1 5fd769d2b5ff166757480b50f55ca40bf2540122 SHA256 345818f97e4d2e974a70d7f5bcd6a0131304f8ec2ef91eed1de2931376a35c27
DIST flash-plugin-10.3.183.10-release.i386.rpm 5450351 RMD160 e84e71ba5fc88ac2c3557b7848c3bf2f988a890d SHA1 98f159698fa1a5a85b8d5210ad551da5ba5d9af7 SHA256 9969a0ebb53d42f195785aee2253d58cbd7960be861f3f981293f5ebcb4a0a70
-DIST flash-plugin-10.3.183.7-release.i386.rpm 5450066 RMD160 914484cb463eae2c0fb81237be77a695bd36e1b1 SHA1 7ad5f80e8d2a94773645948d54d5350c4745f9c4 SHA256 5cc902ceb437dcf81402f749f5e3ed0bed66cf68358699c7a9de256ee28f5789
-EBUILD adobe-flash-10.3.183.10.ebuild 3829 RMD160 1ace45fe7d355f78df08147fe88fbbb003adfe90 SHA1 2915fa055a176bb240ad1148911a8c602de59bf5 SHA256 d419ebb59106ce25f6c49987c77f2fed59eb170297b83221c052205d70765c62
-EBUILD adobe-flash-10.3.183.7.ebuild 3829 RMD160 2ded4b2755a57d0d7e9feebd177b61d7da786ba2 SHA1 176c90a878cba6094756ad07672549602de59f26 SHA256 d81ba600d8b37cb637c086cf12c65ae35e61eb3aad44d606ba6f67013524b4f0
+EBUILD adobe-flash-10.3.183.10.ebuild 3827 RMD160 b734c9451f147b9dc493497027a5d3af19a326f7 SHA1 bfb026c3c7cf5236ce978c0a0c5b2aa3c508f2df SHA256 a7b3943889d5d26437764a10d2deb45c4b5ecd806c327de68b31462fc65c4054
EBUILD adobe-flash-11.0.1.152.ebuild 6878 RMD160 2fc2fe5ed46ee3d64b3ce80e593c46b487333c55 SHA1 dba6bed0907b94d0a7a8b150e9ac4afd7fe743e6 SHA256 3c74883d64be05cecbbfb4ebf0195f7793725b61424cfd73d0f5e6eadbc27e8f
-EBUILD adobe-flash-11.1.102.55.ebuild 7304 RMD160 63742bea31c7bc39bff8a3454fc1800e706bebe5 SHA1 f338dc486178c0349003a0f2f8e466a26131ffb5 SHA256 6d68477fa23d42f4d90d76e64580906dcaafbfb342f9d160856c048825b77207
-MISC ChangeLog 38914 RMD160 5a53d19f990fbed27d77b432a6c0d6f3b5163874 SHA1 ce9bdf7e34eb6631bd1cb233dcaa054d63b87655 SHA256 811983e27ec211954d950b27d08ba1ce9bd9a8966343378ea68c31c97f17fcbb
+EBUILD adobe-flash-11.1.102.55.ebuild 7261 RMD160 a2ed4c0d392feb4dbb4b65f6113ac75c51ca0759 SHA1 1935db7f6c9379e660c883157444f6d8d340f329 SHA256 508896159314b1119a4837aaae4a662431c153ea9b222fa647f346a6f2596037
+MISC ChangeLog 39207 RMD160 104fa8f315bb7f69231514061051b4a0db331ed0 SHA1 b6a7edd8773a6315dd777cfd10d23593403cc7ee SHA256 6a0827222fbfa2087c814e7753ea01860b7994d12ea4df900f712b333e4cee09
MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJO067IAAoJEA8o5SF9Rr6q3AMQAJNGVVdDOxk+OpiUnTpFJ8sN
-Mf00E4F0oEZD2InTL7HNxvrP9mhQHSq5lX+mm3QD4kE78LDXrNdztMU6xDdhKyEL
-uHorzNPjBDInv/hF5a+g0ZHl/QBIXz7etaeQy0bGoZ7Sip/qNNS/sbCunsx2fGHK
-j95/6RtN9uWN0WAmvZezhWiYbonNLj1NUEkeZPZ10040bV5YFroK1fshJSJnb/+i
-rfiyZP8PYuWRcCOj3Yz6XVQiNKbSmTCDn28YZJFKwtk+J5eTmGItYPNaXiOm6dQ7
-QVeopx7ozvahfp59pXWYZO+CBmjv2/kBZI1dhz009USPAW8cfAJH9XoN49v6Z6UU
-KN7Z6aj/Ho3c8/I3kB5xpHK5wVXaj+8JdkMxrLg40b2hhzYPkJeEZUQu6u9nFb+a
-Rm6fCT/9JageyLg9NnGOoM1okeBWsAk3+SAW0XM29k/bJZoy0LfHdIp/5WTS55t3
-UkKXCDZXLHXlwmMppFBSttogFQeRLL/Kg6O/BS2Kf6HWuehMjzjBnor0Wg/ao9Lb
-Vt3vk9ll0VJrZc2Xm/cwsJgnvLNUysgIs4IyMuERk4nvXtZiF5wnSBdXWiYDE9HD
-Zl4UeOHA2hh345lEJ8WHXp0qU9aMB3u6d9TAiajOBqOrr4AYJ3Cf2GX2AY2F7CtI
-sB8tNCgrx9qDYyY4etXI
-=cqqd
+iQIcBAEBAgAGBQJO07ZfAAoJEA8o5SF9Rr6qB1kP/1wUqP9XoAN76lUye/FBrAqr
+1zVVyYyMp6mA19Cn6LFs1yKipXPP13PhRZvV2gg2Kw3XBrylYD8zM8Cy22V7ODXd
+qNp9k/8vofV7s4AeJFsmb0OKWSAAv8XOki6mgS5Mi8RkLf6rE9qxzNP0eKGLmZCs
+t92Dz1Ev2WV7i+ntL6dXogDQgC4ukgxJSxDuSOEGKkxQwiM8ZFJ5pMwHa+uDpK+z
+ec1hgOLihOcB7dHx90hWksFjBKb2CKL2mAb6MmEsfKD654f5/+nMs1D9LSrOtzbx
+NQyGBvCvPzgptLtkT8JT+YoVLkext6hsYcMWCuJ2pve+MNXh0719ZLy7+nLxOmYH
+YDNL6lRW1Lcl4yLniBnC55m3xGr07TDxt+d5IIMs3Id33M8WS12pEdKZkzHqPrTc
+JungMUhYtrlqn2fFnHJ77BstmL7Hvk4q0ZraraFmw1egOKbfaeTf8hKzPhDEyTq1
+26lPFJYrg3axwOXlCRBIVNnjt0NfouflTdqE3i21PbswazYiS1+iJXCZo+U+VIOk
+FXmDiCzFHxgaictrjfDIeDOD01qg9JZijI4r3s2fJn0c/JCoxfpMbPKnr9b3M1Jl
+8pFn6OF5L2w9CqqM5NCxTE8AgNpixGyjh16FA0BhxiUhvCjZDSn4DP9y79SNyWfq
+VLy9XHeW7iaIlt1HlOtz
+=gac/
-----END PGP SIGNATURE-----
# Copyright 1999-2011 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.10.ebuild,v 1.3 2011/09/25 14:41:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.10.ebuild,v 1.4 2011/11/28 16:27:00 lack Exp $
EAPI=4
inherit nsplugins rpm multilib toolchain-funcs
-MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/flash-plugin-${PV}-release.i386.rpm"
DESCRIPTION="Adobe Flash Player"
SRC_URI="${MY_32B_URI}"
+++ /dev/null
-# Copyright 1999-2011 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.7.ebuild,v 1.1 2011/09/02 15:11:07 scarabeus Exp $
-
-EAPI=4
-inherit nsplugins rpm multilib toolchain-funcs
-
-MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
-
-DESCRIPTION="Adobe Flash Player"
-SRC_URI="${MY_32B_URI}"
-HOMEPAGE="http://www.adobe.com/flashplayer"
-IUSE="vdpau kde"
-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? ( >=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 )"
-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 usr/lib/flash-plugin/libflashplayer.so
- doexe usr/lib/flash-plugin/homecleanup
- 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
- elog "Done with icons."
- 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
-
- dodoc "usr/lib/flash-plugin/README"
- dodoc "usr/share/doc/flash-plugin-${PV}/readme.txt"
-
- 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
-
- ewarn "Flash player is closed-source, with a long history of security"
- ewarn "issues. Please consider only running flash applets you know to"
- ewarn "be safe. The 'flashblock' extension may help for mozilla users:"
- ewarn " https://addons.mozilla.org/en-US/firefox/addon/433"
-}
# Copyright 1999-2011 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.1.102.55.ebuild,v 1.1 2011/11/28 15:54:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild,v 1.2 2011/11/28 16:27:00 lack Exp $
EAPI=4
-inherit nsplugins multilib toolchain-funcs versionator rpm
+inherit nsplugins multilib toolchain-funcs versionator
-MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/flash-plugin-${PV}-release.i386.rpm -> ${P}.i386.rpm"
-MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/flash-plugin-${PV}-release.x86_64.rpm -> ${P}.x86_64.rpm"
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${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} )
local my_32b_src=${MY_32B_URI##*>}
local my_64b_src=${MY_64B_URI##*>}
if [[ $native_install ]]; then
- rpm_unpack $my_64b_src
+ unpack $my_64b_src
fi
mkdir 32bit
pushd 32bit >/dev/null
- rpm_unpack $my_32b_src
+ unpack $my_32b_src
popd >/dev/null
else
- rpm_src_unpack
+ default_src_unpack
fi
}
src_install() {
if [[ $native_install ]]; then
if use x86; then
- local RPMLIB="lib"
+ local PKGLIB=lib
else
- local RPMLIB="lib64"
+ local PKGLIB=lib64
fi
local BASE=${INSTALL_BASE}
# The plugin itself
exeinto /${BASE}/flash-plugin
- doexe usr/${RPMLIB}/flash-plugin/libflashplayer.so
+ doexe libflashplayer.so
inst_plugin /${BASE}/flash-plugin/libflashplayer.so
- # Also install the 'homecleanup' script:
- doexe usr/${RPMLIB}/flash-plugin/homecleanup
-
# The optional KDE4 KCM plugin
if use kde; then
- exeinto /${BASE}/kde4/
- doexe usr/${RPMLIB}/kde4/kcm_adobe_flash_player.so
+ 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
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
-
- # Documentation:
- dodoc usr/${RPMLIB}/flash-plugin/README
fi
if [[ $need_lahf_wrapper ]]; then
# 32b plugin
pushd "${S}/32bit"
exeinto /${INSTALL_BASE}32
- doexe usr/lib/flash-plugin/libflashplayer.so
+ doexe libflashplayer.so
inst_plugin /${INSTALL_BASE}32/libflashplayer.so
popd
projects / gentoo.git / commitdiff