clean up; let erl binary use several CPUs if USE=smp is set. Reported by astro@spaceboyz.net on bug 188858; don't install license file; add a lot of quotes around variables; fix Emacs support file to use require and not load-library

Package-Manager: portage-2.1.2.11

5 files changed, 10 insertions, 50 deletions

diff --git a/dev-lang/erlang/files/10.2.6-manpage-emacs-gentoo.patch b/dev-lang/erlang/files/10.2.6-manpage-emacs-gentoo.patch
deleted file mode 100644
index a5183d480cd6..000000000000
--- a/dev-lang/erlang/files/10.2.6-manpage-emacs-gentoo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur otp_src_R10B-6.orig/lib/tools/emacs/erlang.el otp_src_R10B-6/lib/tools/emacs/erlang.el
---- otp_src_R10B-6.orig/lib/tools/emacs/erlang.el	2004-09-30 02:05:50.000000000 -0500
-+++ otp_src_R10B-6/lib/tools/emacs/erlang.el	2005-07-18 13:52:13.000000000 -0500
-@@ -2518,7 +2518,7 @@
- 
- (defun erlang-man-make-menu-item (file)
-   "Create a menu item containing the name of the man page."
--  (and (string-match ".*/\\([^/]+\\)\\.[^.]$" file)
-+  (and (string-match ".*/\\([^/]+\\)\\.[0-9]erl\\.gz$" file)
-        (let ((page (substring file (match-beginning 1) (match-end 1))))
- 	 (list (capitalize page)
- 	       (list 'lambda '()
-@@ -2529,7 +2529,7 @@
- 
- (defun erlang-man-get-files (dir)
-   "Return files in directory DIR."
--  (directory-files dir t ".*\\.[0-9]\\'"))
-+  (directory-files dir t ".*\\.[0-9]erl\\.gz\\'"))
- 
- 
- (defun erlang-man-module (&optional module)
-@@ -2690,7 +2690,7 @@
-     (error nil))
-   (if file
-       (let ((process-environment (copy-sequence process-environment)))
--	(if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[^.]$" file)
-+	(if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[0-9]erl.gz$" file)
- 	    (let ((dir (substring file (match-beginning 1) (match-end 1)))
- 		  (page (substring file (match-beginning 2) (match-end 2))))
- 	      (if (fboundp 'setenv)
-Only in otp_src_R10B-6/lib/tools/emacs: erlang.el~
diff --git a/dev-lang/erlang/files/50erlang-gentoo.el b/dev-lang/erlang/files/50erlang-gentoo.el
index 468726a6d158..ddc486c08e86 100644
--- a/dev-lang/erlang/files/50erlang-gentoo.el
+++ b/dev-lang/erlang/files/50erlang-gentoo.el
@@ -1,5 +1,5 @@
 ;;; erlang site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
-(load-library "erlang-start")
+(require "erlang-start")
 (setq erlang-root-dir "/usr/share")
diff --git a/dev-lang/erlang/files/digest-erlang-11.2.1 b/dev-lang/erlang/files/digest-erlang-11.2.1
deleted file mode 100644
index bc3b32cdaa3c..000000000000
--- a/dev-lang/erlang/files/digest-erlang-11.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 f5d3b25821f6d0763defd09f1dd4f51f otp_doc_html_R11B-1.tar.gz 4717809
-RMD160 2a7425f55245b12037a02082ace85411c04c5bb6 otp_doc_html_R11B-1.tar.gz 4717809
-SHA256 225212891e2290d0ea21e489445113d7f79ad51e4b3e3e4f0042f8876383a7bc otp_doc_html_R11B-1.tar.gz 4717809
-MD5 dbd2d3da878fed7474b7a9aa03e13c7d otp_doc_man_R11B-1.tar.gz 627132
-RMD160 666899dedc72f22387d478ffe4a1f313c57bdb01 otp_doc_man_R11B-1.tar.gz 627132
-SHA256 706e7da589cddee06b9d0a24a09e2105ae719bbfb8b6a08fe55ae45d5dbf4bd6 otp_doc_man_R11B-1.tar.gz 627132
-MD5 1fe3707d9bed898bc51444cb529fdd79 otp_src_R11B-1.tar.gz 11144896
-RMD160 db658f8221c4226f52c88ff56d2f68afbe47bac2 otp_src_R11B-1.tar.gz 11144896
-SHA256 d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7 otp_src_R11B-1.tar.gz 11144896
diff --git a/dev-lang/erlang/files/digest-erlang-11.2.4-r1 b/dev-lang/erlang/files/digest-erlang-11.2.4-r1
deleted file mode 100644
index 8a23b314578e..000000000000
--- a/dev-lang/erlang/files/digest-erlang-11.2.4-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 187cd55de8866a278ed963664819404d otp_doc_html_R11B-4.tar.gz 4902864
-RMD160 36d8ed3e0523f651f57caa8588f12f0500344f0e otp_doc_html_R11B-4.tar.gz 4902864
-SHA256 fa1f313a0d3f79239ee2930159288419c6c4348d095cf58557ff799712d3a60f otp_doc_html_R11B-4.tar.gz 4902864
-MD5 cc041ceebc4a6615073d8d7e88495610 otp_doc_man_R11B-4.tar.gz 712928
-RMD160 ba006631a99757c65ff4955650485e213d6904b9 otp_doc_man_R11B-4.tar.gz 712928
-SHA256 5852d7d9b7f09f3dda0261fe51c52025eacbdae258a984994b1a2407a065450e otp_doc_man_R11B-4.tar.gz 712928
-MD5 649e6f057e6996f92c8496161d754d8d otp_src_R11B-4.tar.gz 11720279
-RMD160 53969dd0f1637e9ac784f38d6ec9c01b7986a9cd otp_src_R11B-4.tar.gz 11720279
-SHA256 6928f44b67982aa8e00a2b053ecc78437fc70e19a2b0131c8f1ee86f02009337 otp_src_R11B-4.tar.gz 11720279
diff --git a/dev-lang/erlang/files/digest-erlang-11.2.5-r1 b/dev-lang/erlang/files/digest-erlang-11.2.5-r1
new file mode 100644
index 000000000000..77aa33e4a391
--- /dev/null
+++ b/dev-lang/erlang/files/digest-erlang-11.2.5-r1
@@ -0,0 +1,9 @@
+MD5 6a40146d855f98d024682cd24e9bb5bc otp_doc_html_R11B-5.tar.gz 4968176
+RMD160 73f8056b66f3bc6ec6b93c3c3dbfdf47074f8974 otp_doc_html_R11B-5.tar.gz 4968176
+SHA256 7dea67980b958ffebf7a94f3d94bd9c874e041f4f5ee574c56aab62c54a71d28 otp_doc_html_R11B-5.tar.gz 4968176
+MD5 5c387162ae6d255f525d72a91481d135 otp_doc_man_R11B-5.tar.gz 725858
+RMD160 62d200be6143183a17f5263b7341ec40afe298c7 otp_doc_man_R11B-5.tar.gz 725858
+SHA256 ab364af6e9db473d2bc5c0646a9b70989b858953ca9c053b78a509960a4f9caa otp_doc_man_R11B-5.tar.gz 725858
+MD5 96acec41da87d6ee0ef18e1aab36ffdd otp_src_R11B-5.tar.gz 38332865
+RMD160 67eac12a891df0e8d46b383ea0997f9de3aa6ac6 otp_src_R11B-5.tar.gz 38332865
+SHA256 d41fdfba40f86a50e04b7226ae5cc4581072fad26d14be5e1ca06603813bb175 otp_src_R11B-5.tar.gz 38332865