Implement MOZILLA_LIBDIR, part of fix for bug 88802. Make

moz_pis_startstop_scripts work for -bin installations
Package-Manager: portage-2.0.51.22-r1

6 files changed, 38 insertions, 12 deletions

diff --git a/www-client/mozilla-launcher/ChangeLog b/www-client/mozilla-launcher/ChangeLog
index ece6213d7911..8d9b4faa3965 100644
--- a/www-client/mozilla-launcher/ChangeLog
+++ b/www-client/mozilla-launcher/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2005/06/19 15:22:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.10 2005/06/28 22:09:39 agriffis Exp $
+
+*mozilla-launcher-1.33 (28 Jun 2005)
+
+  28 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-launcher-1.30.ebuild, +mozilla-launcher-1.33.ebuild:
+  Implement MOZILLA_LIBDIR, part of fix for bug 88802. Make
+  moz_pis_startstop_scripts work for -bin installations
 
   19 Jun 2005; Simon Stelling <blubb@gentoo.org>
   +files/mozilla-launcher-multilib.patch, mozilla-launcher-1.32.ebuild:
diff --git a/www-client/mozilla-launcher/Manifest b/www-client/mozilla-launcher/Manifest
index 40e04e94f835..90df514b4bba 100644
--- a/www-client/mozilla-launcher/Manifest
+++ b/www-client/mozilla-launcher/Manifest
@@ -1,7 +1,17 @@
-MD5 e91688bb3a59ff1c604d9d70364311dc ChangeLog 10751
+-----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 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
 MD5 8f9f4a6c55148fcafa405a6abb07a2ef files/mozilla-launcher-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
+-----END PGP SIGNATURE-----
diff --git a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.30 b/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.30
deleted file mode 100644
index 854615067c0f..000000000000
--- a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c7cb9fb38c20aa167e9a941fcdbef62 mozilla-launcher-1.30.bz2 5722
diff --git a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.33 b/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.33
new file mode 100644
index 000000000000..f29eda5cd1db
--- /dev/null
+++ b/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.33
@@ -0,0 +1 @@
+MD5 0c3fe2100e61cecd9a8270eb49d493e4 mozilla-launcher-1.33.bz2 5872
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild
index 6d84af9db167..221b3db513f9 100644
--- a/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.32.ebuild
@@ -1,11 +1,11 @@
 # 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.3 2005/06/19 15:22:09 blubb Exp $
+# $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 $
 
 inherit eutils
 
 DESCRIPTION="Script that launches mozilla or firefox"
-HOMEPAGE=""
+HOMEPAGE="http://dev.gentoo.org/~agriffis/dist/"
 SRC_URI="mirror://gentoo/${P}.bz2 \
 		http://dev.gentoo.org/~agriffis/dist/${P}.bz2"
 
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.30.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.33.ebuild
index 53b6780115da..22fff87b4357 100644
--- a/www-client/mozilla-launcher/mozilla-launcher-1.30.ebuild
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.33.ebuild
@@ -1,15 +1,17 @@
 # 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.30.ebuild,v 1.1 2005/03/24 21:07:01 agriffis Exp $
+# $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 $
+
+inherit eutils
 
 DESCRIPTION="Script that launches mozilla or firefox"
-HOMEPAGE=""
+HOMEPAGE="http://dev.gentoo.org/~agriffis/dist/"
 SRC_URI="mirror://gentoo/${P}.bz2 \
 		http://dev.gentoo.org/~agriffis/dist/${P}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
@@ -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