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

Collapse All | Expand All

(-)/usr/portage/www-client/mozilla-firefox/mozilla-firefox-3.0.10.ebuild (-5 / +12 lines)
Lines 18-30 Link Here
18
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
18
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
19
SLOT="0"
19
SLOT="0"
20
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
20
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
21
IUSE="java mozdevelop bindist restrict-javascript iceweasel +xulrunner"
21
IUSE="java mozdevelop bindist restrict-javascript iceweasel +xulrunner swiftweasel"
22
22
23
SRC_URI="mirror://gentoo/${P}.tar.bz2
23
SRC_URI="mirror://gentoo/${P}.tar.bz2
24
	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
24
	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
25
	mirror://gentoo/${PATCH}.tar.bz2
25
	mirror://gentoo/${PATCH}.tar.bz2
26
	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
26
	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
27
	iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.tar.bz2 )
27
	iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.tar.bz2 )
28
	swiftweasel? ( http://switch.dl.sourceforge.net/sourceforge/swiftweasel/swiftweasel-3.0.10_source.tar.gz )
28
	!xulrunner? ( mirror://gentoo/xulrunner-1.9${MY_PV}.tar.bz2 )"
29
	!xulrunner? ( mirror://gentoo/xulrunner-1.9${MY_PV}.tar.bz2 )"
29
30
30
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
31
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
Lines 92-98 Link Here
92
}
93
}
93
94
94
pkg_setup(){
95
pkg_setup(){
95
	if ! use bindist && ! use iceweasel; then
96
	if ! use bindist && ! use iceweasel && ! use swiftweasel; then
96
		elog "You are enabling official branding. You may not redistribute this build"
97
		elog "You are enabling official branding. You may not redistribute this build"
97
		elog "to any users on your network or the internet. Doing so puts yourself into"
98
		elog "to any users on your network or the internet. Doing so puts yourself into"
98
		elog "a legal problem with Mozilla Foundation"
99
		elog "a legal problem with Mozilla Foundation"
Lines 111-116 Link Here
111
		cp -r iceweaselicons/browser mozilla/
112
		cp -r iceweaselicons/browser mozilla/
112
	fi
113
	fi
113
114
115
	if use swiftweasel; then
116
		unpack swiftweasel-3.0.10_source.tar.gz
117
		cp -r Source/Swiftwease\ Graphics/* mozilla/
118
		EPATCH_SOURCE="${PWD}" epatch Source/sw3010.patch	# FIXME
119
	fi
120
114
	linguas
121
	linguas
115
	for X in ${linguas}; do
122
	for X in ${linguas}; do
116
		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
123
		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
Lines 181-189 Link Here
181
		mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9
188
		mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9
182
	fi
189
	fi
183
190
184
	if ! use bindist && ! use iceweasel; then
191
	if ! use bindist && ! use iceweasel && ! use swiftweasel; then
185
		mozconfig_annotate '' --enable-official-branding
192
		mozconfig_annotate '' --enable-official-branding
186
	elif use bindist && ! use iceweasel; then
193
	elif use bindist && ! use iceweasel && ! use swiftweasel; then
187
		mozconfig_annotate 'bindist' --with-branding=browser/branding/unofficial
194
		mozconfig_annotate 'bindist' --with-branding=browser/branding/unofficial
188
	fi
195
	fi
189
196
Lines 246-252 Link Here
246
		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
253
		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
247
		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
254
		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
248
			mozilla-firefox-3.0.desktop
255
			mozilla-firefox-3.0.desktop
249
	elif ! use bindist; then
256
	elif ! use bindist && ! use swiftweasel; then
250
		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
257
		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
251
		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
258
		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
252
			mozilla-firefox-3.0.desktop
259
			mozilla-firefox-3.0.desktop

Return to bug 271406