make the package multilib-compliant, bug 93860

Package-Manager: portage-2.0.51.19

4 files changed, 54 insertions, 15 deletions

diff --git a/www-client/mozilla-launcher/ChangeLog b/www-client/mozilla-launcher/ChangeLog
index 6599c6a2b2b0..ece6213d7911 100644
--- a/www-client/mozilla-launcher/ChangeLog
+++ b/www-client/mozilla-launcher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-launcher
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.8 2005/04/18 18:37:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.9 2005/06/19 15:22:09 blubb Exp $
+
+  19 Jun 2005; Simon Stelling <blubb@gentoo.org>
+  +files/mozilla-launcher-multilib.patch, mozilla-launcher-1.32.ebuild:
+  make the package multilib-compliant, bug 93860
 
   18 Apr 2005; Aron Griffis <agriffis@gentoo.org>
   mozilla-launcher-1.32.ebuild:
diff --git a/www-client/mozilla-launcher/Manifest b/www-client/mozilla-launcher/Manifest
index 3972f7645dff..40e04e94f835 100644
--- a/www-client/mozilla-launcher/Manifest
+++ b/www-client/mozilla-launcher/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 310f9d5f886c515d04be27148cae66b8 mozilla-launcher-1.30.ebuild 869
-MD5 311a023d4fabe996d3d2ab0c8a470b2d mozilla-launcher-1.32.ebuild 869
-MD5 07e2580546c732711033ea79f9a0ca68 ChangeLog 10583
+MD5 e91688bb3a59ff1c604d9d70364311dc ChangeLog 10751
 MD5 cc0891c820a717f0335919e48e686cbe metadata.xml 222
+MD5 310f9d5f886c515d04be27148cae66b8 mozilla-launcher-1.30.ebuild 869
+MD5 2d511441a22bd268ce2bf33b28ab57c5 mozilla-launcher-1.32.ebuild 977
 MD5 647e59c9a4e6f883e364a37dc9c9203e files/digest-mozilla-launcher-1.30 68
 MD5 70ac948488bf73b6045253bab0ebe76e files/digest-mozilla-launcher-1.32 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCY/9rBXaUFmZvwyMRAj73AKCeqKCnIFzy1nC0TKKWr92kjchiGACeOO32
-ztXRTVMMTgbnVEyhtaIQ2vE=
-=Voag
------END PGP SIGNATURE-----
+MD5 8f9f4a6c55148fcafa405a6abb07a2ef files/mozilla-launcher-multilib.patch 1300
diff --git a/www-client/mozilla-launcher/files/mozilla-launcher-multilib.patch b/www-client/mozilla-launcher/files/mozilla-launcher-multilib.patch
new file mode 100644
index 000000000000..e57b85f80414
--- /dev/null
+++ b/www-client/mozilla-launcher/files/mozilla-launcher-multilib.patch
@@ -0,0 +1,35 @@
+--- mozilla-launcher-1.32.old	2005-06-19 17:10:38.000000000 +0200
++++ mozilla-launcher-1.32	2005-06-19 17:10:59.000000000 +0200
+@@ -127,28 +127,28 @@
+   # just drops through for binary-based browsers.
+   case $zero in
+     *fox)
+-      export MOZILLA_FIVE_HOME="/usr/lib/MozillaFirefox"
++      export MOZILLA_FIVE_HOME="/usr/lib64/MozillaFirefox"
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+       mozbin=$MOZILLA_FIVE_HOME/firefox-bin
+       grepfor=Firefox-bin
+       ;;
+ 
+     *mozilla)
+-      export MOZILLA_FIVE_HOME="/usr/lib/mozilla"
++      export MOZILLA_FIVE_HOME="/usr/lib64/mozilla"
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+       mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
+       grepfor=Mozilla-bin
+       ;;
+ 
+     *sunbird)
+-      export MOZILLA_FIVE_HOME="/usr/lib/MozillaSunbird"
++      export MOZILLA_FIVE_HOME="/usr/lib64/MozillaSunbird"
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+       mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
+       grepfor=Sunbird-bin
+       ;;
+ 
+     *thunderbird)
+-      export MOZILLA_FIVE_HOME="/usr/lib/MozillaThunderbird"
++      export MOZILLA_FIVE_HOME="/usr/lib64/MozillaThunderbird"
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+       mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin
+       grepfor=Thunderbird-bin
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild
index ff1a2c641630..6d84af9db167 100644
--- a/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild,v 1.2 2005/04/18 18:26:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild,v 1.3 2005/06/19 15:22:09 blubb Exp $
+
+inherit eutils
 
 DESCRIPTION="Script that launches mozilla or firefox"
 HOMEPAGE=""
@@ -17,6 +19,13 @@ RDEPEND=""
 
 S=${WORKDIR}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use amd64 && epatch ${FILESDIR}/${PN}-multilib.patch
+}
+
 src_install() {
 	exeinto /usr/libexec
 	newexe ${P} mozilla-launcher || die