Repair installation to actually work. Now that we're using the firefox-style

installation method, we can drop the raw installation target patch.  Revert to
using mozilla-rebuild-databases.pl since mozilla doesn't support -register like
firefox and thunderbird.  Oh well.
Package-Manager: portage-2.0.51.22-r2

4 files changed, 54 insertions, 19 deletions

diff --git a/www-client/mozilla/ChangeLog b/www-client/mozilla/ChangeLog
index ac135e38f64d..109870adaccb 100644
--- a/www-client/mozilla/ChangeLog
+++ b/www-client/mozilla/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/mozilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.42 2005/07/22 00:05:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.43 2005/07/22 16:15:04 agriffis Exp $
+
+*mozilla-1.7.10-r1 (22 Jul 2005)
+
+  22 Jul 2005; Aron Griffis <agriffis@gentoo.org> -mozilla-1.7.10.ebuild,
+  +mozilla-1.7.10-r1.ebuild:
+  Repair installation to actually work.  Now that we're using the firefox-style
+  installation method, we can drop the raw installation target patch.  Revert to
+  using mozilla-rebuild-databases.pl since mozilla doesn't support -register like
+  firefox and thunderbird.  Oh well.
 
   22 Jul 2005; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.10.ebuild:
   Sync major changes from firefox and thunderbird ebuilds, including new
diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest
index f69451533a3a..edc0cb32166a 100644
--- a/www-client/mozilla/Manifest
+++ b/www-client/mozilla/Manifest
@@ -1,9 +1,9 @@
 MD5 12b8ce8242ac4a90d28d0dcd6040a605 mozilla-1.7.8.ebuild 11769
-MD5 3f2f599819e2149a554fd755ce65a3ee mozilla-1.7.10.ebuild 11906
 MD5 2629a6429172f0f52ed0aaca1e0d7051 mozilla-1.7.7.ebuild 11699
 MD5 9a1d1ff8920e1e63f730c07062aaddd0 mozilla-1.7.8-r2.ebuild 12360
+MD5 7afcd37424265e29f0267bd3e44e878e mozilla-1.7.10-r1.ebuild 12676
 MD5 4ea3d1895061904b61b76550541c64b0 mozilla-1.7.7-r2.ebuild 11778
-MD5 2c4488561fbbeee8f0d912c7944c4b12 ChangeLog 45927
+MD5 585c9bc3c7dd34973b29e4dfc2db564a ChangeLog 46345
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 31adb1c8bd099f61d5c68f7e6e446440 mozilla-1.7.8-r1.ebuild 12236
 MD5 dda9d34fd8970334058d801c524a027c files/digest-mozilla-1.7.7 203
@@ -12,7 +12,6 @@ MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
-MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10 432
 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
@@ -20,6 +19,7 @@ MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
 MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432
 MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
 MD5 dda9d34fd8970334058d801c524a027c files/digest-mozilla-1.7.7-r2 203
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.10 b/www-client/mozilla/files/digest-mozilla-1.7.10-r1
index b49f2bcdeb88..b49f2bcdeb88 100644
--- a/www-client/mozilla/files/digest-mozilla-1.7.10
+++ b/www-client/mozilla/files/digest-mozilla-1.7.10-r1
diff --git a/www-client/mozilla/mozilla-1.7.10.ebuild b/www-client/mozilla/mozilla-1.7.10-r1.ebuild
index 304e215aa74a..94d6efa571e0 100644
--- a/www-client/mozilla/mozilla-1.7.10.ebuild
+++ b/www-client/mozilla/mozilla-1.7.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.10.ebuild,v 1.2 2005/07/22 00:05:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.10-r1.ebuild,v 1.1 2005/07/22 16:15:04 agriffis Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
@@ -115,10 +115,6 @@ src_unpack() {
 	# Fix stack growth logic
 	epatch ${FILESDIR}/${PN}-stackgrowth.patch
 
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
-
 	# patch out ft caching code since the API changed between releases of
 	# freetype; this enables freetype-2.1.8+ compat.
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
@@ -259,10 +255,8 @@ src_install() {
 	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
 
 	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME%%/*}
-	cd ${S}/xpinstall/packager
-	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed"
-	mv -f ${S}/dist/mozilla ${D}${MOZILLA_FIVE_HOME}
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
 
 	# Create directory structure to support portage-installed extensions.
 	# See update_chrome() in mozilla-launcher
@@ -349,6 +343,10 @@ src_install() {
 	doins ${FILESDIR}/10mozilla
 	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10mozilla
 
+	# Install rebuild script since mozilla-bin doesn't support registration yet
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+
 	# Install docs
 	dodoc LEGAL LICENSE
 
@@ -357,12 +355,29 @@ src_install() {
 	doins ${FILESDIR}/google.src
 }
 
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Remove entire installed instance to solve various problems,
+	# for example see bug 27719
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
 pkg_postinst() {
 	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
 
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-		/usr/libexec/mozilla-launcher -register
+#	Unfortunately this doesn't work for mozilla ... maybe seamonkey will fix
+#	it!
+#
+#	# Update the component registry
+#	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
+#		/usr/libexec/mozilla-launcher -register
+
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	umask 022
+	MOZILLA_FIVE_HOME=${ROOT}${MOZILLA_FIVE_HOME} \
+		${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
 
 	# This should be called in the postinst and postrm of all the
 	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
@@ -373,9 +388,20 @@ pkg_postinst() {
 pkg_postrm() {
 	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
 
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-		/usr/libexec/mozilla-launcher -register
+#	Unfortunately this doesn't work for mozilla ... maybe seamonkey will fix
+#	it!
+#
+#	# Update the component registry
+#	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
+#		/usr/libexec/mozilla-launcher -register
+
+	# Register Components and Chrome
+	if [[ -x ${ROOT}${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
+		einfo "Registering Components and Chrome..."
+		umask 022
+		MOZILLA_FIVE_HOME=${ROOT}${MOZILLA_FIVE_HOME} \
+			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+	fi
 
 	update_mozilla_launcher_symlinks
 }