emacs-unicode-2 branch was tagged as 23.0.0

Package-Manager: portage-2.0.51.16

11 files changed, 30 insertions, 126 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 25bd1975d1a5..e983062559be 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.28 2005/02/11 09:14:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.29 2005/02/16 13:51:54 usata Exp $
+
+*emacs-cvs-23.0.0 (16 Feb 2005)
+
+  16 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/50emacs-22.0.50.envd, +files/50emacs-23.0.0.envd,
+  -files/emacs-22.0.0.desktop, +files/emacs-23.0.0.desktop,
+  -emacs-cvs-22.0.0-r1.ebuild, -emacs-cvs-22.0.0.ebuild,
+  emacs-cvs-22.0.50.ebuild, +emacs-cvs-23.0.0.ebuild:
+  emacs-unicode-2 branch was tagged as 23.0.0
 
 *emacs-cvs-22.0.0-r1 (11 Feb 2005)
 
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 774d28ea97b6..52e07c671b3a 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 eab18ab15ed3c70e402246e7c6bf9640 ChangeLog 4262
+MD5 b7a0485d9c77f485fe4493ff8b525399 ChangeLog 4621
 MD5 3b1bff980356c4a65d57cc1b4cf3e0af emacs-cvs-21.3.50.ebuild 3039
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 b0074eda7745eefdefa92a834c69bdfa emacs-cvs-22.0.50.ebuild 4513
-MD5 c923ad49f159d42b7490ed9712314fdd emacs-cvs-22.0.0.ebuild 3008
+MD5 ef284023992370c27bed699927aa4b25 emacs-cvs-22.0.50.ebuild 4580
 MD5 392ad6771838dab0b7a0ac1dd90890c6 emacs-cvs-21.3.50-r2.ebuild 4512
-MD5 78b64b178ebc81f26e3ec45d3122d95c emacs-cvs-22.0.0-r1.ebuild 4525
+MD5 919b9a7805e3d62b322df4bc8a94cf2b emacs-cvs-23.0.0.ebuild 4596
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50 0
 MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50 0
-MD5 489cecff3b00a0e1521eab388c1ee07b files/emacs-22.0.0.desktop 204
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.0 0
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 MD5 39e2f957cdbcb0ae028bb9b94312d85b files/emacs-21.3.50.desktop 206
 MD5 ffdd28353d4bb08ee9ec653650458a40 files/50emacs-21.3.50.envd 39
 MD5 8e50e760415e106cd168d8709d31b7dc files/emacs-22.0.50.desktop 206
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.0-r1 0
+MD5 86cca3ef7b8ceb7f9e666501bedcc76e files/emacs-23.0.0.desktop 204
+MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
+MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCDHVtVWNWqTUmv+0RAjBLAJ4obhKmCiuvWSC1Q1NrAcurcLNsXgCgsAPo
-A1vHGWYX3JKoHzSo8wzAA5w=
-=2wxm
+iD8DBQFCE03bVWNWqTUmv+0RAqOOAJ4lYVU2ONIUbCVv0oSkV1KH1nnk7wCeI4ta
+WNGc+dhobQSC7kpSZlI8qAc=
+=kF+R
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild
deleted file mode 100644
index 22b2ce1ec775..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2005 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.0.0.ebuild,v 1.3 2005/01/01 13:24:39 eradicator Exp $
-
-ECVS_AUTH="ext"
-export CVS_RSH="ssh"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="emacs-unicode-2"
-ECVS_USER="anoncvs"
-ECVS_PASS=""
-ECVS_CVS_OPTIONS="-dP"
-ECVS_SSH_HOST_KEY="savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0="
-
-inherit elisp-common cvs alternatives
-
-IUSE="X Xaw3d gif gnome gtk jpeg nls png spell tiff"
-
-S=${WORKDIR}/${ECVS_MODULE}
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-RESTRICT="$RESTRICT nostrip"
-
-DEPEND=">=sys-libs/ncurses-5.3
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( virtual/x11
-		gif? ( >=media-libs/libungif-4.1.0.1b )
-		jpeg? ( >=media-libs/jpeg-6b )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		png? ( >=media-libs/libpng-1.2.5 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		gnome? ( gnome-base/gnome-desktop ) )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="${PV}"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
-DFILE=emacs.desktop
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} $(use_with X x)"
-
-	if use X; then
-		myconf="${myconf} --with-xpm"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			einfo "Configuring to build with GTK support"
-			myconf="${myconf} --with-x-toolkit=gtk
-				--with-toolkit-scroll-bars"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d support"
-			myconf="${myconf} --with-x-toolkit=athena
-				--with-toolkit-scroll-bars"
-		else
-			einfo "Configuring to build without X toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-toolkit-scroll-bars"
-		fi
-	fi
-
-	unset CFLAGS CPPFLAGS
-
-	econf --enable-debug \
-		--program-suffix=-${PV} \
-		${myconf} || die
-
-	make bootstrap || die
-}
-
-src_install () {
-	einstall || die
-	rm ${D}/usr/bin/emacs-${PV}-${PV}
-
-	# fix info documentation
-	find ${D}/usr/share/info -type f -exec mv {} {}.info \;
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-
-	for m in  ${D}/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/-${PV}.1}
-	done
-
-	dodoc BUGS ChangeLog README
-
-	if use gnome; then
-		insinto /usr/share/gnome/apps/Application
-		doins ${FILESDIR}/${DFILE}
-	fi
-}
-
-# do not update alternatives
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
index 35041e526e9d..2afab5f675fd 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0.50.ebuild,v 1.1 2005/02/11 07:17:37 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.50.ebuild,v 1.2 2005/02/16 13:51:54 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -97,6 +97,7 @@ src_install () {
 	# make DESTDIR=${D} install doesn't work
 	einstall || die "einstall failed"
 	rm ${D}/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
+	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
 
 	if use aqua ; then
 		einfo "Installing Carbon Emacs..."
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.0-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
index 3b85d605ea51..985aca916a40 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.0-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0.0-r1.ebuild,v 1.1 2005/02/11 09:14:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild,v 1.1 2005/02/16 13:51:54 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -40,7 +40,7 @@ DEPEND=">=sys-libs/ncurses-5.3
 
 PROVIDE="virtual/emacs virtual/editor"
 
-SLOT="22.0.0"
+SLOT="23.0.0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc-macos"
 
@@ -97,6 +97,7 @@ src_install () {
 	# make DESTDIR=${D} install doesn't work
 	einstall || die "einstall failed"
 	rm ${D}/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
+	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
 
 	if use aqua ; then
 		einfo "Installing Carbon Emacs..."
@@ -122,7 +123,7 @@ src_install () {
 		# defaults to aspell if installed
 		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
 	fi
-	newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT}
+	newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT} || die
 
 	einfo "Fixing manpages..."
 	for m in  ${D}/usr/share/man/man1/* ; do
diff --git a/app-editors/emacs-cvs/files/50emacs-22.0.50.envd b/app-editors/emacs-cvs/files/50emacs-22.0.50.envd
new file mode 100644
index 000000000000..dfe7c9bcada1
--- /dev/null
+++ b/app-editors/emacs-cvs/files/50emacs-22.0.50.envd
@@ -0,0 +1 @@
+INFOPATH=/usr/share/info/emacs-22.0.50
diff --git a/app-editors/emacs-cvs/files/50emacs-23.0.0.envd b/app-editors/emacs-cvs/files/50emacs-23.0.0.envd
new file mode 100644
index 000000000000..41d1119fa86c
--- /dev/null
+++ b/app-editors/emacs-cvs/files/50emacs-23.0.0.envd
@@ -0,0 +1 @@
+INFOPATH=/usr/share/info/emacs-23.0.0
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.0 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.0
+++ /dev/null
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.0-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.0-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.0-r1
+++ /dev/null
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50-r2
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0
diff --git a/app-editors/emacs-cvs/files/emacs-22.0.0.desktop b/app-editors/emacs-cvs/files/emacs-23.0.0.desktop
index 610f4fab8d42..f7617c49cf5f 100644
--- a/app-editors/emacs-cvs/files/emacs-22.0.0.desktop
+++ b/app-editors/emacs-cvs/files/emacs-23.0.0.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=GNU Emacs 22.0.0
+Name=GNU Emacs 23.0.0
 Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
 Icon=gnome-emacs.png
 Terminal=0
 Type=Application
-Exec=/usr/bin/emacs-22.0.0
+Exec=/usr/bin/emacs-23.0.0