.

(Portage version: 2.0.51.22-r1)

9 files changed, 50 insertions, 74 deletions

diff --git a/app-emacs/color-theme/ChangeLog b/app-emacs/color-theme/ChangeLog
index 11723134e154..364923ec0b34 100644
--- a/app-emacs/color-theme/ChangeLog
+++ b/app-emacs/color-theme/ChangeLog
@@ -1,6 +1,15 @@
 # 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.14 2005/04/21 18:31:21 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/ChangeLog,v 1.15 2005/06/27 04:21:03 mkennedy Exp $
+
+*color-theme-6.5.4-r1 (27 Jun 2005)
+
+  27 Jun 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  -color-theme-5.2.13.ebuild, -color-theme-6.5.2.ebuild,
+  color-theme-6.5.4.ebuild, +color-theme-6.5.4-r1.ebuild:
+  Conditionally apply menu patch based on whether the GNU Emacs major version
+  is 21* or 22* (CVS) resolves Bug #73192; Correct spelling error in
+  DESCRIPTION resolves Bug #94001; Remove old ebuilds.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> color-theme-6.5.4.ebuild:
   stable on amd64
diff --git a/app-emacs/color-theme/Manifest b/app-emacs/color-theme/Manifest
index 2be4e663ae88..bfb9cea03cc7 100644
--- a/app-emacs/color-theme/Manifest
+++ b/app-emacs/color-theme/Manifest
@@ -1,10 +1,8 @@
-MD5 cbedec3e030ee908eb03106277d1e782 ChangeLog 1710
-MD5 9c19aad9db962d814d954e0a41bed396 color-theme-5.2.13.ebuild 920
-MD5 9edbdbe509458351cb9e8d6f11d8be48 color-theme-6.5.2.ebuild 744
-MD5 df30eee71a6d7f1d7c68006a9412a02d color-theme-6.5.4.ebuild 627
+MD5 13b39623e5437d068054771480337d08 ChangeLog 2118
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 086b017dcb9e5aec39f7a70548155587 color-theme-6.5.4-r1.ebuild 935
+MD5 2b41e11d1fbcb9c2d9fe480c93fd4e7c color-theme-6.5.4.ebuild 628
 MD5 00a25d11e7177936fb464386a60997c8 files/50color-theme-gentoo.el 104
 MD5 205de53bc919ce2c7ad70f62e7287ad1 files/6.5.4-easy-menu-gentoo.patch 537
-MD5 e7ba824a41df69e5b4f3c6252d23e7d9 files/digest-color-theme-5.2.13 70
-MD5 49152c065cd7e40d00257f58ebed3ef7 files/digest-color-theme-6.5.2 69
 MD5 47143d30cb8c65d6ea55a7984331405d files/digest-color-theme-6.5.4 69
+MD5 47143d30cb8c65d6ea55a7984331405d files/digest-color-theme-6.5.4-r1 69
diff --git a/app-emacs/color-theme/color-theme-5.2.13.ebuild b/app-emacs/color-theme/color-theme-5.2.13.ebuild
deleted file mode 100644
index c40d57b9035f..000000000000
--- a/app-emacs/color-theme/color-theme-5.2.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/color-theme-5.2.13.ebuild,v 1.8 2005/01/01 13:41:26 eradicator Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="Install color themes (includes many themes and allows you to share you own with the world)"
-HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki.pl?ColorTheme"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/emacs"
-
-SITEFILE=50color-theme-gentoo.el
-
-src_compile() {
-	emacs --batch -f batch-byte-compile --no-site-file --no-init-file *.el || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/${SITEFILE}
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	einfo "Please see ${SITELISP}/${PN}/color-theme.el for the complete documentation."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/app-emacs/color-theme/color-theme-6.5.2.ebuild b/app-emacs/color-theme/color-theme-6.5.2.ebuild
deleted file mode 100644
index 801e37e261d2..000000000000
--- a/app-emacs/color-theme/color-theme-6.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 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.2.ebuild,v 1.5 2005/01/01 13:41:26 eradicator Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="Install color themes (includes many themes and allows you to share you 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="x86"
-
-DEPEND="virtual/emacs"
-
-SITEFILE=50color-theme-gentoo.el
-
-src_compile() {
-	emacs --batch -f batch-byte-compile --no-init-file *.el || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/${SITEFILE}
-}
diff --git a/app-emacs/color-theme/color-theme-6.5.4-r1.ebuild b/app-emacs/color-theme/color-theme-6.5.4-r1.ebuild
new file mode 100644
index 000000000000..70c9f06dfdf8
--- /dev/null
+++ b/app-emacs/color-theme/color-theme-6.5.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 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.4-r1.ebuild,v 1.1 2005/06/27 04:21:03 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="x86 amd64 sparc"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	unpack ${A}
+	local emacs_version=$(emacs --version |head -n 1 |cut -f3-3 -d' ')
+	case $emacs_version	 in
+		21*)
+			# No patching required
+			;;
+		22*)
+			epatch ${FILESDIR}/${PV}-easy-menu-gentoo.patch || die
+			;;
+		*)
+			ewarn "Your version of Emacs (${emacs_version}) is not supported by this port."
+			ewarn "You may have problems with color-theme.el"
+			;;
+	esac
+}
diff --git a/app-emacs/color-theme/color-theme-6.5.4.ebuild b/app-emacs/color-theme/color-theme-6.5.4.ebuild
index 7ede4d065fae..69461876c4af 100644
--- a/app-emacs/color-theme/color-theme-6.5.4.ebuild
+++ b/app-emacs/color-theme/color-theme-6.5.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 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.4.ebuild,v 1.9 2005/04/21 18:31:21 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/color-theme-6.5.4.ebuild,v 1.10 2005/06/27 04:21:03 mkennedy Exp $
 
 inherit elisp eutils
 
 IUSE=""
 
-DESCRIPTION="Install color themes (includes many themes and allows you to share you own with the world)"
+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"
diff --git a/app-emacs/color-theme/files/digest-color-theme-5.2.13 b/app-emacs/color-theme/files/digest-color-theme-5.2.13
deleted file mode 100644
index 5a9f245b5606..000000000000
--- a/app-emacs/color-theme/files/digest-color-theme-5.2.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76cf71834a44d103a2686905c9a5fa7e color-theme-5.2.13.tar.bz2 30509
diff --git a/app-emacs/color-theme/files/digest-color-theme-6.5.2 b/app-emacs/color-theme/files/digest-color-theme-6.5.2
deleted file mode 100644
index 8501a2ee0f21..000000000000
--- a/app-emacs/color-theme/files/digest-color-theme-6.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4ae7a971a3321295355c73dc99d9c86 color-theme-6.5.2.tar.gz 108989
diff --git a/app-emacs/color-theme/files/digest-color-theme-6.5.4-r1 b/app-emacs/color-theme/files/digest-color-theme-6.5.4-r1
new file mode 100644
index 000000000000..914fc326d43a
--- /dev/null
+++ b/app-emacs/color-theme/files/digest-color-theme-6.5.4-r1
@@ -0,0 +1 @@
+MD5 46f81bc28b75b6922fdf95c3edb97da1 color-theme-6.5.4.tar.gz 112930