Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/
Date: Tue, 06 Feb 2018 11:15:13
Message-Id: 1517915700.87db1da806377c7ea06df9d128eb8fef2c26e31a.jer@gentoo
1 commit: 87db1da806377c7ea06df9d128eb8fef2c26e31a
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 6 11:15:00 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 6 11:15:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87db1da8
7
8 www-plugins/adobe-flash: Old.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 www-plugins/adobe-flash/Manifest | 4 -
13 .../adobe-flash/adobe-flash-28.0.0.137.ebuild | 140 ---------------------
14 2 files changed, 144 deletions(-)
15
16 diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
17 index a42979a5748..421e9e438a6 100644
18 --- a/www-plugins/adobe-flash/Manifest
19 +++ b/www-plugins/adobe-flash/Manifest
20 @@ -1,7 +1,3 @@
21 -DIST adobe-flash-28.0.0.137-npapi.i386.tar.gz 8511300 BLAKE2B e1396927c13af726ec083402ec77f20ac40abe05ca868005f82156da0c3aef40651ccb3d1431f127e3cd4fa4669e809ef5e61a3989bea4597630c7197eae8e0d SHA512 37d5664096876adfe70d008277e0cb1bacf1264f8ca8270e4e775b17bcf7e032dcf5f4a0b13f77b6fd30184d07b3460698db48fd28a92f6820d702cab9891ae8
22 -DIST adobe-flash-28.0.0.137-npapi.x86_64.tar.gz 9027156 BLAKE2B 136f75ec96466c60895e38d8a4b36cab7f872d110459daac104d90384384c65ce05656ba01218d456917fd2fff2cb710a03b2374bd2d75c65a8e85cc37a24013 SHA512 07d0284296e4f6dbd8a7351da968cfdb4dff1885a997735b8e97f8c7a87c892241758cba376cd3b1ea059d26818111790fe1d3d665c4babaaeb7ae645a990a15
23 -DIST adobe-flash-28.0.0.137-ppapi.i386.tar.gz 8547088 BLAKE2B 8b5964935b752e26809e35b44d87ce613a951714019ca9d9902c64fa22f0cf057bd57ed57b5ce56c8b16e1ab859401425c21c85c06c123ba6f23f65bec46fc01 SHA512 f5d9d344c4f6522f35dbcefbd786f6dabd701346688f4858a9feb3b683cfa79342c0f5f62c08cb53870278f717a405803186bba49c1091f5a23fe86b9bcf43b1
24 -DIST adobe-flash-28.0.0.137-ppapi.x86_64.tar.gz 9463126 BLAKE2B 9fa28932aeaa4050282e202cb14adb83fc51d89ce1a36d5f7aa6b490069ad76827726ab0574580c351fe8f4ea755839c1549d94f4ffc3ca4663c3be9567eeb07 SHA512 9087b9197e0eeb8d71401246c7dd30bff9a571ce1bb07e30d99bda493b2da765a6929d13ec66a7e7ffb8614c58fcc2ed6556ed555c93adbeaa6e388e8d54e427
25 DIST adobe-flash-28.0.0.161-npapi.i386.tar.gz 8513055 BLAKE2B fd016ff576f9da47abe9f9dac1a4397ba14713a136fae27d50b62751e460228a13b380386b97199ad386d76ef22bbf228ca67066ea610c3013ebc51c354e34a1 SHA512 f3bd5d31528eb412c29b0cf225da66c77d4e3626185be200741e7c6956f6b125a21dca2bc50252cd2d9f888dbf0d3b3634290076ab82dfa5d619f293fe1ed95a
26 DIST adobe-flash-28.0.0.161-npapi.x86_64.tar.gz 9031862 BLAKE2B 5978479338450a6ff6df3415698da357a216e39f84c48a83e4544007846590c962a852c9e2c869b5603045c04e64e82ff39cb240b9361652f2a2932b6644a5da SHA512 1ee0eddc64bcd0456836296709e64dad29dd8f89589b1f7f9d685b52cdb2896ac6b4a11274362afec87732d9bd101d1e6927083515ad7243a64672a95cab3423
27 DIST adobe-flash-28.0.0.161-ppapi.i386.tar.gz 8548252 BLAKE2B e8701fa13e014a1ef95acea828bb698c70357129f41d137013994535401d35ef1bb84da9128e8b8f045b272ec1e06837b7d2fb14fdd8d25f674a6694062fcf1e SHA512 5c3bdb3111d17e3b444ea6fd8a8a20aa764388c00d09964d90a770a523d655c85d0178051483dd31c1ae26b408327a43aae02c24569c1dad7d21eb5976c11451
28
29 diff --git a/www-plugins/adobe-flash/adobe-flash-28.0.0.137.ebuild b/www-plugins/adobe-flash/adobe-flash-28.0.0.137.ebuild
30 deleted file mode 100644
31 index c0de0f4b747..00000000000
32 --- a/www-plugins/adobe-flash/adobe-flash-28.0.0.137.ebuild
33 +++ /dev/null
34 @@ -1,140 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -inherit gnome2-utils nsplugins multilib multilib-minimal
40 -
41 -DESCRIPTION="Adobe Flash Player"
42 -HOMEPAGE="
43 - https://www.adobe.com/products/flashplayer.html
44 - https://get.adobe.com/flashplayer/
45 - https://helpx.adobe.com/security/products/flash-player.html
46 -"
47 -
48 -AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc/${PV}"
49 -AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> ${P}-npapi.i386.tar.gz"
50 -AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86_64.tar.gz"
51 -AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
52 -AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
53 -
54 -IUSE="+nsplugin +ppapi"
55 -REQUIRED_USE="
56 - || ( nsplugin ppapi )
57 -"
58 -
59 -SRC_URI="
60 - nsplugin? (
61 - abi_x86_32? ( ${AF_NP_32_URI} )
62 - abi_x86_64? ( ${AF_NP_64_URI} )
63 - )
64 - ppapi? (
65 - abi_x86_32? ( ${AF_PP_32_URI} )
66 - abi_x86_64? ( ${AF_PP_64_URI} )
67 - )
68 -"
69 -SLOT="22"
70 -
71 -KEYWORDS="-* amd64 x86"
72 -LICENSE="AdobeFlash-11.x"
73 -RESTRICT="strip mirror"
74 -
75 -NPAPI_RDEPEND="
76 - dev-libs/atk[${MULTILIB_USEDEP}]
77 - dev-libs/glib:2[${MULTILIB_USEDEP}]
78 - dev-libs/nspr[${MULTILIB_USEDEP}]
79 - dev-libs/nss[${MULTILIB_USEDEP}]
80 - media-libs/fontconfig[${MULTILIB_USEDEP}]
81 - media-libs/freetype[${MULTILIB_USEDEP}]
82 - >=sys-libs/glibc-2.4
83 - x11-libs/cairo[${MULTILIB_USEDEP}]
84 - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
85 - x11-libs/gtk+:2[${MULTILIB_USEDEP}]
86 - x11-libs/libX11[${MULTILIB_USEDEP}]
87 - x11-libs/libXcursor[${MULTILIB_USEDEP}]
88 - x11-libs/libXext[${MULTILIB_USEDEP}]
89 - x11-libs/libXrender[${MULTILIB_USEDEP}]
90 - x11-libs/libXt[${MULTILIB_USEDEP}]
91 - x11-libs/pango[${MULTILIB_USEDEP}]
92 -"
93 -RDEPEND="
94 - !www-plugins/chrome-binary-plugins[flash(-)]
95 - nsplugin? (
96 - ${NPAPI_RDEPEND}
97 - !www-plugins/adobe-flash:0
98 - )
99 -"
100 -
101 -S="${WORKDIR}"
102 -
103 -# Ignore QA warnings in these closed-source binaries, since we can't fix them:
104 -QA_PREBUILT="usr/*"
105 -
106 -src_unpack() {
107 - local files=( ${A} )
108 -
109 - multilib_src_unpack() {
110 - mkdir -p "${BUILD_DIR}" || die
111 - cd "${BUILD_DIR}" || die
112 -
113 - # we need to filter out the other archive(s)
114 - local other_abi
115 - [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
116 - unpack ${files[@]//*${other_abi}*/}
117 - }
118 -
119 - multilib_parallel_foreach_abi multilib_src_unpack
120 -}
121 -
122 -multilib_src_install() {
123 - local pkglibdir=lib
124 - [[ -d usr/lib64 ]] && pkglibdir=lib64
125 -
126 - if use nsplugin; then
127 - # PLUGINS_DIR comes from nsplugins.eclass
128 - exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
129 - doexe libflashplayer.so
130 -
131 - if multilib_is_native_abi; then
132 - # No KDE applet, so allow the GTK utility to show up in KDE:
133 - sed \
134 - -i usr/share/applications/flash-player-properties.desktop \
135 - -e "/^NotShowIn=KDE;/d" || die
136 -
137 - # The userland 'flash-player-properties' standalone app:
138 - dobin usr/bin/flash-player-properties
139 -
140 - # Icon and .desktop for 'flash-player-properties'
141 - insinto /usr/share
142 - doins -r usr/share/{icons,applications}
143 - dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
144 - /usr/share/pixmaps/flash-player-properties.png
145 - fi
146 -
147 - # The magic config file!
148 - insinto "/etc/adobe"
149 - doins "${FILESDIR}/mms.cfg"
150 - fi
151 -
152 - if use ppapi; then
153 - exeinto /usr/$(get_libdir)/chromium/PepperFlash
154 - doexe libpepflashplayer.so
155 - insinto /usr/$(get_libdir)/chromium/PepperFlash
156 - doins manifest.json
157 -
158 - if multilib_is_native_abi; then
159 - dodir /etc/chromium
160 - sed "${FILESDIR}"/pepper-flash-r1 \
161 - -e "s|@FP_LIBDIR@|$(get_libdir)|g" \
162 - -e "s|@FP_PV@|${PV}|g" \
163 - > "${D}"/etc/chromium/pepper-flash \
164 - || die
165 - fi
166 - fi
167 -}
168 -
169 -pkg_postinst() {
170 - gnome2_icon_cache_update
171 -}
172 -pkg_postrm() {
173 - gnome2_icon_cache_update
174 -}