Changed SLOT="0" to SLOT="21", see bug #65061. Removed old versions.

9 files changed, 21 insertions, 221 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 75dd840de5bf..6affcf988e20 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.36 2004/09/24 14:03:01 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.37 2004/09/29 15:41:09 usata Exp $
+
+  30 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> -emacs-21.1-r4.ebuild,
+  -emacs-21.2-r2.ebuild, emacs-21.3-r2.ebuild, emacs-21.3-r3.ebuild,
+  emacs-21.3-r4.ebuild:
+  Changed SLOT="0" to SLOT="21", see bug #65061. Removed old versions.
 
   24 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> emacs-21.3-r3.ebuild:
   Stable on sparc
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index cc301c2cc955..f66a1f3c7b06 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,19 +1,15 @@
-MD5 9b9c571aa322958471f627923b246179 ChangeLog 5502
-MD5 4ff8a8c4e69f80929f2c1f7aac9a7dd3 emacs-18.59.ebuild 2002
-MD5 815768d41e602e71dd2e51d9f336796f emacs-21.1-r4.ebuild 2139
-MD5 2a994cbeab581cade6f48cfd07ce4230 emacs-21.2-r2.ebuild 1828
-MD5 bdcb878b55a46901a9918a1abba53e75 emacs-21.3-r3.ebuild 2519
-MD5 7d975de4f15aed0d378b05aac474de1d emacs-21.3-r2.ebuild 2189
+MD5 add5094f6895306c081261aebb25ade3 ChangeLog 5736
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 26c8804e7f98cba805dab963a4d4af26 emacs-21.3-r4.ebuild 3242
-MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
-MD5 da1e3cd3b08e0f57770ac6bb3a900a37 files/digest-emacs-21.1-r4 64
-MD5 e8ce9306bc0d26ebc1d4cd6c6c7765d8 files/digest-emacs-21.2-r2 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
+MD5 7c1bb3b83cc8d65547925c15dd605a71 emacs-21.3-r2.ebuild 2190
+MD5 4ff8a8c4e69f80929f2c1f7aac9a7dd3 emacs-18.59.ebuild 2002
+MD5 f097ee82a24ea78193c970b669f67dd8 emacs-21.3-r3.ebuild 2518
+MD5 450e70c9330d0f3e2f02c01682c77fab emacs-21.3-r4.ebuild 3239
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
 MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
 MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
-MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
 MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
diff --git a/app-editors/emacs/emacs-21.1-r4.ebuild b/app-editors/emacs/emacs-21.1-r4.ebuild
deleted file mode 100644
index c337029e8dd9..000000000000
--- a/app-editors/emacs/emacs-21.1-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.1-r4.ebuild,v 1.22 2004/06/24 21:53:36 agriffis Exp $
-
-IUSE="X nls motif"
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	sys-libs/gdbm
-	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.2.1
-		motif? ( >=x11-libs/openmotif-2.1.30 )
-	)
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-LICENSE="GPL-2"
-
-src_unpack() {
-
-	# Resolves bug 2104 # ppc fix
-
-	SYSTEM_ARCH=`echo $ARCH |\
-	sed -e s/[i]*.86/i386/ -e s/sun4u/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/`
-	if [ -z "$SYSTEM_ARCH" ]
-	then
-	 SYSTEM_ARCH=`uname -m |\
-	 sed -e s/[i]*.86/i386/ -e s/sun4u/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/`
-	fi
-
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	case $SYSTEM_ARCH in
-	 ppc)
-	  cat ${FILESDIR}/emacs-21.1-gentoo.diff | patch -p1 || die
-	  ;;
-	 i386)
-	  ;;
-	sparc)
-	  ;;
-	 arm)
-	  ;;
-	esac
-}
-
-
-src_compile() {
-	local myconf
-
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	use X \
-		&& myconf="${myconf} \
-			--with-x \
-			--with-xpm \
-			--with-jpeg \
-			--with-tiff \
-			--with-gif \
-			--with-png" \
-		|| myconf="${myconf} --without-x"
-
-	use motif \
-		&& myconf="${myconf} --with-x-toolkit=motif"
-
-	./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
-
-	# Gives a warning if it doesn't exist
-	keepdir /usr/share/emacs/21.1/leim
-}
diff --git a/app-editors/emacs/emacs-21.2-r2.ebuild b/app-editors/emacs/emacs-21.2-r2.ebuild
deleted file mode 100644
index bd93dd22d910..000000000000
--- a/app-editors/emacs/emacs-21.2-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2-r2.ebuild,v 1.17 2004/06/24 21:53:36 agriffis Exp $
-
-IUSE="X nls motif leim"
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	sys-libs/gdbm
-	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.2.1
-		motif? ( >=x11-libs/openmotif-2.1.30 )
-	)
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha"
-
-src_compile() {
-	local myconf
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	use X \
-		&& myconf="${myconf} \
-			--with-x \
-			--with-xpm \
-			--with-jpeg \
-			--with-tiff \
-			--with-gif \
-			--with-png" \
-		|| myconf="${myconf} --without-x"
-
-	use motif \
-		&& myconf="${myconf} --with-x-toolkit=motif"
-
-	./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
-
-	pushd ${D}/usr/share/info
-	rm dir
-	for i in *
-	do
-		mv ${i%.info} $i.info
-	done
-	popd
-
-	einfo "Fixing permissions"
-	find ${D} -perm 666 |xargs chmod 644
-	find ${D} -perm 777 |xargs chmod 755
-
-	dodoc BUGS ChangeLog README
-
-	# Gives a warning if it doesn't exist
-	keepdir /usr/share/emacs/21.2/leim
-}
diff --git a/app-editors/emacs/emacs-21.3-r2.ebuild b/app-editors/emacs/emacs-21.3-r2.ebuild
index e3ae04c0d53c..f3f314bd6562 100644
--- a/app-editors/emacs/emacs-21.3-r2.ebuild
+++ b/app-editors/emacs/emacs-21.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r2.ebuild,v 1.16 2004/07/04 14:15:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r2.ebuild,v 1.17 2004/09/29 15:41:09 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="21"
 KEYWORDS="x86 ppc sparc alpha amd64 hppa ia64 s390"
 IUSE="X nls motif leim gnome Xaw3d"
 
diff --git a/app-editors/emacs/emacs-21.3-r3.ebuild b/app-editors/emacs/emacs-21.3-r3.ebuild
index e3b112755b2a..ba4ba1f12d13 100644
--- a/app-editors/emacs/emacs-21.3-r3.ebuild
+++ b/app-editors/emacs/emacs-21.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r3.ebuild,v 1.9 2004/09/24 14:03:01 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r3.ebuild,v 1.10 2004/09/29 15:41:09 usata Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="21"
 KEYWORDS="x86 ppc sparc -alpha arm -hppa ~amd64 -ia64 ~s390"
 IUSE="X nls motif leim gnome Xaw3d lesstif"
 
diff --git a/app-editors/emacs/emacs-21.3-r4.ebuild b/app-editors/emacs/emacs-21.3-r4.ebuild
index dc7b41898feb..b3c4a4d048cc 100644
--- a/app-editors/emacs/emacs-21.3-r4.ebuild
+++ b/app-editors/emacs/emacs-21.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r4.ebuild,v 1.5 2004/09/23 04:45:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r4.ebuild,v 1.6 2004/09/29 15:41:09 usata Exp $
 
 inherit flag-o-matic eutils alternatives gcc
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
-SLOT="${PV}"
+SLOT="21"
 KEYWORDS="~x86 ~ppc ~sparc -alpha ~arm -hppa ~amd64 -ia64 ~s390 ppc64"
 IUSE="X nls motif leim gnome Xaw3d lesstif"
 
diff --git a/app-editors/emacs/files/digest-emacs-21.1-r4 b/app-editors/emacs/files/digest-emacs-21.1-r4
deleted file mode 100644
index 1843fde85cb6..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e0de8cf3ffe92e04c748842f7c64e62 emacs-21.1.tar.gz 20321444
diff --git a/app-editors/emacs/files/digest-emacs-21.2-r2 b/app-editors/emacs/files/digest-emacs-21.2-r2
deleted file mode 100644
index 0f5a9424089e..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f4b58e5c2d923fc92495e0c2f167c5db emacs-21.2.tar.gz 20288222
-MD5 e6d614671b5d7d7670d18799c6668a46 leim-21.2.tar.gz 3291283