New upstream version.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)

3 files changed, 9 insertions, 104 deletions

diff --git a/dev-scheme/scheme48/ChangeLog b/dev-scheme/scheme48/ChangeLog
index 838c7b13b15d..d7e1e61fa0fe 100644
--- a/dev-scheme/scheme48/ChangeLog
+++ b/dev-scheme/scheme48/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-scheme/scheme48
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.17 2014/03/18 03:18:02 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.18 2014/04/17 22:00:29 teiresias Exp $
+
+*scheme48-1.9.2 (17 Apr 2014)
+
+  17 Apr 2014; Christopher Brannon <teiresias@gentoo.org>
+  -scheme48-1.9.1.ebuild, +scheme48-1.9.2.ebuild,
+  -files/scheme48-1.9.1-implicit-decl.patch:
+  New upstream version.
 
 *scheme48-1.9.1 (17 Mar 2014)
 
diff --git a/dev-scheme/scheme48/files/scheme48-1.9.1-implicit-decl.patch b/dev-scheme/scheme48/files/scheme48-1.9.1-implicit-decl.patch
deleted file mode 100644
index 60b2818e5181..000000000000
--- a/dev-scheme/scheme48/files/scheme48-1.9.1-implicit-decl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -r e16eb4429221 -r 125a138e07ed c/unix.h
---- a/c/unix.h	Sun Mar 16 22:30:45 2014 -0700
-+++ b/c/unix.h	Mon Mar 17 11:22:54 2014 +0100
-@@ -25,7 +25,7 @@
-     if (STATUS != NULL)						\
-       break;							\
-     else if (errno != EINTR)					\
--      s48_os_error(NULL, errno, 0); }				\
-+      s48_os_error_2(call, NULL, errno, 0); }			\
-  } while (0)
- 
- #define RETRY_OR_RAISE_NEG(STATUS, CALL)			\
-@@ -35,7 +35,7 @@
-     if (STATUS >= 0)						\
-       break;							\
-     else if (errno != EINTR)					\
--      s48_os_error(NULL, errno, 0); }				\
-+      s48_os_error_2(call, NULL, errno, 0); }			\
-  } while (0)
- 
-
-diff -r e16eb4429221 -r 125a138e07ed c/unix/fd-io.c
---- a/c/unix/fd-io.c	Sun Mar 16 22:30:45 2014 -0700
-+++ b/c/unix/fd-io.c	Mon Mar 17 11:22:54 2014 +0100
-@@ -323,21 +323,6 @@
-  * one.
-  */
- 
--s48_value
--s48_add_channel(s48_value mode, s48_value id, long fd)
--{
--  if (mode == S48_CHANNEL_STATUS_OUTPUT
--      && fd != 1
--      && fd != 2) {
--    int flags;
--    RETRY_OR_RAISE_NEG(flags, fcntl(fd, F_GETFL));
--    if ((flags & O_NONBLOCK) == 0)
--      fprintf(stderr,
--        "Warning: output channel file descriptor %d is not non-blocking\n",
--	      (int) fd); }
--  return s48_really_add_channel(mode, id, fd);
--}
--
- s48_ref_t
- s48_add_channel_2(s48_call_t call, s48_ref_t mode, s48_ref_t id, long fd)
- {
-diff -r e16eb4429221 -r 125a138e07ed c/win32/fd-io.c
---- a/c/win32/fd-io.c	Sun Mar 16 22:30:45 2014 -0700
-+++ b/c/win32/fd-io.c	Mon Mar 17 11:22:54 2014 +0100
-@@ -1211,13 +1211,6 @@
-  * one.
-  */
- 
--s48_value
--s48_add_channel(s48_value mode, s48_value id, long fd)
--{
--  /* back to the VM */
--  return s48_really_add_channel(mode, id, fd);
--}
--
- s48_ref_t
- s48_add_channel_2(s48_call_t call, s48_ref_t mode, s48_ref_t id, long fd)
- {
-diff -r 98197bf570a4 -r e16eb4429221 c/main.c
---- a/c/main.c	Sun Mar 02 16:50:12 2014 +0100
-+++ b/c/main.c	Sun Mar 16 22:30:45 2014 -0700
-@@ -5,6 +5,7 @@
-  */
- 
- extern long s48_initialize(int *argc, char ***argv);
-+extern long s48_call_startup_procedure(char **, long);
- 
- int
- main(int argc, char **argv)
-diff -r 98197bf570a4 -r e16eb4429221 c/posix/proc.c
---- a/c/posix/proc.c	Sun Mar 02 16:50:12 2014 +0100
-+++ b/c/posix/proc.c	Sun Mar 16 22:30:45 2014 -0700
-@@ -9,6 +9,7 @@
-  * Scheme 48/POSIX process environment interface
-  */
- 
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
-diff -r 98197bf570a4 -r e16eb4429221 c/unix/socket.c
---- a/c/unix/socket.c	Sun Mar 02 16:50:12 2014 +0100
-+++ b/c/unix/socket.c	Sun Mar 16 22:30:45 2014 -0700
-@@ -11,6 +11,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <unistd.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdlib.h>
-
diff --git a/dev-scheme/scheme48/scheme48-1.9.1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2.ebuild
index 0198266cfe3d..de06ecfcfebe 100644
--- a/dev-scheme/scheme48/scheme48-1.9.1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.9.1.ebuild,v 1.1 2014/03/18 03:18:02 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.9.2.ebuild,v 1.1 2014/04/17 22:00:29 teiresias Exp $
 
 EAPI=5
 inherit elisp-common multilib eutils flag-o-matic
@@ -18,11 +18,6 @@ DEPEND="emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}"
 SITEFILE=50scheme48-gentoo.el
 
-src_prepare() {
-	# Patch available upstream.  It can go away next version.
-	epatch "${FILESDIR}/${P}-implicit-decl.patch"
-}
-
 src_configure() {
 	append-cflags -fno-strict-aliasing
 	econf --docdir=/usr/share/doc/${P}