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

Package-Manager: portage-2.1.2.7

10 files changed, 61 insertions, 168 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/Manifest b/app-editors/e3/Manifest
index 203229a25e3c..2ffe5a4e3b99 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -13,50 +13,34 @@ AUX vi 282 RMD160 0d1759f5839ebafd61f606fe85ebfcb7aa1d4144 SHA1 55b0b984742ea9e5
 MD5 19815bd005f714adf48fa2359e708879 files/vi 282
 RMD160 0d1759f5839ebafd61f606fe85ebfcb7aa1d4144 files/vi 282
 SHA256 00b98417b4a857e237ad9d6f8c66e0637f6a93274f664ff9341ac74607059a35 files/vi 282
-DIST e3-2.41.tar.gz 215121 RMD160 f7f487a7afb74dff8db81dd1f5212b371db24ddd SHA1 23796ff9484d74b56b6b2a2de48d332e23085800 SHA256 ede67e0eae54b70edc7a2d5b15308178f010c725556311ab96506643e3c39b8b
-DIST e3-2.42.tar.gz 215392 RMD160 80f5076216a181c86277a381c47414fb25f968e6 SHA1 24575f5077ce779fc22dd7d9f3fb4540eafcee4f SHA256 24ff717f84a6473b512ec7de4d8e393cd30b43ea1503a4c8b6dba1dcc0e4a9ff
 DIST e3-2.43.tar.gz 215540 RMD160 411f6708b9bfc34b4e7998baa9a3f169ef4a3901 SHA1 119ffb9418e429d02bf2e091ffcb73e5f8dc2055 SHA256 365a97f60bb077a0164b13c14d4886d5a68139c107d75acd4b360800d5506a9b
 DIST e3-2.7.0.tar.gz 239477 RMD160 4faf15dff1b44ed15faad1946c56aed13f12373c SHA1 6e3b19782ea2ecda23a4fe45b4ae6709b76312cb SHA256 ab45362282b3b3e987ef40a0c6b300aa7267fcc0bb1f9879d09bbb6445eec18d
-EBUILD e3-2.41.ebuild 966 RMD160 1bdfa4aee2499de9acd8d046d19b2d69f2f49a99 SHA1 794bce1584430d7ab3c9e61ba56761ecdc8b1dfa SHA256 116f4edaea47fcdb0379f47b5b8127a47c98eecceadef483ad27dc43a389bd35
-MD5 ef1951a0288a819bf31d68774e1e4254 e3-2.41.ebuild 966
-RMD160 1bdfa4aee2499de9acd8d046d19b2d69f2f49a99 e3-2.41.ebuild 966
-SHA256 116f4edaea47fcdb0379f47b5b8127a47c98eecceadef483ad27dc43a389bd35 e3-2.41.ebuild 966
-EBUILD e3-2.42.ebuild 957 RMD160 d5772b9d73e6e4832beeff4af1fb22ce63b253d3 SHA1 b0b9b2ab995672b3ad2c74b664739afbdc974c96 SHA256 f1d121c7e7b396dd5d93695c1d0c58d0b65df1692f10c5085b84619a9dce7016
-MD5 e2294b175bdb0067a105347c13db8725 e3-2.42.ebuild 957
-RMD160 d5772b9d73e6e4832beeff4af1fb22ce63b253d3 e3-2.42.ebuild 957
-SHA256 f1d121c7e7b396dd5d93695c1d0c58d0b65df1692f10c5085b84619a9dce7016 e3-2.42.ebuild 957
 EBUILD e3-2.43.ebuild 963 RMD160 37e66c042d3a7899881fb3c76425d54a88b6c4aa SHA1 e68cc4d827c5afc80c8ce62c341c71b5e032211e SHA256 5351fda838a03918ba211f9fcc4c2a3f777c262b08c42cfc0fb8a8b19746313a
 MD5 92656ffeb0824f6a3179b60415448868 e3-2.43.ebuild 963
 RMD160 37e66c042d3a7899881fb3c76425d54a88b6c4aa e3-2.43.ebuild 963
 SHA256 5351fda838a03918ba211f9fcc4c2a3f777c262b08c42cfc0fb8a8b19746313a e3-2.43.ebuild 963
-EBUILD e3-2.70.ebuild 1019 RMD160 78a15e39a1a50dfdedf007d5c9c426cb976bd4f5 SHA1 4bd6b9a6770943e4247356fc90edd6bcced85277 SHA256 bdb31624216ddc258ab20803a6e02880ab58a3011b85874ee679a6464bc188bd
-MD5 deb4c9facb65251ebe71df79d857a0d1 e3-2.70.ebuild 1019
-RMD160 78a15e39a1a50dfdedf007d5c9c426cb976bd4f5 e3-2.70.ebuild 1019
-SHA256 bdb31624216ddc258ab20803a6e02880ab58a3011b85874ee679a6464bc188bd e3-2.70.ebuild 1019
-MISC ChangeLog 2087 RMD160 65de9f337e2c67a990d05515006c0f0428c5e9c0 SHA1 d374c03536372682374be332bf17596ebdc67da6 SHA256 824fe77dfa6a86a0b87d1a098f5f2a1d1090b8ecb7e8e608b7b33d274906b41c
-MD5 a23d5b059488b316af60b72d4b3e86d0 ChangeLog 2087
-RMD160 65de9f337e2c67a990d05515006c0f0428c5e9c0 ChangeLog 2087
-SHA256 824fe77dfa6a86a0b87d1a098f5f2a1d1090b8ecb7e8e608b7b33d274906b41c ChangeLog 2087
-MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
-MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
-RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
-SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
-MD5 df5bdb6e8ea9aacdf27cccad0c17b1ec files/digest-e3-2.41 223
-RMD160 6daa221a257876187a182d5ab158fd497d3437ac files/digest-e3-2.41 223
-SHA256 cefdc1b943a2b3f451f2713b6bbb0faf8625b799fa68beae5e696f5f12d1df38 files/digest-e3-2.41 223
-MD5 703e3ecd0757bed5cbb221872c116cda files/digest-e3-2.42 223
-RMD160 29bfa84e00ec8966eb107c809fab63f248be23db files/digest-e3-2.42 223
-SHA256 8743b6e4119149c7b3b8e565394c2da2c47e33ed1eb18bc177f13c70466d1157 files/digest-e3-2.42 223
+EBUILD e3-2.7.0.ebuild 819 RMD160 0d6443f75edeba1419292a4de59909b9a66e9cd5 SHA1 fab783398c57d1e3474d3e34d3fe3c80fb724ec4 SHA256 123593cc80078dc6f916c4fb34293c1041b34c9eda284986a3e3c96ba95c8428
+MD5 877dba1c9309d8f35d669ed7f0ec8cd2 e3-2.7.0.ebuild 819
+RMD160 0d6443f75edeba1419292a4de59909b9a66e9cd5 e3-2.7.0.ebuild 819
+SHA256 123593cc80078dc6f916c4fb34293c1041b34c9eda284986a3e3c96ba95c8428 e3-2.7.0.ebuild 819
+MISC ChangeLog 2574 RMD160 8ba9362640963f76eaad7f2f6e5f647e71afe081 SHA1 adb4631a5af373f36917219fd20451ed233bad5d SHA256 926443023ff86d2e4095143d660b96eca136b393452c07354539fec8c76cbe94
+MD5 3d1b0f0acbb18586f2b701255bac2813 ChangeLog 2574
+RMD160 8ba9362640963f76eaad7f2f6e5f647e71afe081 ChangeLog 2574
+SHA256 926443023ff86d2e4095143d660b96eca136b393452c07354539fec8c76cbe94 ChangeLog 2574
+MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
+SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
 MD5 40f3de33f43a3dcd4cf68ee512ca716a files/digest-e3-2.43 223
 RMD160 9f16901782ae22ae50ee980451f225aec318b699 files/digest-e3-2.43 223
 SHA256 f1e91c25d10d40f65efa92e856bdd8a1bbba1f4009308a4bb09e39f3ccbf0418 files/digest-e3-2.43 223
-MD5 f923c7a6d87d2a088fb65df86e63755e files/digest-e3-2.70 226
-RMD160 b83e6d94c231a49e64c510639ea4ae264033d3f4 files/digest-e3-2.70 226
-SHA256 bd19b6f3a1f147928342c58b5c7b678ac9d61855ae1aa4de3e9443d536afb7b3 files/digest-e3-2.70 226
+MD5 f923c7a6d87d2a088fb65df86e63755e files/digest-e3-2.7.0 226
+RMD160 b83e6d94c231a49e64c510639ea4ae264033d3f4 files/digest-e3-2.7.0 226
+SHA256 bd19b6f3a1f147928342c58b5c7b678ac9d61855ae1aa4de3e9443d536afb7b3 files/digest-e3-2.7.0 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGVoR9NQqtfCuFneMRAidEAJ46jTRYTe4z0mABzSxqE6Td5sUd/QCgkj2d
-i3FP/SlZXL9acXnBDcr2UYY=
-=TAuL
+iD8DBQFGdRd6NQqtfCuFneMRAnjHAJ0ZzDxxRbVgCx0WZ9TuzrwPMXSYwgCfdTz2
+4U7uHU6twWdeUqC4Jt/sFzs=
+=5Cbe
 -----END PGP SIGNATURE-----
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>