old

(Portage version: 2.1.3.19)

5 files changed, 9 insertions, 154 deletions

diff --git a/www-client/mozilla-launcher/ChangeLog b/www-client/mozilla-launcher/ChangeLog
index cfe31f50d4b9..9e4b06247a9b 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.65 2007/12/18 14:37:21 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.66 2008/01/01 12:26:44 armin76 Exp $
+
+  01 Jan 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/mozilla-launcher-1.35-multilib.patch,
+  -files/mozilla-launcher-1.39-multilib.patch,
+  -files/mozilla-launcher-1.41-multilib.patch,
+  -files/mozilla-launcher-1.52-aoss.patch:
+  old
 
   18 Dec 2007; Raúl Porcel <armin76@gentoo.org>
   -mozilla-launcher-1.49.ebuild, -mozilla-launcher-1.52.ebuild:
diff --git a/www-client/mozilla-launcher/files/mozilla-launcher-1.35-multilib.patch b/www-client/mozilla-launcher/files/mozilla-launcher-1.35-multilib.patch
deleted file mode 100644
index 4e8ed82ac775..000000000000
--- a/www-client/mozilla-launcher/files/mozilla-launcher-1.35-multilib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mozilla-launcher-1.35.multilib	2005-06-28 19:25:05.000000000 -0400
-+++ mozilla-launcher-1.35	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/files/mozilla-launcher-1.39-multilib.patch b/www-client/mozilla-launcher/files/mozilla-launcher-1.39-multilib.patch
deleted file mode 100644
index c628e4735524..000000000000
--- a/www-client/mozilla-launcher/files/mozilla-launcher-1.39-multilib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mozilla-launcher-1.39.multilib	2005-07-19 15:43:47.000000000 -0400
-+++ mozilla-launcher-1.39	2005-07-19 15:44:20.000000000 -0400
-@@ -136,28 +136,28 @@
-   # just drops through for binary-based browsers.
-   case $zero in
-     *fox)
--      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaFirefox"}
-+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib64/MozillaFirefox"}
-       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
-       mozbin=$MOZILLA_FIVE_HOME/firefox-bin
-       grepfor=Firefox-bin
-       ;;
- 
-     *mozilla)
--      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/mozilla"}
-+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib64/mozilla"}
-       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
-       mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
-       grepfor=Mozilla-bin
-       ;;
- 
-     *sunbird)
--      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaSunbird"}
-+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib64/MozillaSunbird"}
-       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
-       mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
-       grepfor=Sunbird-bin
-       ;;
- 
-     *thunderbird)
--      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaThunderbird"}
-+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/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/files/mozilla-launcher-1.41-multilib.patch b/www-client/mozilla-launcher/files/mozilla-launcher-1.41-multilib.patch
deleted file mode 100644
index d68481fcf1f7..000000000000
--- a/www-client/mozilla-launcher/files/mozilla-launcher-1.41-multilib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mozilla-launcher-1.41.multilib	2005-07-19 15:43:47.000000000 -0400
-+++ mozilla-launcher-1.41	2005-07-19 15:44:20.000000000 -0400
-@@ -136,28 +136,28 @@
-   # just drops through for binary-based browsers.
-   case $zero in
-     *fox)
--      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaFirefox"}
-+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib64/MozillaFirefox"}
-       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
-       mozbin=$MOZILLA_FIVE_HOME/firefox-bin
-       grepfor=Firefox-bin
-       ;;
- 
-     *mozilla)
--      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/mozilla"}
-+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib64/mozilla"}
-       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
-       mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
-       grepfor=Mozilla-bin
-       ;;
- 
-     *sunbird)
--      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaSunbird"}
-+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib64/MozillaSunbird"}
-       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
-       mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
-       grepfor=Sunbird-bin
-       ;;
- 
-     *thunderbird)
--      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaThunderbird"}
-+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/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/files/mozilla-launcher-1.52-aoss.patch b/www-client/mozilla-launcher/files/mozilla-launcher-1.52-aoss.patch
deleted file mode 100644
index 173ae6babd84..000000000000
--- a/www-client/mozilla-launcher/files/mozilla-launcher-1.52-aoss.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- -	2006-08-15 16:37:08.286834431 +0200
-+++ mozilla-launcher-1.52	2006-08-15 16:37:05.000000000 +0200
-@@ -139,7 +139,7 @@
-     *fox)
-       export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaFirefox"}
-       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
--      mozbin=$MOZILLA_FIVE_HOME/firefox-bin
-+	  mozbin="/usr/bin/aoss $MOZILLA_FIVE_HOME/firefox-bin"
-       ;;
- 
-     *mozilla)
-@@ -186,7 +186,7 @@
-     *fox-bin)
-       export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/firefox"}
-       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
--      mozbin=$MOZILLA_FIVE_HOME/firefox-bin
-+      mozbin="/usr/bin/aoss $MOZILLA_FIVE_HOME/firefox-bin"
-       ;;
- 
-     *mozilla-bin)
-@@ -215,7 +215,7 @@
-   esac
- 
-   # Make sure we got something
--  if [[ -z $mozbin || ! -f $mozbin ]]; then
-+  if [[ -z "$mozbin" ]]; then
-     echo "$0: can't find the browser :-(" >&2
-     return 1
-   fi
-@@ -417,7 +417,7 @@
-   # compreg.dat and/or chrome.rdf will screw things up if it's from an
-   # older version.  http://bugs.gentoo.org/show_bug.cgi?id=63999
-   for f in ~/{.,.mozilla/}${zero%-bin}/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do
--    if [[ -f ${f} && ${f} -ot ${mozbin} ]]; then
-+    if [[ -f ${f} && ${f} -ot "${mozbin}" ]]; then
-       echo "Removing ${f} leftover from older ${zero%-bin}"
-       rm -f "${f}"
-     fi
-@@ -447,7 +447,7 @@
-         MOZ_NO_REMOTE=1 "$mozbin" "$@" &
-         ;;
-       *)
--        "$mozbin" "$@" &
-+        $mozbin "$@" &
-         ;;
-     esac
-   fi