gentoo resync : 03.11.2019

3 files changed, 86 insertions, 0 deletions

diff --git a/app-emacs/color-theme/Manifest b/app-emacs/color-theme/Manifest
index a0f910084fa2..782a2776ec76 100644
--- a/app-emacs/color-theme/Manifest
+++ b/app-emacs/color-theme/Manifest
@@ -1,5 +1,7 @@
 AUX 50color-theme-gentoo.el 4375 BLAKE2B 0a17afad7fd9290dde1992e813711d9bed4b36ec9f2a3d41ab5775dc55e125f7f3cb9b74d1230f1202ee3083b68c29782c3cba955444c04a42b31f3f66b39b89 SHA512 318354c71e75b343eaf90b3be2f94c0b6b93c776afe3289a5c18a5b837478291ce6a8d554a6357c13f14cbe568bf10c5d7ed9690ee8c382ec3cc4aeeac70412a
+AUX color-theme-6.6.0-emacs-26.patch 1956 BLAKE2B dc7f32c9b0485771f057fb0cd4ddc20f8f154917b3fca5294f535f0420429840ba172000e3ee89e79e3004310ffe36e105028250bb893b35d4866ac52c7a6d67 SHA512 2c20a9565019c0271c9ad8c56fdabd731be9bfce2b9841a1b4e140d44ed13337d14bcb1b7a793ed5bf866335e4212f3d7880bf8c561593a76a2c0990d8b81b0f
 AUX color-theme-6.6.0-replace-in-string.patch 1173 BLAKE2B 4e27361d5212afd78e6b94b7b20c3e2512715a280a98fcecaef3b3202ca376b5749c37c3dfb3f1d27673a3421d12de6fc0d7b6c2ee07f1720a32d737558f1e2b SHA512 bdf1ebb03c1fc70bf78adf4886b005780d1c540ac59730e644111f5a3a925b6b05d2e910520b67ec768815f0fecca3a5e617472ca9e415900daf890ca77bc6d1
 DIST color-theme-6.6.0.tar.gz 124858 BLAKE2B b98e97b6c02fa9bac30c5eaefaa1724f751e1176b99fcf10e5d44507ada0c82e2cc2df8352c6d605d097a0c3697b071c2cf9bfe32b4a8cbf67cf00dd5c1545e4 SHA512 4faa22900f6ad4a1dd57452470e23b57827d3f02bf2b9e3c4eed6f5693432d6478aa5008e67f219a95412a63fe52dbcad15b0ac7a3b4d39f1d28ceda75e5e76c
 EBUILD color-theme-6.6.0-r1.ebuild 970 BLAKE2B 859260f9944cd15b0d0cbfc7128ea9b96519498486252845deb877997729d73a5e487108a2c2ae0ca4d844f5cbc474ef7a76f82d48421fa7fc081c2695654146 SHA512 fcde2a903f4e0e733311f7dc019baf3049e0e2ada53ef027530ed07a29e99a72dfa9df9fe004c5b69b560233c82702d744d166114bbf544f0a9f485bb612e4bd
+EBUILD color-theme-6.6.0-r2.ebuild 1020 BLAKE2B ba900834737e7610f9008fb194d1bf7fccb632e868f0e1126656f0f7fa27b4a7e56904dc94fe9978440d9c72a661ef6037fa9dc1974ee1287b79b6fa1403cd4f SHA512 40655880a381099f28c763e47b83d5b7d363f17bbefcdcfc0b9e2e4955253a4fbb120ddfb7585dd04889206a4adf02052f479c04a86e01c070fcf983ae39423f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
new file mode 100644
index 000000000000..7ddb8a2caf50
--- /dev/null
+++ b/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Install color themes (includes many themes)"
+HOMEPAGE="http://www.nongnu.org/color-theme/"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-replace-in-string.patch
+	"${FILESDIR}"/${P}-emacs-26.patch
+)
+ELISP_REMOVE="color-theme-autoloads.*"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	elisp-install ${PN}/themes themes/*.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS BUGS ChangeLog README
+
+	DOC_CONTENTS="To use color-theme non-interactively, initialise it
+		in your ~/.emacs file as in the following example (which is
+		for the \"Blue Sea\" theme):
+		\n
+		\n(color-theme-initialize)
+		\n(color-theme-blue-sea)"
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/color-theme/files/color-theme-6.6.0-emacs-26.patch b/app-emacs/color-theme/files/color-theme-6.6.0-emacs-26.patch
new file mode 100644
index 000000000000..4310733dbf24
--- /dev/null
+++ b/app-emacs/color-theme/files/color-theme-6.6.0-emacs-26.patch
@@ -0,0 +1,48 @@
+Some updates taken from https://www.emacswiki.org/emacs/color-theme.el
+in order to make this work with Emacs 26. EmacsWiki calls this
+version 6.6.1, but doesn't package any other files from the upstream
+tarball.
+
+--- color-theme-6.6.0-orig/color-theme.el
++++ color-theme-6.6.0/color-theme.el
+@@ -1077,13 +1077,11 @@
+   (let ((rules '((font-lock-builtin-face font-lock-reference-face)
+ 		 (font-lock-doc-face font-lock-doc-string-face)
+ 		 (font-lock-constant-face font-lock-preprocessor-face)
+-		 ;; In Emacs 21 `modeline' is just an alias for
+-		 ;; `mode-line'.  I recommend the use of
+-		 ;; `modeline' until further notice.
+-		 (modeline mode-line)
+-		 (modeline modeline-buffer-id)
+-		 (modeline modeline-mousable)
+-		 (modeline modeline-mousable-minor-mode)
++		 ;; D.ADAMS - Emacs 24.3 made `modeline' obsolete, so I've just commented-out these four lines.
++		 ;; (modeline mode-line)
++		 ;; (modeline modeline-buffer-id)
++		 ;; (modeline modeline-mousable)
++		 ;; (modeline modeline-mousable-minor-mode)
+ 		 (region primary-selection)
+ 		 (region zmacs-region)
+ 		 (font-lock-string-face dired-face-boring "^dired")
+@@ -1254,7 +1252,9 @@
+ 	   (val (cdr (assq param params)))
+ 	   (frame (if color-theme-is-global nil (selected-frame))))
+       (when val
+-	(set-face-property face prop val frame)))))
++	(if (fboundp 'set-face-property)
++	    (set-face-property face prop val frame)
++	  (set-face-attribute face frame prop val))))))
+ 
+ (defun color-theme-alist-reduce (old-list)
+   "Reduce OLD-LIST.
+@@ -1332,7 +1332,9 @@
+     (dolist (var vars)
+       (if (or color-theme-is-global color-theme-xemacs-p)
+ 	  (set (car var) (cdr var))
+-	(make-variable-frame-local (car var))
++	;; DADAMS
++	;; `make-variable-frame-local' was removed from Emacs C code in Emacs 26.
++	(when (fboundp 'make-variable-frame-local) (make-variable-frame-local (car var)))
+ 	(modify-frame-parameters (selected-frame) (list var))))))
+ 
+ (defun color-theme-install-faces (faces)