9 files changed, 43 insertions, 134 deletions
diff --git a/app-editors/e3/ChangeLog b/app-editors/e3/ChangeLog
index 06427aa7c662..d2d6cafe06b2 100644
--- a/app-editors/e3/ChangeLog
+++ b/app-editors/e3/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-editors/e3
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/ChangeLog,v 1.17 2007/05/25 06:38:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/ChangeLog,v 1.18 2007/06/17 11:13:57 opfer Exp $
+
+  17 Jun 2007; Christian Faulhammer <opfer@gentoo.org> metadata.xml,
+  +e3-2.7.0.ebuild, -e3-2.70.ebuild, -e3-2.41.ebuild, -e3-2.42.ebuild:
+  emacs team has taken this one over
+  change Ebuild name, so we can get rid of MY_PV variable
+  add some quotes around variables
+  do a simpler installation of man page
+  kill build USE flag to avoid file collisions
+  remove an unecessary dodir
+  change RESTRICT from nostrip to strip
+  add amd64 support
+  add PROVIDE=virtual/editor
+  clean up
 
   25 May 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
   corrected ChangeLog, so it conforms to our standards
diff --git a/app-editors/e3/e3-2.41.ebuild b/app-editors/e3/e3-2.41.ebuild
deleted file mode 100644
index 2db33ef8cf36..000000000000
--- a/app-editors/e3/e3-2.41.ebuild
+++ /dev/null
@@ -1,40 +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/e3/e3-2.41.ebuild,v 1.6 2005/01/01 13:23:04 eradicator Exp $
-
-DESCRIPTION="Super Tiny Editor with wordstar, vi, and emacs key bindings"
-HOMEPAGE="http://www.sax.de/~adlibit"
-SRC_URI="http://www.sax.de/~adlibit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-IUSE="build"
-RESTRICT="nostrip"
-
-DEPEND="dev-lang/nasm"
-RDEPEND="sys-apps/sed"
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin e3 || die
-	dosym e3 /usr/bin/e3vi
-	dosym e3 /usr/bin/e3em
-	dosym e3 /usr/bin/e3ws
-	dosym e3 /usr/bin/e3pi
-	dosym e3 /usr/bin/e3ne
-	if use build ; then
-		# easier-to-remember shell scripts
-		dobin ${FILESDIR}/vi
-		# this one is more trouble than its worth --woodchip
-		# dobin ${FILESDIR}/emacs
-		dobin ${FILESDIR}/pico
-		newbin ${FILESDIR}/pico nano
-	fi
-	cp e3.man e3.1
-	doman e3.1
-}
diff --git a/app-editors/e3/e3-2.42.ebuild b/app-editors/e3/e3-2.42.ebuild
deleted file mode 100644
index bf5f9fef2f12..000000000000
--- a/app-editors/e3/e3-2.42.ebuild
+++ /dev/null
@@ -1,40 +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/e3/e3-2.42.ebuild,v 1.6 2005/01/01 13:23:04 eradicator Exp $
-
-DESCRIPTION="Super Tiny Editor with wordstar, vi, and emacs key bindings"
-HOMEPAGE="http://www.sax.de/~adlibit"
-SRC_URI="http://www.sax.de/~adlibit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build"
-RESTRICT="nostrip"
-
-DEPEND="dev-lang/nasm"
-RDEPEND="sys-apps/sed"
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin e3 || die
-	dosym e3 /usr/bin/e3vi
-	dosym e3 /usr/bin/e3em
-	dosym e3 /usr/bin/e3ws
-	dosym e3 /usr/bin/e3pi
-	dosym e3 /usr/bin/e3ne
-	if use build ; then
-		# easier-to-remember shell scripts
-		dobin ${FILESDIR}/vi
-		# this one is more trouble than its worth --woodchip
-		# dobin ${FILESDIR}/emacs
-		dobin ${FILESDIR}/pico
-		newbin ${FILESDIR}/pico nano
-	fi
-	cp e3.man e3.1
-	doman e3.1
-}
diff --git a/app-editors/e3/e3-2.7.0.ebuild b/app-editors/e3/e3-2.7.0.ebuild
new file mode 100644
index 000000000000..9913c32fa4a3
--- /dev/null
+++ b/app-editors/e3/e3-2.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.7.0.ebuild,v 1.3 2007/06/17 11:13:57 opfer Exp $
+
+DESCRIPTION="Very tiny editor in x86 ASM with emacs, pico, wordstar, and vi keybindings"
+HOMEPAGE="http://www.sax.de/~adlibit/"
+SRC_URI="http://www.sax.de/~adlibit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND="dev-lang/nasm"
+RDEPEND=""
+PROVIDE="virtual/editor"
+
+src_install() {
+	use amd64 && newbin ${S}/bin/Linux_x86-64/e3 e3 || die "newbin failed"
+	use x86 && newbin ${S}/bin/Linux/e3 e3 || die "newbin failed"
+	dosym e3 /usr/bin/e3vi
+	dosym e3 /usr/bin/e3em
+	dosym e3 /usr/bin/e3ws
+	dosym e3 /usr/bin/e3pi
+	dosym e3 /usr/bin/e3ne
+	newman e3.man e3.1
+}
diff --git a/app-editors/e3/e3-2.70.ebuild b/app-editors/e3/e3-2.70.ebuild
deleted file mode 100644
index 495763956297..000000000000
--- a/app-editors/e3/e3-2.70.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.70.ebuild,v 1.1 2007/01/06 00:16:40 masterdriverz Exp $
-
-inherit versionator
-
-MY_PV="2.7.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Very tiny editor in x86 ASM with emacs, pico, and vi keybindings"
-HOMEPAGE="http://www.sax.de/~adlibit/"
-SRC_URI="http://www.sax.de/~adlibit/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE="build"
-RESTRICT="nostrip"
-
-DEPEND="dev-lang/nasm"
-RDEPEND="sys-apps/sed"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	dodir /usr/bin
-	dobin e3 || die
-	dosym e3 /usr/bin/e3vi
-	dosym e3 /usr/bin/e3em
-	dosym e3 /usr/bin/e3ws
-	dosym e3 /usr/bin/e3pi
-	dosym e3 /usr/bin/e3ne
-	if use build ; then
-		# easier-to-remember shell scripts
-		dobin ${FILESDIR}/vi
-		# this one is more trouble than its worth --woodchip
-		# dobin ${FILESDIR}/emacs
-		dobin ${FILESDIR}/pico
-		newbin ${FILESDIR}/pico nano
-	fi
-	cp e3.man e3.1
-	doman e3.1
-}
diff --git a/app-editors/e3/files/digest-e3-2.41 b/app-editors/e3/files/digest-e3-2.41
deleted file mode 100644
index 4dd5d25875ff..000000000000
--- a/app-editors/e3/files/digest-e3-2.41
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 498a1d04130f4e8c6efe2ec9100eef3b e3-2.41.tar.gz 215121
-RMD160 f7f487a7afb74dff8db81dd1f5212b371db24ddd e3-2.41.tar.gz 215121
-SHA256 ede67e0eae54b70edc7a2d5b15308178f010c725556311ab96506643e3c39b8b e3-2.41.tar.gz 215121
diff --git a/app-editors/e3/files/digest-e3-2.42 b/app-editors/e3/files/digest-e3-2.42
deleted file mode 100644
index acf4857494fd..000000000000
--- a/app-editors/e3/files/digest-e3-2.42
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 80a1ffa6a25682881ad8be71077ed03d e3-2.42.tar.gz 215392
-RMD160 80f5076216a181c86277a381c47414fb25f968e6 e3-2.42.tar.gz 215392
-SHA256 24ff717f84a6473b512ec7de4d8e393cd30b43ea1503a4c8b6dba1dcc0e4a9ff e3-2.42.tar.gz 215392
diff --git a/app-editors/e3/files/digest-e3-2.70 b/app-editors/e3/files/digest-e3-2.7.0
index faeff2d3cb07..faeff2d3cb07 100644
--- a/app-editors/e3/files/digest-e3-2.70
+++ b/app-editors/e3/files/digest-e3-2.7.0
diff --git a/app-editors/e3/metadata.xml b/app-editors/e3/metadata.xml
index 54494c4bb860..bc306fe58224 100644
--- a/app-editors/e3/metadata.xml
+++ b/app-editors/e3/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+<herd>emacs</herd>
 </pkgmetadata>