Avoid name clash for function replace-in-string, bug 280293. Other small fixes.

(Portage version: 2.2_rc36/cvs/Linux i686)

4 files changed, 186 insertions, 2 deletions

diff --git a/app-emacs/color-theme/ChangeLog b/app-emacs/color-theme/ChangeLog
index 76682da35291..ac48092b00ab 100644
--- a/app-emacs/color-theme/ChangeLog
+++ b/app-emacs/color-theme/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/color-theme
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/ChangeLog,v 1.34 2008/12/19 09:51:40 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/ChangeLog,v 1.35 2009/08/10 10:06:26 ulm Exp $
+
+*color-theme-6.6.0-r1 (10 Aug 2009)
+
+  10 Aug 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/50color-theme-gentoo.el, +color-theme-6.6.0-r1.ebuild,
+  +files/color-theme-6.6.0-replace-in-string.patch:
+  Avoid name clash for function replace-in-string, fixes bug 280293.
+  Update HOMEPAGE and SRC_URI. Install documentation.
 
   19 Dec 2008; Ulrich Mueller <ulm@gentoo.org> color-theme-6.6.0.ebuild:
   Add postinst message about non-interactive usage, bug 73192.
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
new file mode 100644
index 000000000000..f18554c9ac5d
--- /dev/null
+++ b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild,v 1.1 2009/08/10 10:06:26 ulm Exp $
+
+inherit elisp eutils
+
+DESCRIPTION="Install color themes (includes many themes and allows you to share your own with the world)"
+HOMEPAGE="http://www.nongnu.org/color-theme/"
+SRC_URI="http://mirrors.zerg.biz/nongnu/color-theme/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	unpack ${A}
+	rm "${S}"/*.elc "${S}"/color-theme-autoloads*
+	epatch "${FILESDIR}/${P}-replace-in-string.patch"
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc || die
+	elisp-install ${PN}/themes themes/*.el || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	dodoc AUTHORS BUGS ChangeLog README || die
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "To use color-theme non-interactively, initialise it in your ~/.emacs"
+	elog "as in the following example (which is for the \"Blue Sea\" theme):"
+	elog "   (color-theme-initialize)"
+	elog "   (color-theme-blue-sea)"
+}
diff --git a/app-emacs/color-theme/files/50color-theme-gentoo.el b/app-emacs/color-theme/files/50color-theme-gentoo.el
new file mode 100644
index 000000000000..9d43c350fffd
--- /dev/null
+++ b/app-emacs/color-theme/files/50color-theme-gentoo.el
@@ -0,0 +1,109 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload (quote color-theme-select) "color-theme" "\
+Displays a special buffer for selecting and installing a color theme.
+With optional prefix ARG, this buffer will include color theme libraries
+as well.  A color theme library is in itself not complete, it must be
+used as part of another color theme to be useful.  Thus, color theme
+libraries are mainly useful for color theme authors." t nil)
+
+(autoload (quote color-theme-describe) "color-theme" "\
+Describe color theme listed at point.
+This shows the documentation of the value of text-property color-theme
+at point.  The text-property color-theme should be a color theme
+function.  See `color-themes'." t nil)
+
+(autoload (quote color-theme-install-at-mouse) "color-theme" "\
+Install color theme clicked upon using the mouse.
+First argument EVENT is used to set point.  Then
+`color-theme-install-at-point' is called." t nil)
+
+(autoload (quote color-theme-install-at-point-for-current-frame) "color-theme" "\
+Install color theme at point for current frame only.
+Binds `color-theme-is-global' to nil and calls
+`color-theme-install-at-point'." t nil)
+
+(autoload (quote color-theme-print) "color-theme" "\
+Print the current color theme function.
+
+You can contribute this function to <URL:news:gnu.emacs.sources> or
+paste it into your .emacs file and call it.  That should recreate all
+the settings necessary for your color theme.
+
+Example:
+
+    (require 'color-theme)
+    (defun my-color-theme ()
+      \"Color theme by Alex Schroeder, created 2000-05-17.\"
+      (interactive)
+      (color-theme-install
+       '(...
+	 ...
+	 ...)))
+    (my-color-theme)
+
+If you want to use a specific color theme function, you can call the
+color theme function in your .emacs directly.
+
+Example:
+
+    (require 'color-theme)
+    (color-theme-gnome2)" t nil)
+
+(autoload (quote color-theme-analyze-defun) "color-theme" "\
+Once you have a color-theme printed, check for missing faces.
+This is used by maintainers who receive a color-theme submission
+and want to make sure it follows the guidelines by the color-theme
+author." t nil)
+
+(autoload (quote color-theme-make-snapshot) "color-theme" "\
+Return the definition of the current color-theme.
+The function returned will recreate the color-theme in use at the moment." nil nil)
+
+(autoload (quote color-theme-compare) "color-theme" "\
+Compare two color themes.
+This will print the differences between installing THEME-A and
+installing THEME-B.  Note that the order is important: If a face is
+defined in THEME-A and not in THEME-B, then this will not show up as a
+difference, because there is no reset before installing THEME-B.  If a
+face is defined in THEME-B and not in THEME-A, then this will show up as
+a difference." t nil)
+
+(autoload (quote color-theme-install) "color-theme" "\
+Install a color theme defined by frame parameters, variables and faces.
+
+The theme is installed for all present and future frames; any missing
+faces are created.  See `color-theme-install-faces'.
+
+THEME is a color theme definition.  See below for more information.
+
+If you want to install a color theme from your .emacs, use the output
+generated by `color-theme-print'.  This produces color theme function
+which you can copy to your .emacs.
+
+A color theme definition is a list:
+\([FUNCTION] FRAME-PARAMETERS VARIABLE-SETTINGS FACE-DEFINITIONS)
+
+FUNCTION is the color theme function which called `color-theme-install'.
+This is no longer used.  There was a time when this package supported
+automatic factoring of color themes.  This has been abandoned.
+
+FRAME-PARAMETERS is an alist of frame parameters.  These are installed
+with `color-theme-install-frame-params'.  These are installed last such
+that any changes to the default face can be changed by the frame
+parameters.
+
+VARIABLE-DEFINITIONS is an alist of variable settings.  These are
+installed with `color-theme-install-variables'.
+
+FACE-DEFINITIONS is an alist of face definitions.  These are installed
+with `color-theme-install-faces'.
+
+If `color-theme-is-cumulative' is nil, a color theme will undo face and
+frame-parameter settings of previous color themes." nil nil)
+
+(autoload (quote color-theme-submit) "color-theme" "\
+Submit your color-theme to the maintainer." t nil)
+
+(autoload (quote color-theme-initialize) "color-theme" "\
+Initialize the color theme package by loading color-theme-libraries." t nil)
diff --git a/app-emacs/color-theme/files/color-theme-6.6.0-replace-in-string.patch b/app-emacs/color-theme/files/color-theme-6.6.0-replace-in-string.patch
new file mode 100644
index 000000000000..bfd6bedd8983
--- /dev/null
+++ b/app-emacs/color-theme/files/color-theme-6.6.0-replace-in-string.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/280293
+
+--- color-theme-6.6.0-orig/color-theme.el	2006-05-28 15:07:29.000000000 +0200
++++ color-theme-6.6.0/color-theme.el	2009-08-10 10:17:00.000000000 +0200
+@@ -72,11 +72,6 @@
+                                   (string-match "XEmacs" emacs-version))
+   "Non-nil if running XEmacs.")
+ 
+-;; Add this since it appears to miss in emacs-2x
+-(or (fboundp 'replace-in-string)
+-    (defun replace-in-string (target old new)
+-      (replace-regexp-in-string old new  target)))
+-
+ ;; face-attr-construct has a problem in Emacs 20.7 and older when
+ ;; dealing with inverse-video faces.  Here is a short test to check
+ ;; wether you are affected.
+@@ -1626,9 +1621,10 @@
+        (add-to-list 'color-themes
+                     (list ',n
+                           (upcase-initials
+-                           (replace-in-string
+-                            (replace-in-string 
+-                             (symbol-name ',n) "^color-theme-" "") "-" " "))
++			   (replace-regexp-in-string
++			    "-" " "
++			    (replace-regexp-in-string
++			     "^color-theme-" "" (symbol-name ',n))))
+                           ,author))
+        (defun ,n ()
+ 	 ,description