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

(-)file_not_specified_in_diff (-15 / +21 lines)
Line  Link Here
0
-- adobe-flash-24.0.0.194.ebuild
0
++ adobe-flash-24.0.0.194.ebuild
Lines 18-24 Link Here
18
AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
18
AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
19
AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
19
AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
20
20
21
IUSE="kde +nsplugin +ppapi"
21
IUSE="kde +nsplugin +ppapi +gtk"
22
REQUIRED_USE="
22
REQUIRED_USE="
23
	|| ( nsplugin ppapi )
23
	|| ( nsplugin ppapi )
24
"
24
"
Lines 62-69 Link Here
62
	media-libs/freetype
62
	media-libs/freetype
63
	>=sys-libs/glibc-2.4
63
	>=sys-libs/glibc-2.4
64
	x11-libs/cairo
64
	x11-libs/cairo
65
	x11-libs/gdk-pixbuf
65
	gtk? (
66
	x11-libs/gtk+:2
66
		x11-libs/gdk-pixbuf
67
		x11-libs/gtk+:2
68
	)
67
	x11-libs/libX11
69
	x11-libs/libX11
68
	x11-libs/libXcursor
70
	x11-libs/libXcursor
69
	x11-libs/libXext
71
	x11-libs/libXext
Lines 116-134 Link Here
116
				insinto /usr/share/kde4/services
118
				insinto /usr/share/kde4/services
117
				doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
119
				doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
118
			else
120
			else
119
				# No KDE applet, so allow the GTK utility to show up in KDE:
121
				if use gtk; then
120
				sed -i usr/share/applications/flash-player-properties.desktop \
122
					# No KDE applet, so allow the GTK utility to show up in KDE:
121
					-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
123
					sed -i usr/share/applications/flash-player-properties.desktop \
124
						-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
125
				fi
122
			fi
126
			fi
123
127
124
			# The userland 'flash-player-properties' standalone app:
128
			if use gtk; then
125
			dobin usr/bin/flash-player-properties
129
				# The userland 'flash-player-properties' standalone app:
126
130
				dobin usr/bin/flash-player-properties
127
			# Icon and .desktop for 'flash-player-properties'
131
128
			insinto /usr/share
132
				# Icon and .desktop for 'flash-player-properties'
129
			doins -r usr/share/{icons,applications}
133
				insinto /usr/share
130
			dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
134
				doins -r usr/share/{icons,applications}
131
				/usr/share/pixmaps/flash-player-properties.png
135
				dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
136
					/usr/share/pixmaps/flash-player-properties.png
137
			fi
132
		fi
138
		fi
133
139
134
		# The magic config file!
140
		# The magic config file!

Return to bug 607876