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

MOZILLA_LIBDIR in future launcher stubs)
(Portage version: 2.0.51.22-r1)

5 files changed, 48 insertions, 6 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/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() {