Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 593650
Collapse All | Expand All

(-)file_not_specified_in_diff (-98 / +37 lines)
Line  Link Here
0
-- www-plugins/adobe-flash/adobe-flash-11.2.202.635.ebuild
0
++ www-plugins/adobe-flash/adobe-flash-23.0.0.162_beta.ebuild
Lines 2-35 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
3
# $Id$
4
4
5
EAPI=5
5
EAPI=6
6
inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
6
7
MULTILIB_COMPAT=( abi_x86_{32,64} )
8
9
inherit nsplugins toolchain-funcs multilib-minimal
7
10
8
DESCRIPTION="Adobe Flash Player"
11
DESCRIPTION="Adobe Flash Player"
9
HOMEPAGE="
12
HOMEPAGE="
10
	http://www.adobe.com/products/flashplayer.html
13
	http://www.adobe.com/products/flashplayer.html
11
	http://get.adobe.com/flashplayer/
14
	http://get.adobe.com/flashplayer/
12
	https://helpx.adobe.com/security/products/flash-player.html#version11
15
	https://helpx.adobe.com/security/products/flash-player.html
16
	http://labs.adobe.com/downloads/flashplayer.html
13
"
17
"
14
18
15
AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
19
if [[ ${PV} == *_beta ]]; then
16
AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
20
	AF_URI="https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer"
17
PV_M=$(get_major_version)
21
	AF_32_URI="${AF_URI}/linux32/libflashplayer.so -> ${P}.i386.so"
18
AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
22
	AF_64_URI="${AF_URI}/linux64/libflashplayer.so -> ${P}.x86_64.so"
19
AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
23
else
20
AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
24
	AF_URI="https://fpdownload.macromedia.com/get/flashplayer/pdc"
25
	AF_DB_URI="https://fpdownload.macromedia.com/pub/flashplayer/updaters"
26
	AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV%%.*}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
27
	AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV%%.*}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
28
	AF_32_DB_URI="${AF_DB_URI}/${PV%%.*}/flashplayer_${PV%%.*}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
29
fi
21
30
22
SRC_URI="
31
SRC_URI="
23
	abi_x86_32? (
32
	abi_x86_32? ( ${AF_32_URI} )
24
		!debug? ( ${AF_32_URI} )
25
		debug? ( ${AF_32_DB_URI} )
26
	)
27
	abi_x86_64? ( ${AF_64_URI} )
33
	abi_x86_64? ( ${AF_64_URI} )
28
"
34
"
29
IUSE="debug kde selinux cpu_flags_x86_sse2"
35
IUSE="selinux cpu_flags_x86_sse2"
30
REQUIRED_USE="
36
REQUIRED_USE="
31
	cpu_flags_x86_sse2
37
	cpu_flags_x86_sse2
32
	debug? ( abi_x86_32 )
33
	|| ( abi_x86_64 abi_x86_32 )
38
	|| ( abi_x86_64 abi_x86_32 )
34
"
39
"
35
SLOT="0"
40
SLOT="0"
Lines 40-104 RESTRICT="strip mirror" Link Here
40
45
41
S="${WORKDIR}"
46
S="${WORKDIR}"
42
47
43
NATIVE_DEPS="
44
	dev-libs/atk
45
	dev-libs/glib:2
46
	dev-libs/nspr
47
	dev-libs/nss
48
	kde? (
49
		dev-qt/qtcore:4
50
		dev-qt/qtdbus:4
51
		dev-qt/qtgui:4
52
		dev-qt/qtsvg:4
53
		kde-base/kdelibs
54
		x11-libs/libICE
55
		x11-libs/libSM
56
		x11-libs/libXau
57
		x11-libs/libXdmcp
58
		x11-libs/libXext
59
		x11-libs/libXft
60
		x11-libs/libXpm
61
	)
62
	media-libs/fontconfig
63
	media-libs/freetype
64
	>=sys-libs/glibc-2.4
65
	x11-libs/cairo
66
	x11-libs/gdk-pixbuf
67
	x11-libs/gtk+:2
68
	x11-libs/libX11
69
	x11-libs/libXcursor
70
	x11-libs/libXext
71
	x11-libs/libXrender
72
	x11-libs/libXt
73
	x11-libs/pango
74
"
75
76
DEPEND="
48
DEPEND="
77
	amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
49
	amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
50
	dev-libs/glib:2=[${MULTILIB_USEDEP}]
51
	dev-libs/nspr:0=[${MULTILIB_USEDEP}]
52
	dev-libs/nss:0=[${MULTILIB_USEDEP}]
53
	media-libs/fontconfig:1.0=[${MULTILIB_USEDEP}]
54
	media-libs/freetype:2=[${MULTILIB_USEDEP}]
55
	media-libs/mesa:0=[${MULTILIB_USEDEP}]
56
	x11-libs/gdk-pixbuf:2=[${MULTILIB_USEDEP}]
57
	x11-libs/gtk+:2=[${MULTILIB_USEDEP}]
58
	x11-libs/libX11:0=[${MULTILIB_USEDEP}]
59
	x11-libs/libXt:0=[${MULTILIB_USEDEP}]
60
	x11-libs/pango:0=[${MULTILIB_USEDEP}]
78
"
61
"
79
RDEPEND="
62
RDEPEND="
80
	${DEPEND}
63
	${DEPEND}
81
	abi_x86_64? ( ${NATIVE_DEPS} )
82
	abi_x86_32? (
83
		amd64? (
84
			>=dev-libs/atk-2.10.0[abi_x86_32(-)]
85
			>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
86
			>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
87
			>=dev-libs/nss-3.15.4[abi_x86_32(-)]
88
			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
89
			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
90
			>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
91
			>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
92
			>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
93
			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
94
			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
95
			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
96
			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
97
			>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
98
			>=x11-libs/pango-1.36.3[abi_x86_32(-)]
99
		)
100
		x86? ( ${NATIVE_DEPS} )
101
	)
102
	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
64
	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
103
	selinux? ( sec-policy/selinux-flash )
65
	selinux? ( sec-policy/selinux-flash )
104
"
66
"
Lines 126-134 src_unpack() { Link Here
126
		cd "${BUILD_DIR}" || die
88
		cd "${BUILD_DIR}" || die
127
89
128
		# we need to filter out the other archive(s)
90
		# we need to filter out the other archive(s)
129
		local other_abi
91
		local my_abi
130
		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
92
		[[ ${ABI} == amd64 ]] && my_abi=x86_64 || my_abi=i386
131
		unpack ${files[@]//*${other_abi}*/}
93
		ln -sv "${DISTDIR}"/${P}.${my_abi}.so libflashplayer.so
132
	}
94
	}
133
95
134
	multilib_parallel_foreach_abi multilib_src_unpack
96
	multilib_parallel_foreach_abi multilib_src_unpack
Lines 157-188 multilib_src_install() { Link Here
157
		# emulate the missing lahf instruction affected platforms.
119
		# emulate the missing lahf instruction affected platforms.
158
		doexe flashplugin-lahf-fix.so
120
		doexe flashplugin-lahf-fix.so
159
	fi
121
	fi
122
}
160
123
161
	if multilib_is_native_abi; then
124
multilib_src_install_all() {
162
		if use kde; then
163
			local pkglibdir=lib
164
			[[ -d usr/lib64 ]] && pkglibdir=lib64
165
166
			exeinto /usr/$(get_libdir)/kde4
167
			doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
168
			insinto /usr/share/kde4/services
169
			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
170
		else
171
			# No KDE applet, so allow the GTK utility to show up in KDE:
172
			sed -i usr/share/applications/flash-player-properties.desktop \
173
				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
174
		fi
175
176
		# The userland 'flash-player-properties' standalone app:
177
		dobin usr/bin/flash-player-properties
178
179
		# Icon and .desktop for 'flash-player-properties'
180
		insinto /usr/share
181
		doins -r usr/share/{icons,applications}
182
		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
183
			/usr/share/pixmaps/flash-player-properties.png
184
	fi
185
186
	# The magic config file!
125
	# The magic config file!
187
	insinto "/etc/adobe"
126
	insinto "/etc/adobe"
188
	doins "${FILESDIR}/mms.cfg"
127
	doins "${FILESDIR}/mms.cfg"

Return to bug 593650