added final emacs21 and removed old

4 files changed, 67 insertions, 61 deletions

diff --git a/app-editors/emacs/emacs-21.0.103.ebuild b/app-editors/emacs/emacs-21.0.103.ebuild
deleted file mode 100644
index 4d970ae3cb06..000000000000
--- a/app-editors/emacs/emacs-21.0.103.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.0.103.ebuild,v 1.3 2001/08/31 03:23:38 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="An incredibly powerful, extensible text editor"
-SRC_URI="ftp://ftp.eecs.umich.edu/pub/NetBSD/packages/distfiles/LOCAL_PORTS/${A}"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-DEPEND=">=sys-libs/ncurses-5.2
-        X? ( virtual/x11
-             media-libs/libungif-4.1.0
-             media-libs/jpeg-6b-r2
-             media-libs/tiff-3.5.5-r3
-             media-libs/libpng-1.0.9 )
-        motif? ( >=x11-libs/openmotif-2.1.30 )
-        nls? ( >=sys-devel/gettext-0.10.35 )"
-
-PROVIDE="virtual/emacs"
-
-src_compile() {
-    local myconf
-	
-    if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-    fi 
-    if [ "`use X`" ] ; then
-		myconf="${myconf} --with-x --with-xpm --with-jpeg --with-tiff --with-gif --with-png"
-	else
-		myconf="${myconf} --without-x"
-    fi
-    if [ "`use motif`" ] ; then
-		myconf="${myconf} --with-x-toolkit=motif"
-    fi
-	
-    try ./configure --prefix=/usr --libexecdir=/usr/lib --host=${CHOST} \
-        --mandir=/usr/share/man --infodir=/usr/share/info ${myconf}
-	
-    try make ${MAKEOPTS}
-}
-
-src_install () {
-    try make prefix=${D}/usr libexecdir=${D}/usr/lib \
-	mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-    cd ${D}/usr/share/info
-    rm dir
-    for i in *
-    do
-        mv ${i%.info} $i.info
-    done
-    dodoc BUGS ChangeLog README
-}
-
-
-
-
-
diff --git a/app-editors/emacs/emacs-21.1.ebuild b/app-editors/emacs/emacs-21.1.ebuild
new file mode 100644
index 000000000000..b173ea9643ec
--- /dev/null
+++ b/app-editors/emacs/emacs-21.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Mikael Hallendal <micke@hallendal.net>
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.1.ebuild,v 1.1 2001/10/21 19:38:43 hallski Exp $
+
+
+S=${WORKDIR}/${P}
+DESCRIPTION="An incredibly powerful, extensible text editor"
+SRC_URI="ftp://ftp.codefactory.se/pub/gnu/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/emacs"
+
+DEPEND=">=sys-libs/ncurses-5.2
+        X? ( virtual/x11
+             media-libs/libungif-4.1.0
+             media-libs/jpeg-6b-r2
+             media-libs/tiff-3.5.5-r3
+             media-libs/libpng-1.0.9 )
+        motif? ( >=x11-libs/openmotif-2.1.30 )
+        nls? ( >=sys-devel/gettext-0.10.35 )"
+
+PROVIDE="virtual/emacs"
+
+src_compile() {
+	local myconf
+	
+	if [ -z "`use nls`" ] ; then
+		myconf="${myconf} --disable-nls"
+	fi 
+
+	if [ "`use X`" ] ; then
+		myconf="${myconf} --with-x --with-xpm --with-jpeg 	\
+			--with-tiff --with-gif --with-png"
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	if [ "`use motif`" ] ; then
+		myconf="${myconf} --with-x-toolkit=motif"
+	fi
+	
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --libexecdir=/usr/lib  				\
+		    --mandir=/usr/share/man				\
+		    --infodir=/usr/share/info				\
+		    ${myconf} || die
+	
+	emake || die
+}
+
+src_install () {
+	make prefix=${D}/usr						\
+	     libexecdir=${D}/usr/lib 					\
+	     mandir=${D}/usr/share/man					\
+	     infodir=${D}/usr/share/info				\
+	     install || die
+
+	cd ${D}/usr/share/info
+	rm dir
+	for i in *
+	do
+	        mv ${i%.info} $i.info
+	done
+
+	dodoc BUGS ChangeLog README
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.0.103 b/app-editors/emacs/files/digest-emacs-21.0.103
deleted file mode 100644
index 325188edb82d..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.0.103
+++ /dev/null
@@ -1 +0,0 @@
-MD5 004ce6f05ddd9332f515f870c9b71782 emacs-21.0.103.tar.gz
diff --git a/app-editors/emacs/files/digest-emacs-21.1 b/app-editors/emacs/files/digest-emacs-21.1
new file mode 100644
index 000000000000..c28eb9793ca8
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.1
@@ -0,0 +1 @@
+MD5 3e0de8cf3ffe92e04c748842f7c64e62 emacs-21.1.tar.gz