CLeanup Gentoo stuff

3 files changed, 2 insertions, 118 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 200fe62..e77aa18 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,4 @@
 AUX default-prefs.js 186 RMD160 a81854c5f1e95d2ce80f48d609dfde038b8fdcd5 SHA1 45ecd4c42affc453359e4aa8f147c0793eb03928 SHA256 a01580ae8f1b9496ee42d94774340a6dfbcbfbc177e258031cdc9d71fcd4985f
 AUX firefox.desktop 306 RMD160 3b24c918e3dd7c6ed935a748271e44894625b6aa SHA1 53f7f45eed895fcb1355609fcc3a994d6a8a7142 SHA256 26e8b5875faed9bde3620d346569af341d36519261fc3c85151f3120b711a51e
-AUX gentoo-specific.patch 3937 RMD160 d167b98c03ff88d955e865aee78203d396620cf7 SHA1 92a372a945734b737ed2d4b534fc8a6ef9e39bbf SHA256 dd6115dcca2972d637f966c6c7faef6d19d8e2622e3c44a0950e98c8f18ec747
-EBUILD firefox-9999.ebuild 1162 RMD160 73140caf6466377616004c216cdaedbec7b9daf0 SHA1 40efde75af4b8738de15e7a9d7ab8a4b1dd85ab3 SHA256 902211063f52b3a5fc3d24ab5ad6673f377387127002a372525e9d14eb62aeff
+AUX gentoo-specific.patch 1189 RMD160 39ef51ae246f47b5423b595105339547ed255fb1 SHA1 9b5b9febaa25af4d7fcf0836d69f42059e0f36db SHA256 c9ac2c3863eb2de037e0bd68d9046f54f40c05f38aafb0fe61b1efb195afc11d
+EBUILD firefox-9999.ebuild 902 RMD160 68648a8052d461636771646f7455b7c038ab6d4d SHA1 f10c61fa55b7e98fd1dd03b67836fa4080771900 SHA256 21033a1122635ea6f39a61463b8bf7f08d8e89c4702f57e1a1ef7e129235ad5d
diff --git a/www-client/firefox/files/gentoo-specific.patch b/www-client/firefox/files/gentoo-specific.patch
deleted file mode 100644
index ab27d4a..0000000
--- a/www-client/firefox/files/gentoo-specific.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -r ab0dc35174fb browser/components/preferences/advanced.js
---- a/browser/components/preferences/advanced.js	Tue Feb 15 23:54:37 2011 -0800
-+++ b/browser/components/preferences/advanced.js	Wed Feb 16 13:42:47 2011 +0100
-@@ -500,7 +500,7 @@
-     var enabledPref = document.getElementById("app.update.enabled");
-     var enableAppUpdate = document.getElementById("enableAppUpdate");
- 
--    enableAppUpdate.disabled = !aus.canCheckForUpdates || enabledPref.locked;
-+    enableAppUpdate.disabled = true;
-   },
- 
-   /**
-@@ -515,8 +515,7 @@
-     var updateModeLabel = document.getElementById("updateModeLabel");
-     var updateMode = document.getElementById("updateMode");
-     
--    var disable = enabledPref.locked || !enabledPref.value ||
--                  autoPref.locked;
-+    var disable = true;
-     updateModeLabel.disabled = updateMode.disabled = disable;
-   },
- 
-@@ -532,8 +531,7 @@
-     
-     var warnIncompatible = document.getElementById("warnIncompatible");
-     
--    var disable = enabledPref.locked || !enabledPref.value || autoPref.locked ||
--                  !autoPref.value || modePref.locked;
-+    var disable = true;
-     warnIncompatible.disabled = disable;
-   },
- 
-diff -r ab0dc35174fb extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
---- a/extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java	Tue Feb 15 23:54:37 2011 -0800
-+++ b/extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java	Wed Feb 16 13:42:47 2011 +0100
-@@ -470,8 +470,8 @@
- 
-     final String greUserConfFile = ".gre.config";
-     final String greUserConfDir = ".gre.d";
--    final String greConfPath = "/etc/gre.conf";
--    final String greConfDir = "/etc/gre.d";
-+    final String greConfPath = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.conf";
-+    final String greConfDir = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
- 
-     env = System.getProperty("user.home");
-     if (env != null) {
-diff -r ab0dc35174fb layout/base/nsPresArena.cpp
---- a/layout/base/nsPresArena.cpp	Tue Feb 15 23:54:37 2011 -0800
-+++ b/layout/base/nsPresArena.cpp	Wed Feb 16 13:42:47 2011 +0100
-@@ -73,6 +73,10 @@
- #elif !defined(__OS2__)
- # include <unistd.h>
- # include <sys/mman.h>
-+# ifdef SOLARIS
-+/* madvise is not declared for C++ */
-+extern "C" int madvise(void *addr, size_t len, int behav);
-+# endif
- # ifndef MAP_ANON
- #  ifdef MAP_ANONYMOUS
- #   define MAP_ANON MAP_ANONYMOUS
-diff -r ab0dc35174fb xpcom/build/nsXPCOMPrivate.h
---- a/xpcom/build/nsXPCOMPrivate.h	Tue Feb 15 23:54:37 2011 -0800
-+++ b/xpcom/build/nsXPCOMPrivate.h	Wed Feb 16 13:42:47 2011 +0100
-@@ -279,8 +279,8 @@
- #endif
- 
- #define GRE_CONF_NAME ".gre.config"
--#define GRE_CONF_PATH "/etc/gre.conf"
--#define GRE_CONF_DIR  "/etc/gre.d"
-+#define GRE_CONF_PATH "@GENTOO_PORTAGE_EPREFIX@/etc/gre.conf"
-+#define GRE_CONF_DIR  "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d"
- #define GRE_USER_CONF_DIR ".gre.d"
- #endif
- 
-diff -r ab0dc35174fb xulrunner/app/nsRegisterGREUnix.cpp
---- a/xulrunner/app/nsRegisterGREUnix.cpp	Tue Feb 15 23:54:37 2011 -0800
-+++ b/xulrunner/app/nsRegisterGREUnix.cpp	Wed Feb 16 13:42:47 2011 +0100
-@@ -114,7 +114,7 @@
- 
-   nsresult rv;
- 
--  char root[MAXPATHLEN] = "/etc/gre.d";
-+  char root[MAXPATHLEN] = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
- 
-   if (!aRegisterGlobally) {
-     char *home = PR_GetEnv("HOME");
-@@ -206,7 +206,7 @@
- {
-   nsresult rv;
- 
--  char root[MAXPATHLEN] = "/etc/gre.d";
-+  char root[MAXPATHLEN] = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
- 
-   if (!aRegisterGlobally) {
-     char *home = PR_GetEnv("HOME");
-diff -r ab0dc35174fb xulrunner/installer/Makefile.in
---- a/xulrunner/installer/Makefile.in	Tue Feb 15 23:54:37 2011 -0800
-+++ b/xulrunner/installer/Makefile.in	Wed Feb 16 13:42:47 2011 +0100
-@@ -73,7 +73,7 @@
- 
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
--regdir = /etc/gre.d
-+regdir = @sysconfdir@/gre.d
- 
- install:: $(MOZILLA_VERSION).system.conf
- 	$(NSINSTALL) -D $(DESTDIR)$(regdir)
diff --git a/www-client/firefox/firefox-9999.ebuild b/www-client/firefox/firefox-9999.ebuild
index 083ac46..b566183 100644
--- a/www-client/firefox/firefox-9999.ebuild
+++ b/www-client/firefox/firefox-9999.ebuild
@@ -12,15 +12,6 @@ HOMEPAGE="http://www.mozilla.com/en-US/firefox"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
-	# Gentoo specific stuff
-	epatch "${FILESDIR}"/gentoo-specific.patch
-
-	eprefixify \
-		extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
-		xpcom/build/nsXPCOMPrivate.h \
-		xulrunner/installer/Makefile.in \
-		xulrunner/app/nsRegisterGREUnix.cpp
-
 	# Gentoo install dirs
 	sed -i \
 		-e 's:$(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION):$(includedir)/idl:' \