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

Collapse All | Expand All

(-)/usr/portage/www-client/mozilla/mozilla-1.7.11.ebuild (-3 / +10 lines)
Lines 1-6 Link Here
1
# Copyright 1999-2005 Gentoo Foundation
1
# Copyright 1999-2005 Gentoo Foundation
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
# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.11.ebuild,v 1.10 2005/08/11 21:19:20 killerfox Exp $
3
# $Header: $
4
4
5
unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
5
unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
6
inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
6
inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
Lines 24-30 Link Here
24
	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
24
	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
25
	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
25
	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
26
26
27
KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
27
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
28
SLOT="0"
28
SLOT="0"
29
LICENSE="MPL-1.1 NPL-1.1"
29
LICENSE="MPL-1.1 NPL-1.1"
30
IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
30
IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
Lines 141-146 Link Here
141
	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
141
	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
142
	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
142
	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
143
143
144
	#rpath patch
145
	epatch ${FILESDIR}/mozilla-firefox-rpath-1.patch
146
144
	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
147
	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
145
}
148
}
146
149
Lines 148-153 Link Here
148
	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
151
	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
149
	declare x
152
	declare x
150
153
154
	grep -Flr "#RPATH_FIXER" --include=*.mk . | xargs sed -i -e \
155
		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|'
151
	####################################
156
	####################################
152
	#
157
	#
153
	# mozconfig, CFLAGS and CXXFLAGS setup
158
	# mozconfig, CFLAGS and CXXFLAGS setup
Lines 329-338 Link Here
329
	doexe ${S}/build/unix/mozilla-config
334
	doexe ${S}/build/unix/mozilla-config
330
335
331
	# Fix pkgconfig files and install them
336
	# Fix pkgconfig files and install them
337
	sed -i -e "s|-L/usr/lib/mozilla-${PV}|-L\$\{libdir\}|" mozilla-nspr.pc
332
	insinto /usr/$(get_libdir)/pkgconfig
338
	insinto /usr/$(get_libdir)/pkgconfig
333
	for x in ${S}/build/unix/*.pc; do
339
	for x in ${S}/build/unix/*.pc; do
334
		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
340
		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
335
			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
341
			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
342
			s|\(^Libs: -L.*\)\($\)|\1 -Wl,-R\$\{libdir\}\2|" ${x}
336
		doins ${x}
343
		doins ${x}
337
	done
344
	done
338
345

Return to bug 100597