Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 524164 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/net-im/skype/skype-4.3.0.37.ebuild (-5 / +21 lines)
Lines 13-19 Link Here
13
LICENSE="skype-4.0.0.7-copyright skype-4.0.0.7-third-party_attributions.txt"
13
LICENSE="skype-4.0.0.7-copyright skype-4.0.0.7-third-party_attributions.txt"
14
SLOT="0"
14
SLOT="0"
15
KEYWORDS="~amd64 ~x86"
15
KEYWORDS="~amd64 ~x86"
16
IUSE="pax_kernel +pulseaudio selinux"
16
IUSE="apulse pax_kernel +pulseaudio selinux"
17
REQUIRED_USE="apulse? ( !pulseaudio )"
17
18
18
QA_PREBUILT=opt/bin/${PN}
19
QA_PREBUILT=opt/bin/${PN}
19
RESTRICT="mirror bindist strip" #299368
20
RESTRICT="mirror bindist strip" #299368
Lines 30-43 Link Here
30
				dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
31
				dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
31
				dev-qt/qtwebkit:4[abi_x86_32(-)]
32
				dev-qt/qtwebkit:4[abi_x86_32(-)]
32
			)
33
			)
33
			>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
34
			!apulse? (
35
				>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
36
			)
34
		)
37
		)
35
		|| (
38
		|| (
36
			(
39
			(
37
				media-libs/alsa-lib[abi_x86_32(-)]
40
				media-libs/alsa-lib[abi_x86_32(-)]
38
				pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
41
				pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
39
			)
42
			)
40
			>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
43
			!apulse? (
44
				>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
45
			)
41
		)
46
		)
42
		|| (
47
		|| (
43
			(
48
			(
Lines 46-52 Link Here
46
				x11-libs/libXScrnSaver[abi_x86_32(-)]
51
				x11-libs/libXScrnSaver[abi_x86_32(-)]
47
				x11-libs/libXv[abi_x86_32(-)]
52
				x11-libs/libXv[abi_x86_32(-)]
48
			)
53
			)
49
			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
54
			!apulse? (
55
				>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
56
			)
57
		)
58
		apulse? (
59
			media-sound/apulse[abi_x86_32(-)]
50
		)
60
		)
51
	)
61
	)
52
	x86? (
62
	x86? (
Lines 59-64 Link Here
59
		dev-qt/qtdbus:4
69
		dev-qt/qtdbus:4
60
		dev-qt/qtgui:4[accessibility]
70
		dev-qt/qtgui:4[accessibility]
61
		dev-qt/qtwebkit:4
71
		dev-qt/qtwebkit:4
72
		apulse? (
73
			media-sound/apulse
74
		)
62
	)
75
	)
63
	pulseaudio? ( media-sound/pulseaudio )
76
	pulseaudio? ( media-sound/pulseaudio )
64
	selinux? ( sec-policy/selinux-skype )"
77
	selinux? ( sec-policy/selinux-skype )"
Lines 124-133 Link Here
124
		elog "libraries from the media-libs/libv4l package."
137
		elog "libraries from the media-libs/libv4l package."
125
	fi
138
	fi
126
139
127
	if ! use pulseaudio; then
140
	if ! use pulseaudio && ! use apulse; then
128
		ewarn "ALSA support was removed from Skype"
141
		ewarn "ALSA support was removed from Skype"
129
		ewarn "consider installing media-sound/pulseaudio"
142
		ewarn "consider installing media-sound/pulseaudio"
143
		ewarn "or media-sound/apulse for pulseaudio emulation"
130
		ewarn "otherwise sound will not work for you."
144
		ewarn "otherwise sound will not work for you."
145
		ewarn "These packages can be pulled in by setting"
146
		ewarn "appropriate USE flags for net-im/skype."
131
	fi
147
	fi
132
}
148
}
133
149

Return to bug 524164