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

Collapse All | Expand All

(-)old/xulrunner-1.9.2-r1.ebuild (-3 / +25 lines)
Lines 20-26 Link Here
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
21
SLOT="1.9"
21
SLOT="1.9"
22
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
22
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
23
IUSE="+alsa debug libnotify wifi"
23
IUSE="+alsa debug libnotify oss wifi"
24
24
25
RDEPEND="java? ( >=virtual/jre-1.4 )
25
RDEPEND="java? ( >=virtual/jre-1.4 )
26
	>=dev-lang/python-2.3[threads]
26
	>=dev-lang/python-2.3[threads]
Lines 44-49 Link Here
44
S="${WORKDIR}/mozilla-${MAJ_PV}"
44
S="${WORKDIR}/mozilla-${MAJ_PV}"
45
45
46
pkg_setup() {
46
pkg_setup() {
47
	if use alsa && use oss ; then
48
		ewarn
49
		elog "You have enabled both the \"alsa\" as well as the \"oss\" USE flags. It"
50
		elog "is not possible to build mozilla-firefox or xulrunner with support for"
51
		elog "both. ALSA will be used in this case. If you want OSS support, unset the"
52
		elog "\"alsa\" USE flag and leave only \"oss\" set."
53
	fi
54
47
	java-pkg-opt-2_pkg_setup
55
	java-pkg-opt-2_pkg_setup
48
}
56
}
49
57
Lines 76-81 Link Here
76
			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
84
			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
77
	fi
85
	fi
78
86
87
	# Switch from ALSA to OSS
88
	if use oss && ! use alsa; then
89
		ebegin "Switching from ALSA to Open Sound System"
90
		sed -i 's/sydney_audio_alsa/sydney_audio_oss/' \
91
			media/libsydneyaudio/src/Makefile.in || die "sed failed!" \
92
		&& sed -i '/alsa\//d' config/system-headers || die "sed failed!" \
93
		&& sed -i '/alsa\//d' \
94
			js/src/config/system-headers || die "sed failed!" \
95
		&& sed -i '/LIB(asound/d' configure.in || die "sed failed!"
96
		eend $?
97
	fi
98
79
	eautoreconf
99
	eautoreconf
80
100
81
	cd js/src
101
	cd js/src
Lines 137-144 Link Here
137
	mozconfig_use_enable libnotify
157
	mozconfig_use_enable libnotify
138
	mozconfig_use_enable java javaxpcom
158
	mozconfig_use_enable java javaxpcom
139
	mozconfig_use_enable wifi necko-wifi
159
	mozconfig_use_enable wifi necko-wifi
140
	mozconfig_use_enable alsa ogg
160
	if use alsa || use oss ; then
141
	mozconfig_use_enable alsa wave
161
		mozconfig_annotate '' --enable-ogg
162
		mozconfig_annotate '' --enable-wave
163
	fi
142
164
143
	# Debug
165
	# Debug
144
	if use debug ; then
166
	if use debug ; then

Return to bug 303105