Add compatibility function: open-network-stream-server; Resolves Bug #125322.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 80 insertions, 7 deletions

diff --git a/app-emacs/httpd/ChangeLog b/app-emacs/httpd/ChangeLog
index e0f23a375f2f..1f3af7e23b13 100644
--- a/app-emacs/httpd/ChangeLog
+++ b/app-emacs/httpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/httpd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/httpd/ChangeLog,v 1.8 2005/10/24 14:14:08 josejx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/httpd/ChangeLog,v 1.9 2006/04/26 17:58:40 mkennedy Exp $
+
+*httpd-1.0-r1 (26 Apr 2006)
+
+  26 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.0-open-network-strea-server-gentoo.patch, +httpd-1.0-r1.ebuild:
+  Add compatibility function: open-network-stream-server; Resolves Bug #125322.
 
   24 Oct 2005; Joseph Jezak <josejx@gentoo.org> httpd-1.0.ebuild:
   Marked ~ppc.
diff --git a/app-emacs/httpd/Manifest b/app-emacs/httpd/Manifest
index 822164827e57..52a5ad17e64d 100644
--- a/app-emacs/httpd/Manifest
+++ b/app-emacs/httpd/Manifest
@@ -1,15 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 698b685e80283c66ad3ba3c973a65fbd ChangeLog 841
+MD5 7bdfeda56f09766cfd1cbfe4767319da ChangeLog 1081
+RMD160 acfd1aa4bdf38245248d952569d0d4b7e400a6ef ChangeLog 1081
+SHA256 e9172425d632a3e455db7c71bb53984f5897e6fba4bdb563a86f125fbdb78841 ChangeLog 1081
+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
 MD5 187a5ade021e7bc1aac19e09158aaac1 files/50httpd-gentoo.el 74
+RMD160 75a7d36cd1f2e9b483011e536b71fdd1909d0d97 files/50httpd-gentoo.el 74
+SHA256 29c0f6b0d249e0cccb204bfaf9952b35b16771887fadedda0ae3e5e7b4d3fcd6 files/50httpd-gentoo.el 74
 MD5 95aa7756d3ef71d4591e4ad6d43d3efa files/digest-httpd-1.0 59
+RMD160 f3e4c66624d374c678f653c198e15ca800652086 files/digest-httpd-1.0 59
+SHA256 beaaf47e5f37e5d7ee0f7d1dd12564b2ab4799dd3719de2a9141f3ec97f32846 files/digest-httpd-1.0 59
+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 4cc25da393e853be2f0a1b7c0269ed42 httpd-1.0-r1.ebuild 573
+RMD160 aaa08fcf7b9ad8a96bcd38651da94e2677947229 httpd-1.0-r1.ebuild 573
+SHA256 98779ab87e1d1229281e1de1a600268b0ab18d417b59a72ec8ee47695096caea httpd-1.0-r1.ebuild 573
 MD5 f20295511fa17f48aa5d4997a946130d httpd-1.0.ebuild 464
+RMD160 fa742f8153bdb84dc0b37efa0b4e566e93b59f71 httpd-1.0.ebuild 464
+SHA256 83094517e2a09172912b9487cb985125f0dd59776996276f205307bda4f91cf6 httpd-1.0.ebuild 464
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
+SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDXOxGcsIHjyDViGQRAhPsAJ4y/p1dV07IbUBOoCyPJqbvRTXN9QCeL1Di
-g1RLQh/5nQinSZHgY/Kbt8Y=
-=9q7r
+iD8DBQFET7TdyiNZaEAZA+ARAlxoAJ977txuBE8Qip6mPug14ZkzNVf/oACfU+yP
+wVxfEizjUBwmUq7tJkbN5sY=
+=Pfqq
 -----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
new file mode 100644
index 000000000000..44706bb18fac
--- /dev/null
+++ b/app-emacs/httpd/files/1.0-open-network-strea-server-gentoo.patch
@@ -0,0 +1,25 @@
+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-r1 b/app-emacs/httpd/files/digest-httpd-1.0-r1
new file mode 100644
index 000000000000..024bc20e56f2
--- /dev/null
+++ b/app-emacs/httpd/files/digest-httpd-1.0-r1
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..a64b510dd3d5
--- /dev/null
+++ b/app-emacs/httpd/httpd-1.0-r1.ebuild
@@ -0,0 +1,20 @@
+# 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
+}