Rename, to reflect upstream change of version number.

(Portage version: 2.1.4.4)

3 files changed, 24 insertions, 16 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index fc44aebbbb57..ec88aad637b1 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.200 2008/03/07 17:49:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.201 2008/03/26 14:43:00 ulm Exp $
+
+*emacs-cvs-23.0.9999 (26 Mar 2008)
+*emacs-cvs-22.2.9999 (26 Mar 2008)
+
+  26 Mar 2008; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.1.9999.ebuild,
+  +emacs-cvs-22.2.9999.ebuild, -emacs-cvs-23.0.60-r2.ebuild,
+  +emacs-cvs-23.0.9999.ebuild:
+  Rename, to reflect upstream change of version number and to emphasise that
+  these are live CVS ebuilds.
 
 *emacs-cvs-22.1.92 (07 Mar 2008)
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
index 7c88ca2b77c0..da91c9ec9982 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.9999.ebuild,v 1.4 2008/02/11 20:36:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild,v 1.1 2008/03/26 14:43:00 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -23,7 +23,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbs
 IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
 RESTRICT="strip"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="!~app-editors/emacs-22.2
+	sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
 	net-libs/liblockfile
 	hesiod? ( net-dns/hesiod )
@@ -130,9 +131,7 @@ src_compile() {
 		# possibilities. Emacs upstream thinks this should be standard
 		# policy on all distributions
 		if use gtk; then
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
+			einfo "Configuring to build with GTK+ support"
 			myconf="${myconf} --with-x-toolkit=gtk"
 		elif use Xaw3d; then
 			einfo "Configuring to build with Xaw3d (athena) support"
@@ -226,12 +225,12 @@ emacs-infodir-rebuild() {
 }
 
 pkg_postinst() {
-	test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
-		cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+	[ -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ] \
+		|| cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
 
 	local f
 	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		test -e "${f}" || touch "${f}"
+		[ -e "${f}" ] || touch "${f}"
 	done
 
 	elisp-site-regen
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
index edaf6b6a9084..db0e07ed76e6 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild,v 1.12 2008/03/03 01:55:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.1 2008/03/26 14:43:00 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -83,8 +83,8 @@ src_unpack() {
 	echo
 	einfo "Emacs CVS branch: ${ECVS_BRANCH}"
 	einfo "Emacs version number: ${FULL_VERSION}"
-	[ "${FULL_VERSION}" = ${PV} ] \
-		|| die "Upstream version number changed to ${FULL_VERSION}"
+	#[ "${FULL_VERSION}" = ${PV} ] \
+	#	|| die "Upstream version number changed to ${FULL_VERSION}"
 	echo
 
 	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
@@ -152,7 +152,7 @@ src_compile() {
 		# possibilities. Emacs upstream thinks this should be standard
 		# policy on all distributions
 		if use gtk; then
-			einfo "Configuring to build with GTK+ support, disabling all other toolkits"
+			einfo "Configuring to build with GTK+ support"
 			myconf="${myconf} --with-x-toolkit=gtk"
 		elif use Xaw3d; then
 			einfo "Configuring to build with Xaw3d (athena) support"
@@ -245,12 +245,12 @@ emacs-infodir-rebuild() {
 }
 
 pkg_postinst() {
-	test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
-		cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+	[ -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ] \
+		|| cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
 
 	local f
 	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		test -e "${f}" || touch "${f}"
+		[ -e "${f}" ] || touch "${f}"
 	done
 
 	elisp-site-regen