New upstream release: 1.9.1.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D

4 files changed, 190 insertions, 7 deletions

diff --git a/dev-scheme/scheme48/ChangeLog b/dev-scheme/scheme48/ChangeLog
index 37d21ebde64c..838c7b13b15d 100644
--- a/dev-scheme/scheme48/ChangeLog
+++ b/dev-scheme/scheme48/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/scheme48
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.16 2012/12/20 21:52:03 pacho Exp $
+# 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 $
+
+*scheme48-1.9.1 (17 Mar 2014)
+
+  17 Mar 2014; Christopher Brannon <teiresias@gentoo.org>
+  +scheme48-1.9.1.ebuild, +files/scheme48-1.9.1-implicit-decl.patch:
+  New upstream version, 1.9.1.
 
   20 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer, bug #81411
diff --git a/dev-scheme/scheme48/Manifest b/dev-scheme/scheme48/Manifest
index 71378bad3dbf..7beecc68226a 100644
--- a/dev-scheme/scheme48/Manifest
+++ b/dev-scheme/scheme48/Manifest
@@ -3,14 +3,21 @@ Hash: SHA256
 
 AUX 50scheme48-gentoo.el 198 SHA256 6aaa0729ea2383855c6d3c6e254b0656ad03fdd97e5ea80de99a04e7c0585024 SHA512 874355b78d5ddcc55add22d7171ae92e4115c8e84883a89e76848ad362c070c00d8ec12e1841eabd1bc0d2a786d789e36f3f109b0d3e5dd879a9faca1fb8e4b7 WHIRLPOOL 0e66bdfd7cd314f809f3d43d4fe17b2bab252109179c2efdf178db996246cec1f7a8780b7ac9bc11f00d6bfb3a8698a6fd2622bd66a1efc655bfa98019793964
 AUX scheme48-1.8-as-needed+fix_destdir.patch 1081 SHA256 7f42cdbf15fcccd145a6eae7a290a5a7973dc40886f60049d4b406bdcbd75a9e SHA512 ee66e4bc2d4cfed4fb2e6851924e1da450859e06fb0439a0b842a0165af4dbea8d5907784a7ddf92b39f64730176cf528e3dbf7ccde00752403483b818637c0e WHIRLPOOL dfdf1e5dc57f8d9d16e50d153dd38fea4328c033ea2657f56e07a4065745310a99ca4a16a61e41c95e9dbf35ca492211803685c48ab89186a0750db0825bf2c1
+AUX scheme48-1.9.1-implicit-decl.patch 2693 SHA256 e66b085918fdfcba8f6c3f80b563fa73d1a49763da34c7b15043821ce3542d38 SHA512 7c5507c88295f3ae020975ff393a096ec4eb3aecf32298fbf21c31ab68503f70fe8567a841cd25fd131fb9666e209ea0cda01069ffff62fc4827fe7c7276deb4 WHIRLPOOL ea925fd46abc102ed1be21c051050efbd15b19d58fe939b66a8f465a46d128a2336f401b6b4ada5aa3aa4635b6bee41bd51343a747e5a46145045aa1fc875c03
 DIST scheme48-1.8.tgz 3173151 SHA256 04a61ea28ef9d1f2f0e281fd6eb503f10afc94b0d3f34dbf376aedbe93eb1bb3 SHA512 1cae01ef1e282971ad0bad308a4d75fe24dcc629b09f711b54811d843f85f02cf3a728d19d44cdcc2699d071b27b2a0fb40c0ebb3a08db0f06a115e53e8b9e47 WHIRLPOOL c6748848df241d978c569768e39d0dced7c8a356342017e9777c018a63d38fe51f0eb28de3d2b34165a7c3658fb5f7dd4a72de1d1f585b9ea03b5ea5a33b5128
+DIST scheme48-1.9.1.tgz 3950941 SHA256 9ce76702fabf0a884762b95148f5e16d16f63e20fcf042af7cb51d7509ab2789 SHA512 6f4a1af850a35cf0254e711476a72a3aea255c31c9593f80939b942f07c0dbbc6f9d622f0837aa132a248cb43360ae9272585a9ed7d1c801999c862e3918a9c9 WHIRLPOOL aecb49c66847720aad02da0a7364ac04061520270173c40d22721ef4617e3dc326a62a0f2ae45cb9f563cc6f771b2d21f9f3205749455679fc238e26ae4cdd51
 EBUILD scheme48-1.8-r2.ebuild 1402 SHA256 9586c60e057dcd583968e5a25d1d16babcc05195de7153456a6159351b63dea2 SHA512 062382e5d0f414774dde0a3c399aa3eb1827ba205aac9486d9c284ec28dd19bec421789426cdbb6b52e81fc69cb26b189b1a7de6343926da9979bf9195f39b5a WHIRLPOOL 6ae777ef5b154c7df9bd26ccc4c4d49568cfedba27b2e0e82bf3e0dfe1d03a9dafb87d1c1ff66ea14d0581813f467463853ece293367da530978b23f0d17812e
-MISC ChangeLog 2959 SHA256 4bf36db7066c2eb9ea9fb1873025870cd70262b1b304fb923fd41af7a6b9affe SHA512 e093abe67210f6c5fd059a044a5c91ba8d4409da84b67721ad42be50430f1765a099edffdfb684f15688ee682253642c8aa6497c032922a38cdab8ac4889a5e4 WHIRLPOOL c77cc3d51935e561a81570150c6a008ea0cc4ff243fa7a4c9099181dc06f780c7754bb853b2a15aab419a3ed45cdeddd2dda0e9540f2c5a8f56a10cf839590b3
+EBUILD scheme48-1.9.1.ebuild 1642 SHA256 7f71ed4f97b88f29642e5db6fbba70e5c5e05ee4653fbc99ad56655eaf77106e SHA512 37f4b1bc9e1ec2792b734c05fedbaf3dc179f668a7bafd4f3e21a1a8c84163422024614eb96c646dadeb23b9c0b3d87c1fb16922269ff3db7015c9df7fa96595 WHIRLPOOL d3988b5fb2d95f437cd2b73a862cac6746e3c6252ff707e6535127eb766a4d5de96b25b948889f0838cd3fa0d28194585711426ab95ed2ca1421cc4b2a18566c
+MISC ChangeLog 3153 SHA256 caccc028a92b041adb8d935519e6ad5f535ad5e90d2a47bd38882da5787ff5ec SHA512 e5a0c8800dcbf191133844656617eae49e971bb34f4883dd9cfae7c3ca73a8f2d065d48aeb909196e9416cdfe51b54119f98111ce0a01204eedbe3db8a9af75d WHIRLPOOL 4dd60e6e57f48fe62b2f927142cefc523e080cbe05e7d0e3b38a525a03ff38701a215ce3e70483d89b597b3eeb2802f9d89720b38e1889fdce4e09ba251b02dd
 MISC metadata.xml 444 SHA256 5ab336bb3eadc95de240f66159705e97338ab7d649f7e04b01e07a66decbb679 SHA512 0edb4e375779275e1591bb6527963158171148a58e3c2c711fc583255d63de2acae7698bee83b5525e34f6cab18df38a033b480c213fd8a1f9af68e38776a66c WHIRLPOOL 7689cdfa8032f6d7f6dbc8b53c960751007b6173ecb749e1ca085ebeea500cea9cb15d50dcbc1e30a22eab4814c095a6400753f83feec03c890b53c0077f5a1a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlDTiIUACgkQCaWpQKGI+9QB5gCggNr3Df3ZHVawX0fImhjVjvcm
-cM0An3jbv5wdJ4Ml0L73RPkp6h9KqnjE
-=R586
+iQEcBAEBCAAGBQJTJ7ryAAoJEH8qFnJlIeBtJd8H/joRljK/TARDJAeZxIfJC5g8
+N8KfzijRcss/1dnhktzgNn2eVNcmAeEpxbIelGXY2Vfd1MRqajJNgzJ8iI5BlBTr
+7CEyX+ASrKTF6T7j8aPDahknHR0Fjezjw8rkgxn7VinXqHjvaDsEQXT4aXYKqU6L
+l70vnIYKKiIqM7BX8SsdsUrCUtH2fZwC6Gf0ORo6ueBHqynEP4awBjtmUY9VbFCx
+bS8cWr2vFHGnje9wfVX8it4kdnUV/lYWiM6OgHKzBv7kyDqvk0SALBKlipE5r1/R
+lwN/yg1+VQM5r5+S0vOT8qpnctJ0rkyA1eaE3sTQAzcDrfDj0zLt5DUtqGXIrg8=
+=55MH
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..60b2818e5181
--- /dev/null
+++ b/dev-scheme/scheme48/files/scheme48-1.9.1-implicit-decl.patch
@@ -0,0 +1,97 @@
+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.1.ebuild
new file mode 100644
index 000000000000..0198266cfe3d
--- /dev/null
+++ b/dev-scheme/scheme48/scheme48-1.9.1.ebuild
@@ -0,0 +1,73 @@
+# 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 $
+
+EAPI=5
+inherit elisp-common multilib eutils flag-o-matic
+
+DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language."
+HOMEPAGE="http://www.s48.org/"
+SRC_URI="http://www.s48.org/${PV}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc emacs"
+
+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}
+}
+
+src_compile() {
+	emake
+	if use emacs; then
+		elisp-compile "${S}"/emacs/cmuscheme48.el
+	fi
+}
+
+src_install() {
+	# weird parallel failures!
+	emake -j1 DESTDIR="${D}" install
+
+	if use emacs; then
+		elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/*.txt
+		docinto src
+		dodoc doc/src/*
+		pushd "${ED}/usr/share/doc/${P}" > /dev/null
+		install -dm755 html
+		mv *.html *.css *.gif html/
+		popd > /dev/null
+	else
+		pushd "${ED}/usr/share/doc/${P}" > /dev/null
+		rm -f *.html *.css *.gif
+		rm -f manu*
+		popd > /dev/null
+	fi
+
+	#this symlink clashes with gambit
+	rm "${ED}"/usr/bin/scheme-r5rs || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}