6 files changed, 7 insertions, 92 deletions
diff --git a/app-emacs/httpd/Manifest b/app-emacs/httpd/Manifest
index fd82a9731a3c..133ebcd297e8 100644
--- a/app-emacs/httpd/Manifest
+++ b/app-emacs/httpd/Manifest
@@ -1,49 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.0-open-network-strea-server-gentoo.patch 752 RMD160 387f719d66ddb2570bf343dc3617efeec74a8a92 SHA1 109637c6fc0c5f3c41a411e9092965e1b87e143e SHA256 a54d27cc5a72fdee48b60320d3713704424e82061f2d2432b44cd505b1638e7d size 752
-MD5 f26d671b5aa250f1d1beee111c1ee922 files/1.0-open-network-strea-server-gentoo.patch 752
-RMD160 387f719d66ddb2570bf343dc3617efeec74a8a92 files/1.0-open-network-strea-server-gentoo.patch 752
-SHA256 a54d27cc5a72fdee48b60320d3713704424e82061f2d2432b44cd505b1638e7d files/1.0-open-network-strea-server-gentoo.patch 752
 AUX 50httpd-gentoo.el 74 RMD160 75a7d36cd1f2e9b483011e536b71fdd1909d0d97 SHA1 8abfd64694d8392ba412d230f09b0f2dc7b29110 SHA256 29c0f6b0d249e0cccb204bfaf9952b35b16771887fadedda0ae3e5e7b4d3fcd6 size 74
 MD5 187a5ade021e7bc1aac19e09158aaac1 files/50httpd-gentoo.el 74
 RMD160 75a7d36cd1f2e9b483011e536b71fdd1909d0d97 files/50httpd-gentoo.el 74
 SHA256 29c0f6b0d249e0cccb204bfaf9952b35b16771887fadedda0ae3e5e7b4d3fcd6 files/50httpd-gentoo.el 74
-DIST httpd-1.0.tar.gz 3620 RMD160 e9896cd8f3bda90a41fc07a81b876beacd5ce12d SHA256 2d5c4de259fc0ef3f513582c88d9eba195c443aa786cc18119709f2dc9b430a6 size 3620
 DIST httpd-1.1.tar.gz 3770 RMD160 cc79649d126b19c9ff23e7f1841899b4260f7785 SHA256 e94aa61dada1a289eec2ea5d3d7e5056aee34064fdafdf6cbea1d5b279f2ff81 size 3770
-EBUILD httpd-1.0-r1.ebuild 573 RMD160 aaa08fcf7b9ad8a96bcd38651da94e2677947229 SHA1 61e1ef026ae4c6eb828c5261c82ea7290c489a5b SHA256 98779ab87e1d1229281e1de1a600268b0ab18d417b59a72ec8ee47695096caea size 573
-MD5 4cc25da393e853be2f0a1b7c0269ed42 httpd-1.0-r1.ebuild 573
-RMD160 aaa08fcf7b9ad8a96bcd38651da94e2677947229 httpd-1.0-r1.ebuild 573
-SHA256 98779ab87e1d1229281e1de1a600268b0ab18d417b59a72ec8ee47695096caea httpd-1.0-r1.ebuild 573
-EBUILD httpd-1.0.ebuild 466 RMD160 fdb6f81afefb1b1bb225abae144309883dcb4e11 SHA1 00f61b6bdb3176b2685c989db6584e897ee211a9 SHA256 6e6625daa7a54df40d125f0671201f42ceff31e28e4b38ab016eb63f4e2f945b size 466
-MD5 241162c7a1e8bbeaebed15648e16c443 httpd-1.0.ebuild 466
-RMD160 fdb6f81afefb1b1bb225abae144309883dcb4e11 httpd-1.0.ebuild 466
-SHA256 6e6625daa7a54df40d125f0671201f42ceff31e28e4b38ab016eb63f4e2f945b httpd-1.0.ebuild 466
 EBUILD httpd-1.1.ebuild 474 RMD160 e8b16fb79229542de36407fc1cd93cc3ca37ad66 SHA1 f0ba19b022fc2403f956a0b8d2e82ca9aa4eb132 SHA256 4a09364b9e3d945f5b5ba2ae681c7b168a7cc3bbd4f9d1411a6726234dae404b size 474
 MD5 4468985d40d171999fe21b28df65edb2 httpd-1.1.ebuild 474
 RMD160 e8b16fb79229542de36407fc1cd93cc3ca37ad66 httpd-1.1.ebuild 474
 SHA256 4a09364b9e3d945f5b5ba2ae681c7b168a7cc3bbd4f9d1411a6726234dae404b httpd-1.1.ebuild 474
-MISC ChangeLog 1305 RMD160 925016367e7466219f9b69ba399644bd945c20c9 SHA1 de310709ab8fd932884c791b6b8b1a45c956c20a SHA256 77aa5a69d4eb58f11063a7527aa597e9b5124192de58fea7e04f68cc56958c1a size 1305
-MD5 49a681a194abc4567f504b1c50fd296f ChangeLog 1305
-RMD160 925016367e7466219f9b69ba399644bd945c20c9 ChangeLog 1305
-SHA256 77aa5a69d4eb58f11063a7527aa597e9b5124192de58fea7e04f68cc56958c1a ChangeLog 1305
+MISC ChangeLog 1500 RMD160 13bc288cbb89915f368c97c095675311da963863 SHA1 2cc3c084c95c9e6128bd61d5d0c8487f4f757369 SHA256 a1491757d2849ef51a14ae713329fa1b025dec5b7fed6dd721c1b2fd5b546569 size 1500
+MD5 c15cd2e2c1d2fb73a1215da9ca7f0b43 ChangeLog 1500
+RMD160 13bc288cbb89915f368c97c095675311da963863 ChangeLog 1500
+SHA256 a1491757d2849ef51a14ae713329fa1b025dec5b7fed6dd721c1b2fd5b546569 ChangeLog 1500
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab size 158
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 257590d64be26abd006a110eb331dc3e files/digest-httpd-1.0 223
-RMD160 173e8f672d7b3a742aa12dcc2c8d513a6c3d0fb2 files/digest-httpd-1.0 223
-SHA256 b4c36cfc94e50ad3557e557b915474a9de203d802969691a135ef1c43aa238b4 files/digest-httpd-1.0 223
-MD5 257590d64be26abd006a110eb331dc3e files/digest-httpd-1.0-r1 223
-RMD160 173e8f672d7b3a742aa12dcc2c8d513a6c3d0fb2 files/digest-httpd-1.0-r1 223
-SHA256 b4c36cfc94e50ad3557e557b915474a9de203d802969691a135ef1c43aa238b4 files/digest-httpd-1.0-r1 223
 MD5 3490f29798a2606b00ca325627a6014e files/digest-httpd-1.1 223
 RMD160 9e91392b81763ace7fbb2ae2093c4e08ddce97d3 files/digest-httpd-1.1 223
 SHA256 26eb6663f229448a8e40103f01c4e3074b2fc42a149346272eef4b215d9477d1 files/digest-httpd-1.1 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEXmoRCRZPokWLroQRAoaWAJ9CncJeo55B95c6wJQGIFxNjGP3hwCfT3hk
-UW/OZkwSFsdXFCOjEczJUJQ=
-=k74g
+iD8DBQFEaKoAyiNZaEAZA+ARAsKSAJ9UlBfZO8j3/G68DlUOmkZW+UsldQCfVPyq
+FzS/RB5HMYcSYH5K4UMTF1A=
+=N1Hn
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/httpd/files/1.0-open-network-strea-server-gentoo.patch b/app-emacs/httpd/files/1.0-open-network-strea-server-gentoo.patch
deleted file mode 100644
index 44706bb18fac..000000000000
--- a/app-emacs/httpd/files/1.0-open-network-strea-server-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur httpd-1.0.orig/httpd.el httpd-1.0/httpd.el
---- httpd-1.0.orig/httpd.el	2005-02-01 01:41:38.000000000 -0600
-+++ httpd-1.0/httpd.el	2006-04-26 12:55:47.000000000 -0500
-@@ -44,6 +44,21 @@
- 
- ;;; Code
- 
-+;; The following top-level form from
-+;; http://bugs.gentoo.org/show_bug.cgi?id=125322
-+
-+(eval-and-compile 
-+  (unless (fboundp 'open-network-stream-server)
-+    (defun open-network-stream-server (proc buff port sentl filtr)
-+      "Compatibility function for httpd.el on newer emacsen"
-+      (make-network-process :server t
-+			    :name proc
-+			    :buffer buff
-+			    :host "localhost"
-+			    :service port
-+			    :sentinel sentl
-+			    :filter filtr))))
-+
- (defvar httpd-document-root "/var/www")
- 
- (defvar httpd-path-handlers '()
diff --git a/app-emacs/httpd/files/digest-httpd-1.0 b/app-emacs/httpd/files/digest-httpd-1.0
deleted file mode 100644
index 024bc20e56f2..000000000000
--- a/app-emacs/httpd/files/digest-httpd-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ce522286683934172d947c3da8205882 httpd-1.0.tar.gz 3620
-RMD160 e9896cd8f3bda90a41fc07a81b876beacd5ce12d httpd-1.0.tar.gz 3620
-SHA256 2d5c4de259fc0ef3f513582c88d9eba195c443aa786cc18119709f2dc9b430a6 httpd-1.0.tar.gz 3620
diff --git a/app-emacs/httpd/files/digest-httpd-1.0-r1 b/app-emacs/httpd/files/digest-httpd-1.0-r1
deleted file mode 100644
index 024bc20e56f2..000000000000
--- a/app-emacs/httpd/files/digest-httpd-1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ce522286683934172d947c3da8205882 httpd-1.0.tar.gz 3620
-RMD160 e9896cd8f3bda90a41fc07a81b876beacd5ce12d httpd-1.0.tar.gz 3620
-SHA256 2d5c4de259fc0ef3f513582c88d9eba195c443aa786cc18119709f2dc9b430a6 httpd-1.0.tar.gz 3620
diff --git a/app-emacs/httpd/httpd-1.0-r1.ebuild b/app-emacs/httpd/httpd-1.0-r1.ebuild
deleted file mode 100644
index a64b510dd3d5..000000000000
--- a/app-emacs/httpd/httpd-1.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/httpd/httpd-1.0-r1.ebuild,v 1.1 2006/04/26 17:58:40 mkennedy Exp $
-
-inherit elisp eutils
-
-DESCRIPTION="A HTTP server embedded in the Emacs"
-HOMEPAGE="http://www.chez.com/emarsden/downloads/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-SITEFILE=50httpd-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-open-network-strea-server-gentoo.patch
-}
diff --git a/app-emacs/httpd/httpd-1.0.ebuild b/app-emacs/httpd/httpd-1.0.ebuild
deleted file mode 100644
index 3d84cc5ac9b8..000000000000
--- a/app-emacs/httpd/httpd-1.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/httpd/httpd-1.0.ebuild,v 1.5 2006/05/07 21:43:36 halcy0n Exp $
-
-inherit elisp
-
-DESCRIPTION="A HTTP server embedded in the Emacs"
-HOMEPAGE="http://www.chez.com/emarsden/downloads/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-SITEFILE=50httpd-gentoo.el