Added emacs-unicode-2 branch, partial SLOT support.

6 files changed, 250 insertions, 1 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 76b95e2887d4..b5ffcc52af48 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.20 2004/06/30 02:31:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.21 2004/07/01 18:07:26 usata Exp $
+
+*emacs-cvs-22.0.0 (02 Jul 2004)
+*emacs-cvs-21.3.50-r1 (02 Jul 2004)
+
+  02 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> +emacs-cvs-21.3.50-r1.ebuild,
+  +emacs-cvs-22.0.0.ebuild:
+  Added emacs-unicode-2 branch, partial SLOT support.
 
   29 Jun 2004; Aron Griffis <agriffis@gentoo.org> emacs-cvs-21.3.50.ebuild:
   sync IUSE (+gif, +jpeg, +png, +tiff, -gtk2)
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index b993902f688a..381d8bcbef7c 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,6 +1,15 @@
+MD5 7797f692692de7984a2f57031c66c1e2 emacs-cvs-21.3.50.ebuild 3061
+MD5 309712f0d0b230fc329593859ebac22a ChangeLog 2708
+MD5 398059236bc5dd86ce9e50849127d02b emacs-cvs-21.3.50.ebuild 3053
+MD5 18c92759e58ba5a19f5c839d7958f6ab ChangeLog 2698
 MD5 aa1b272cb2369238ca6ff9fc53f6a783 emacs-cvs-21.3.50.ebuild 3066
 MD5 91e0286d4394c059bbeb2990a4368f57 ChangeLog 2821
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 2d196910e1f338b24dac5f5509abdcaf emacs-cvs-21.3.50-r1.ebuild 2913
+MD5 6d582fbab4e9fe49870fa4735cb18130 emacs-cvs-22.0.0.ebuild 2943
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.0 0
diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild
new file mode 100644
index 000000000000..c6a51b958064
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild,v 1.1 2004/07/01 18:07:26 usata Exp $
+
+ECVS_AUTH="ext"
+export CVS_RSH="ssh"
+ECVS_SERVER="savannah.gnu.org:/cvsroot/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+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
+	sys-libs/gdbm
+	dev-python/pexpect
+	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
+}
+
+update-alternatives() {
+	for i in emacs emacsclient etags ctags b2m ebrowse \
+		rcs-checkin grep-changelog ; do
+		alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i-21.*"
+	done
+}
+
+pkg_postinst() {
+	update-alternatives
+}
+
+pkg_postrm() {
+	update-alternatives
+}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild
new file mode 100644
index 000000000000..112501bc0a12
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2004 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.1 2004/07/01 18:07:26 usata 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
+	sys-libs/gdbm
+	dev-python/pexpect
+	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/files/digest-emacs-cvs-21.3.50-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50-r1
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
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.0