Use versioned multilib patch (which won't be necessary at all with

MOZILLA_LIBDIR in future launcher stubs)
Package-Manager: portage-2.0.51.22-r1

6 files changed, 56 insertions, 13 deletions

diff --git a/www-client/mozilla-launcher/ChangeLog b/www-client/mozilla-launcher/ChangeLog
index 8d9b4faa3965..6d9aa097f6da 100644
--- a/www-client/mozilla-launcher/ChangeLog
+++ b/www-client/mozilla-launcher/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2005/06/28 22:09:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.11 2005/06/28 23:30:01 agriffis Exp $
+
+  28 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/mozilla-launcher-1.32-multilib.patch,
+  +files/mozilla-launcher-1.33-multilib.patch,
+  -files/mozilla-launcher-multilib.patch, mozilla-launcher-1.32.ebuild,
+  mozilla-launcher-1.33.ebuild:
+  Use versioned multilib patch (which won't be necessary at all with
+  MOZILLA_LIBDIR in future launcher stubs)
 
 *mozilla-launcher-1.33 (28 Jun 2005)
 
diff --git a/www-client/mozilla-launcher/Manifest b/www-client/mozilla-launcher/Manifest
index 90df514b4bba..4cddc49a9069 100644
--- a/www-client/mozilla-launcher/Manifest
+++ b/www-client/mozilla-launcher/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0bc6972cb4d873e95cc3f91764b440a1 mozilla-launcher-1.33.ebuild 1027
-MD5 20a52c21fc9a735689721a6ebde95270 mozilla-launcher-1.32.ebuild 1017
-MD5 1cca434163f9babc29e588c0d4410f4f ChangeLog 11024
+MD5 743d1a7cd2844f0d0d9595ac1f018d69 mozilla-launcher-1.33.ebuild 1031
+MD5 79893487bed970300e40acb9514ea5aa mozilla-launcher-1.32.ebuild 1022
+MD5 abd08b933098b977a51f4cd183b825af ChangeLog 11385
 MD5 cc0891c820a717f0335919e48e686cbe metadata.xml 222
-MD5 8f9f4a6c55148fcafa405a6abb07a2ef files/mozilla-launcher-multilib.patch 1300
+MD5 af3dfb22fb2ae02478ac397ce3ebd279 files/mozilla-launcher-1.33-multilib.patch 1297
+MD5 8f9f4a6c55148fcafa405a6abb07a2ef files/mozilla-launcher-1.32-multilib.patch 1300
 MD5 70ac948488bf73b6045253bab0ebe76e files/digest-mozilla-launcher-1.32 68
 MD5 9abc83f7f35587a32f39c48ee43cf0e3 files/digest-mozilla-launcher-1.33 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCwcqsBXaUFmZvwyMRAlUkAJ9afZdDpf+gsynT+7J0e3stZkfZWACgrfnH
-SOqZHraRFiAQrYSmNr21vWA=
-=HHCU
+iD8DBQFCwd2DBXaUFmZvwyMRAn54AJ9xaGl/SK3OAgZ9mJ+LOVsTorMlpwCcDeKb
+O2VOU+aPMWxDpVFKu8Eoj6s=
+=AKL9
 -----END PGP SIGNATURE-----
diff --git a/www-client/mozilla-launcher/files/mozilla-launcher-multilib.patch b/www-client/mozilla-launcher/files/mozilla-launcher-1.32-multilib.patch
index e57b85f80414..e57b85f80414 100644
--- a/www-client/mozilla-launcher/files/mozilla-launcher-multilib.patch
+++ b/www-client/mozilla-launcher/files/mozilla-launcher-1.32-multilib.patch
diff --git a/www-client/mozilla-launcher/files/mozilla-launcher-1.33-multilib.patch b/www-client/mozilla-launcher/files/mozilla-launcher-1.33-multilib.patch
new file mode 100644
index 000000000000..ce487d45dcd8
--- /dev/null
+++ b/www-client/mozilla-launcher/files/mozilla-launcher-1.33-multilib.patch
@@ -0,0 +1,35 @@
+--- mozilla-launcher-1.33.multilib	2005-06-28 19:25:05.000000000 -0400
++++ mozilla-launcher-1.33	2005-06-28 19:25:55.000000000 -0400
+@@ -135,28 +135,28 @@
+   # just drops through for binary-based browsers.
+   case $zero in
+     *fox)
+-      : ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaFirefox"}
++      : ${MOZILLA_FIVE_HOME:="/usr/lib64/MozillaFirefox"}
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+       mozbin=$MOZILLA_FIVE_HOME/firefox-bin
+       grepfor=Firefox-bin
+       ;;
+ 
+     *mozilla)
+-      : ${MOZILLA_FIVE_HOME:="/usr/lib/mozilla"}
++      : ${MOZILLA_FIVE_HOME:="/usr/lib64/mozilla"}
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+       mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
+       grepfor=Mozilla-bin
+       ;;
+ 
+     *sunbird)
+-      : ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaSunbird"}
++      : ${MOZILLA_FIVE_HOME:="/usr/lib64/MozillaSunbird"}
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+       mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
+       grepfor=Sunbird-bin
+       ;;
+ 
+     *thunderbird)
+-      : ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaThunderbird"}
++      : ${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 221b3db513f9..d27496968600 100644
--- a/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.32.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-launcher/mozilla-launcher-1.32.ebuild,v 1.4 2005/06/28 22:09:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild,v 1.5 2005/06/28 23:30:01 agriffis Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use amd64 && epatch ${FILESDIR}/${PN}-multilib.patch
+	use amd64 && epatch ${FILESDIR}/${PN}-1.32-multilib.patch
 }
 
 src_install() {
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.33.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.33.ebuild
index 22fff87b4357..5995d9ca9d7d 100644
--- a/www-client/mozilla-launcher/mozilla-launcher-1.33.ebuild
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.33.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-launcher/mozilla-launcher-1.33.ebuild,v 1.1 2005/06/28 22:09:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.33.ebuild,v 1.2 2005/06/28 23:30:01 agriffis Exp $
 
 inherit eutils
 
@@ -22,8 +22,7 @@ S=${WORKDIR}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
-	use amd64 && epatch ${FILESDIR}/${PN}-multilib.patch
+	use amd64 && epatch ${FILESDIR}/${PN}-1.33-multilib.patch
 }
 
 src_install() {