New upstream version; Alter the Emacs 22 versus Emacs 21 patch for easy-menu-add-item so the check is done during evaluation.

(Portage version: 2.1_pre3-r1)

5 files changed, 56 insertions, 7 deletions

diff --git a/app-emacs/color-theme/ChangeLog b/app-emacs/color-theme/ChangeLog
index 2c51bfbdf928..5f6f56464d41 100644
--- a/app-emacs/color-theme/ChangeLog
+++ b/app-emacs/color-theme/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/color-theme
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/ChangeLog,v 1.18 2005/08/20 18:25:34 grobian Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/ChangeLog,v 1.19 2006/01/16 18:51:34 mkennedy Exp $
+
+*color-theme-6.5.5 (16 Jan 2006)
+
+  16 Jan 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/6.5.5-easy-menu-gentoo.patch, +color-theme-6.5.5.ebuild:
+  New upstream version; Alter the Emacs 22 versus Emacs 21 patch for
+  easy-menu-add-item so the check is done during evaluation.
 
   20 Aug 2005; Fabian Groffen <grobian@gentoo.org>
   color-theme-6.5.4-r1.ebuild:
diff --git a/app-emacs/color-theme/Manifest b/app-emacs/color-theme/Manifest
index 4ea7a2edbb9e..06734f1fce71 100644
--- a/app-emacs/color-theme/Manifest
+++ b/app-emacs/color-theme/Manifest
@@ -1,8 +1,11 @@
-MD5 bc2cb2a3d72ce0f611cdb1544f205f24 color-theme-6.5.4.ebuild 632
-MD5 0a1fd43e829429fc412b43f6ccb3ce7f color-theme-6.5.4-r1.ebuild 955
 MD5 18929f4d3aff5e0358dac3bf2b121d27 ChangeLog 2443
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 47143d30cb8c65d6ea55a7984331405d files/digest-color-theme-6.5.4-r1 69
-MD5 205de53bc919ce2c7ad70f62e7287ad1 files/6.5.4-easy-menu-gentoo.patch 537
+MD5 0a1fd43e829429fc412b43f6ccb3ce7f color-theme-6.5.4-r1.ebuild 955
+MD5 bc2cb2a3d72ce0f611cdb1544f205f24 color-theme-6.5.4.ebuild 632
+MD5 a4dfdd065e25115edea0350703b4939e color-theme-6.5.5.ebuild 659
 MD5 00a25d11e7177936fb464386a60997c8 files/50color-theme-gentoo.el 104
+MD5 205de53bc919ce2c7ad70f62e7287ad1 files/6.5.4-easy-menu-gentoo.patch 537
+MD5 2460228857324d14e5d5f21bdbf4d62d files/6.5.5-easy-menu-gentoo.patch 687
 MD5 47143d30cb8c65d6ea55a7984331405d files/digest-color-theme-6.5.4 69
+MD5 47143d30cb8c65d6ea55a7984331405d files/digest-color-theme-6.5.4-r1 69
+MD5 0296a67e30088afe93335e25d11d1fa4 files/digest-color-theme-6.5.5 69
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
diff --git a/app-emacs/color-theme/color-theme-6.5.5.ebuild b/app-emacs/color-theme/color-theme-6.5.5.ebuild
new file mode 100644
index 000000000000..992b4000a317
--- /dev/null
+++ b/app-emacs/color-theme/color-theme-6.5.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 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.5.5.ebuild,v 1.1 2006/01/16 18:51:34 mkennedy Exp $
+
+inherit elisp eutils
+
+IUSE=""
+
+DESCRIPTION="Install color themes (includes many themes and allows you to share your own with the world)"
+HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki.pl?ColorTheme"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-easy-menu-gentoo.patch || die
+}
diff --git a/app-emacs/color-theme/files/6.5.5-easy-menu-gentoo.patch b/app-emacs/color-theme/files/6.5.5-easy-menu-gentoo.patch
new file mode 100644
index 000000000000..4d65e301479d
--- /dev/null
+++ b/app-emacs/color-theme/files/6.5.5-easy-menu-gentoo.patch
@@ -0,0 +1,17 @@
+diff -ur color-theme-6.5.5.orig/color-theme.el color-theme-6.5.5/color-theme.el
+--- color-theme-6.5.5.orig/color-theme.el	2006-01-16 11:45:51.000000000 -0600
++++ color-theme-6.5.5/color-theme.el	2006-01-16 11:57:53.000000000 -0600
+@@ -586,9 +586,10 @@
+   (color-theme-mode))
+ 
+ (require 'easymenu)
+-(easy-menu-add-item nil '("Tools") "--")
+-(easy-menu-add-item  nil '("Tools")
+-  ["Color Themes" color-theme-select t])
++(let ((item (if (< emacs-major-version 22) "tools" "Tools")))
++  (easy-menu-add-item nil `(,item) "--")
++  (easy-menu-add-item  nil `(,item)
++    ["Color Themes" color-theme-select t]))
+ 
+ (defun color-theme-mode ()
+   "Major mode to select and install color themes.
diff --git a/app-emacs/color-theme/files/digest-color-theme-6.5.5 b/app-emacs/color-theme/files/digest-color-theme-6.5.5
new file mode 100644
index 000000000000..cdf3b667c074
--- /dev/null
+++ b/app-emacs/color-theme/files/digest-color-theme-6.5.5
@@ -0,0 +1 @@
+MD5 cd7b03df8ca47cf545a9eb00d52e7501 color-theme-6.5.5.tar.gz 111893