Multilib fixes.

Package-Manager: portage-2.0.51.19

3 files changed, 47 insertions, 43 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 97f47180d165..14dd984466a9 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.223 2005/03/03 06:21:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.224 2005/03/05 22:12:59 eradicator Exp $
+
+  05 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  mozilla-1.7.5-r1.ebuild:
+  Multilib fixes.
 
 *mozilla-1.7.5-r1 (03 Mar 2005)
 
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 242f9e86594f..5d1b972fec64 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 624c5197e7d1dc47fb6bdaaaf9537402 ChangeLog 38792
+MD5 709c1c38375b986d381baea8cf48c2a7 ChangeLog 38895
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 fc3386be683494c846857b24140b14a6 mozilla-1.7.5-r1.ebuild 10571
 MD5 8774021d7d80b7f1ba040d7d2a771c57 mozilla-1.7.5.ebuild 10330
+MD5 3b44f8221eee5338136ab551471e2b01 mozilla-1.7.5-r1.ebuild 10890
 MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
-MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5-r1 203
 MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5 203
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
+MD5 278524216669b594ea5b6468a180ed73 files/mozilla-1.7.5-stackgrowth.patch 931
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 5496222980a6faf8261066f43cd4c6a5 files/mozilla-hppa.patch 7785
 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 278524216669b594ea5b6468a180ed73 files/mozilla-1.7.5-stackgrowth.patch 931
+MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5-r1 203
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCJqkiFdQwWVoAgN4RAjAHAJ4nWSQg27NvtDAYQ/BP5j8Vh9BiRgCgq8z1
-fBBrzrKrqCXgZvYPaZPSVos=
-=UXKm
+iD8DBQFCKi73ArHZZzCEUG0RAuRPAJ4kkjX2hxOeGcgXNN/44PQZbUsy9ACcD9Zx
+rL9nOWN6WI6quZItg5Ke6Vw=
+=fmHA
 -----END PGP SIGNATURE-----
diff --git a/net-www/mozilla/mozilla-1.7.5-r1.ebuild b/net-www/mozilla/mozilla-1.7.5-r1.ebuild
index 7b287fd54640..5e6cb7205f01 100644
--- a/net-www/mozilla/mozilla-1.7.5-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.7.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.5-r1.ebuild,v 1.1 2005/03/03 06:21:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.5-r1.ebuild,v 1.2 2005/03/05 22:12:59 eradicator Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit multilib
 
 IUSE="java crypt ssl moznomail postgres"
 
@@ -116,8 +116,8 @@ src_compile() {
 	mozconfig_use_enable ldap ldap-experimental
 	mozconfig_use_enable mozsvg svg
 	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --prefix=/usr/lib/mozilla
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/mozilla
+	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/mozilla
+	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/mozilla
 
 	if use moznomail && ! use mozcalendar; then
 		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
@@ -190,34 +190,34 @@ src_compile() {
 
 src_install() {
 	# Install, don't create tarball
-	dodir /usr/lib
+	dodir /usr/$(get_libdir)
 	cd ${S}/xpinstall/packager
 	einfo "Installing mozilla into build root..."
 	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed"
-	mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla
+	mv -f ${S}/dist/mozilla ${D}/usr/$(get_libdir)/mozilla
 
 	einfo "Installing includes and idl files..."
 	# Copy the include and idl files
-	dodir /usr/lib/mozilla/include/idl /usr/include
+	dodir /usr/$(get_libdir)/mozilla/include/idl /usr/include
 	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/lib/mozilla/include
-	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
-	dosym /usr/lib/mozilla/include /usr/include/mozilla
+	cp -LfR include/* ${D}/usr/$(get_libdir)/mozilla/include
+	cp -LfR idl/* ${D}/usr/$(get_libdir)/mozilla/include/idl
+	dosym /usr/$(get_libdir)/mozilla/include /usr/include/mozilla
 
 	# Install the development tools in /usr
 	dodir /usr/bin
-	mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
+	mv ${D}/usr/$(get_libdir)/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
 
 	# Install the NSS/SSL libs, headers and tools
 	if use ssl; then
 		einfo "Installing Mozilla NSS..."
 		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/lib/mozilla/include/nss
+		insinto /usr/$(get_libdir)/mozilla/include/nss
 		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
 		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
 		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
 		# These come with zlib ...
-		rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h}
+		rm -f ${D}/usr/$(get_libdir)/mozilla/include/nss/{zconf.h,zlib.h}
 
 		cd ${S}/security/nss
 
@@ -228,7 +228,7 @@ src_install() {
 		make install || die "make failed"
 		# Gets installed as symbolic links ...
 		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla
+		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/$(get_libdir)/mozilla
 
 		# Need to unset these incase we want to rebuild, else the build
 		# gets newked.
@@ -240,10 +240,10 @@ src_install() {
 	# Fix mozilla-config and install it
 	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
 	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
-	exeinto /usr/lib/mozilla
+	exeinto /usr/$(get_libdir)/mozilla
 	doexe mozilla-config
 	# Fix pkgconfig files and install them
-	insinto /usr/lib/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
 	for x in *.pc; do
 		if [[ -f ${x} ]]; then
 			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
@@ -260,24 +260,24 @@ src_install() {
 	dodoc LEGAL LICENSE README/mozilla/README*
 
 	# Install rebuild script
-	exeinto /usr/lib/mozilla/
+	exeinto /usr/$(get_libdir)/mozilla/
 	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
 
 	# Move plugins dir
-	src_mv_plugins /usr/lib/mozilla/plugins
+	src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
 
 	# Update Google search plugin to use UTF8 charset ...
-	insinto /usr/lib/mozilla/searchplugins
+	insinto /usr/$(get_libdir)/mozilla/searchplugins
 	doins ${FILESDIR}/google.src
 
 	if [[ -f "${WORKDIR}/.xft" ]]; then
 		# We are using Xft, so change the default font
-		insinto /usr/lib/mozilla/defaults/pref
+		insinto /usr/$(get_libdir)/mozilla/defaults/pref
 		doins ${FILESDIR}/xft.js
 	fi
 
 	# Fix icons to look the same everywhere
-	insinto /usr/lib/mozilla/icons
+	insinto /usr/$(get_libdir)/mozilla/icons
 	doins ${S}/widget/src/gtk/mozicon16.xpm
 	doins ${S}/widget/src/gtk/mozicon50.xpm
 
@@ -290,34 +290,34 @@ src_install() {
 	# Take care of non root execution
 	# (seems the problem is that not all files are readible by the user)
 	einfo "Fixing Permissions..."
-	chmod -R g+r,o+r ${D}/usr/lib/mozilla
-	find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
+	chmod -R g+r,o+r ${D}/usr/$(get_libdir)/mozilla
+	find ${D}/usr/$(get_libdir)/mozilla/ -type d -exec chmod 0755 {} \; || :
 }
 
 pkg_preinst() {
 	# Move old plugins dir
-	pkg_mv_plugins /usr/lib/mozilla/plugins
+	pkg_mv_plugins /usr/$(get_libdir)/mozilla/plugins
 
 	if true; then
 		# Remove entire installed instance to solve various problems,
 		# for example see bug 27719
-		rm -rf ${ROOT}/usr/lib/mozilla
+		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla
 	else
 		# Stale components and chrome files break when unmerging old
-		rm -rf ${ROOT}/usr/lib/mozilla/components
-		rm -rf ${ROOT}/usr/lib/mozilla/chrome
+		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/components
+		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/chrome
 
 		# Remove stale component registry.
-		rm -f ${ROOT}/usr/lib/mozilla/component.reg
-		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/component.reg
+		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/components/compreg.dat
 
 		# Make sure these are removed.
-		rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/lib{Xft,Xrender}.so*
 	fi
 }
 
 pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
 
 	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
@@ -341,8 +341,8 @@ pkg_postinst() {
 
 pkg_postrm() {
 	# Regenerate component.reg in case some things changed
-	if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then
-		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+	if [[ -e ${ROOT}/usr/$(get_libdir)/mozilla/regxpcom ]]; then
+		export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
 
 		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
 			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl