gentoo resync : 26.12.2017

7 files changed, 3 insertions, 513 deletions

diff --git a/dev-lang/squirrel/Manifest b/dev-lang/squirrel/Manifest
index ce9d8b78ec46..2d4b2dbee3e5 100644
--- a/dev-lang/squirrel/Manifest
+++ b/dev-lang/squirrel/Manifest
@@ -1,9 +1,3 @@
-AUX squirrel-2.2.4-autotools.patch 7721 BLAKE2B 6fbedf9cc06609419039362d9e3ff338695dcb7ca4cbd41bc2524e16e58e647f178c373df9d5d6907351e3abfc661f344ec1c7158fc5ca05f77d15a9aea7333e SHA512 1e0993d3172a31c4c75631d28192f53a92113c75dc0ea4fb13db4a23bfbf3b5d8495fa2a51c5501c8fa939c2a5072fd6975b3b4e991bd48d8c5ade2862682f1b
-AUX squirrel-2.2.4-gcc47.patch 2371 BLAKE2B f1b23e8024881213c1a3730cf07ffbd7b6df7efd476ab291655b8f4e233c828233bb072822b6d8c9c31aa3fe3bc4ab7eec198a055647970c96630f89da34c891 SHA512 65f96e53fc44f69b9e86fc74081a95388f8b06dbd908c6197d1cd481d8f7f86c9ca6ce20bf35c425f0aa65d0ff16517c197ff5ab4d1a97955566dc085ea7a39d
-AUX squirrel-2.2.4-stdint.h.patch 2081 BLAKE2B 7c5309dd10e75384fa7245bdf0fda558049607f721b40c84856b93f2f37b2a6fcf1cdc53d8a381503247aaf44dde28c116eb08d26a8273bf5233b7e71e882755 SHA512 9a1c4b5184b7534c0e0384bd6221e57f9c640ad7b8593139c89fbd12e74755a661f9d19f726251aef8b1b814d0dc5be49ead47c7ca1d73ea4128e602f8c6b159
-AUX squirrel-2.2.4-supertux-const.patch 1285 BLAKE2B 12b87d21d574369c8c52d1a9e729b6e1d8c51f696b289eb6a6c08fb981b7bad03ebc7e6fad09974f518eb804c73526a03b727a22eb39a827bb6227ba79f6a02f SHA512 a57bfd23b4ef024f827edfb7e07e2840e2e90bddafa0e6d52c2ab0a71554aa6cd80db35f974200fd603046053bfda187295be458d887ef016cae8ca1cb4373ff
 DIST squirrel-3.1.tar.gz 175612 BLAKE2B 48a21b0ecd881dc3bea104e86013c3f3d5a4bc1e590cd67ef7e679e01383b7454aad4ea9b8ecec9b836a0ee44e8c9e470309f9c71050ed6d8deb76caac726aea SHA512 8aec059c801a8f6a1ddb9585cebd51457cfd43743cb0b03494e022fd47392e7b4b88e4703f184f4dcba2be8c0fb756e9b260e2f230e1bd92b37cdcb86d4f1141
-DIST squirrel_2.2.4_stable.tar.gz 419567 BLAKE2B 5f4cba9b3aed4efaf12577a86d8945c6d3d1dd92e0b6008bd88943b36c694888144d203aa2e9decd6750da9bf680472a304eaab9375e42325a6d1ed4fc5a353b SHA512 91fe260b362d682eb5d21334c0ffa532120550c1c49a40412ac87118bee5f045e79c260f42247bd2c897d33b7a593dd2bc2e5c8e78e219553682f8b6cd79201d
-EBUILD squirrel-2.2.4-r2.ebuild 1037 BLAKE2B bcde33bae78f2c7a579404d021560949c29bee31b04b928747aa508bf95db0d0a58127a250c3e191ee692cfa14f868d1e89ef3b17cd51b508731f5a19fc30d8b SHA512 c5c04b45afb4453891869d43430f0867066c6c8ebbd2e8d823b6867d1745bd7c19fea0fe466fb805eb052d238f099b67d71af129d292356c6306cab0408b3381
-EBUILD squirrel-3.1.ebuild 901 BLAKE2B f9803a2c110c3a3f63074792112a7e40440d26f3ad4e65cc16bdf48652d473ca8a38d8e2b55c46c515b3f8232683e2ed866732e677ecbb3598c0bba91f896353 SHA512 2e65c05bb5c46cf5aa46b158a9435882bf49bb85cdeb131d30b942d95afbaee96f2173ae3b430c3fa15d44edc2d6caad71ef9c6126be59510e9e1361629dc09c
+EBUILD squirrel-3.1.ebuild 899 BLAKE2B 8dc403fc9d1832106979b38f63baf4541fc6ac556ec568f42134f8d24d3dc2c59e98b126be88510bba63412fbf9a8ad103cf1055e01477671488737f17015231 SHA512 fb77b462774dd26126e9683e48ead56ed05582e49b4f5ac31fae870010f5c89f038cd51263b137fe16e8196ff3c994bcfacb40cad147f6eae068fae34da4e5c8
 MISC metadata.xml 395 BLAKE2B 3e9c28568b3d5d1af34d28e3d0da4f765247e2b0b52e9f833ef4c6c9060de915cfff3c8f8d429098a2d49a2bf9ded44d34460de6eaba5799dcf516854094e0f6 SHA512 e7332967d7ada57304e4e9036a61fd27d9fac11dd62a3c4b3627515d4f69cea1b1182132388d480648c469e193fee85bf09220679eb180a9d10c57f78bcb48b4
diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch b/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch
deleted file mode 100644
index e39ddedc9eb3..000000000000
--- a/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Purpose: Makes squirrel buildable and installable using autotools, a buildsystem everybody is comfortable with.
-Source: http://ohnopub.net/hg/SQUIRREL2
-Generate with: hg diff -r 0 -r -1 -I '**Makefile*' -I configure.ac -I '**.in'
-
-diff -r d6d89bbc08e5 -r c89309f5be40 Makefile
---- a/Makefile	Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,18 +0,0 @@
--

--SQUIRREL=.

--MAKE=make

--

--sq32:

--	cd squirrel; $(MAKE) 

--	cd sqstdlib; $(MAKE) 

--	cd sq; $(MAKE) 

--

--sqprof:

--	cd squirrel; $(MAKE) sqprof

--	cd sqstdlib; $(MAKE) sqprof

--	cd sq; $(MAKE) sqprof

--

--sq64:

--	cd squirrel; $(MAKE) sq64

--	cd sqstdlib; $(MAKE) sq64

--	cd sq; $(MAKE) sq64

-diff -r d6d89bbc08e5 -r c89309f5be40 Makefile.am
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/Makefile.am	Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,89 @@
-+# autoreconf variables, recommended by libtoolize
-+ACLOCAL_FLAGS = -I m4
-+
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-+
-+# custom installation directories
-+examplesdir = $(docdir)/examples
-+pkgconfigdir = $(libdir)/pkgconfig
-+
-+# installed things
-+if ENABLE_DOC
-+dist_doc_DATA = doc/sqstdlib2.pdf \
-+	doc/squirrel2.pdf
-+endif
-+if ENABLE_EXAMPLES
-+dist_examples_DATA = samples/ackermann.nut \
-+	samples/array.nut \
-+	samples/class.nut \
-+	samples/classattributes.nut \
-+	samples/coroutines.nut \
-+	samples/delegation.nut \
-+	samples/fibonacci.nut \
-+	samples/flow.nut \
-+	samples/generators.nut \
-+	samples/hello.nut \
-+	samples/list.nut \
-+	samples/loops.nut \
-+	samples/matrix.nut \
-+	samples/metamethods.nut \
-+	samples/methcall.nut \
-+	samples/tailstate.nut
-+endif
-+
-+nodist_pkgconfig_DATA = libsqstdlib.pc \
-+	libsquirrel.pc
-+bin_PROGRAMS = sq/sq
-+lib_LTLIBRARIES = libsquirrel.la \
-+	libsqstdlib.la
-+include_HEADERS = include/sqstdaux.h \
-+	include/sqstdblob.h \
-+	include/sqstdio.h \
-+	include/sqstdmath.h \
-+	include/sqstdstring.h \
-+	include/sqstdsystem.h \
-+	include/squirrel.h
-+
-+
-+# sources for installed things
-+
-+libsqstdlib_la_SOURCES = sqstdlib/sqstdaux.cpp \
-+	sqstdlib/sqstdblob.cpp sqstdlib/sqstdblobimpl.h \
-+	sqstdlib/sqstdio.cpp \
-+	sqstdlib/sqstdmath.cpp \
-+	sqstdlib/sqstdrex.cpp \
-+	sqstdlib/sqstdstream.cpp sqstdlib/sqstdstream.h \
-+	sqstdlib/sqstdstring.cpp \
-+	sqstdlib/sqstdsystem.cpp
-+libsqstdlib_la_LDFLAGS = -version-info 0:0:0
-+libsqstdlib_la_LIBADD = libsquirrel.la
-+
-+libsquirrel_la_SOURCES = squirrel/sqapi.cpp \
-+	squirrel/sqarray.h \
-+	squirrel/sqbaselib.cpp \
-+	squirrel/sqclass.cpp squirrel/sqclass.h \
-+	squirrel/sqclosure.h \
-+	squirrel/sqcompiler.cpp squirrel/sqcompiler.h \
-+	squirrel/sqdebug.cpp \
-+	squirrel/sqfuncproto.h \
-+	squirrel/sqfuncstate.cpp squirrel/sqfuncstate.h \
-+	squirrel/sqlexer.cpp squirrel/sqlexer.h \
-+	squirrel/sqmem.cpp \
-+	squirrel/sqobject.cpp squirrel/sqobject.h \
-+	squirrel/sqopcodes.h \
-+	squirrel/sqpcheader.h \
-+	squirrel/sqstate.cpp squirrel/sqstate.h \
-+	squirrel/sqstring.h \
-+	squirrel/sqtable.cpp squirrel/sqtable.h \
-+	squirrel/squserdata.h \
-+	squirrel/squtils.h \
-+	squirrel/sqvm.cpp squirrel/sqvm.h
-+libsquirrel_la_LDFLAGS = -version-info 0:0:0
-+
-+sq_sq_SOURCES = sq/sq.c
-+sq_sq_LDADD = libsqstdlib.la
-+
-+EXTRA_DIST = COMPILE COPYRIGHT HISTORY README \
-+	doc/sqstdlib2.chm doc/squirrel2.chm \
-+	squirrel.dsw sq/sq.dsp squirrel/squirrel.dsp sqstdlib/sqstdlib.dsp \
-+	etc/minimal.c etc/test.nut
-diff -r d6d89bbc08e5 -r c89309f5be40 configure.ac
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/configure.ac	Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,29 @@
-+AC_INIT([squirrel],[2.2.4],[http://squirrel-lang.org/])
-+
-+# recommended by libtoolize:
-+AC_CONFIG_MACRO_DIR([m4])
-+
-+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
-+
-+AC_PROG_LIBTOOL
-+AC_PROG_CC_C_O
-+AC_PROG_CXX
-+
-+AC_ARG_ENABLE([doc],
-+	[AS_HELP_STRING([--disable-doc], [Control whether or not the API docs (pdfs) are installed.])],
-+	[enable_docs=$enableval],
-+	[enable_docs=yes])
-+AM_CONDITIONAL([ENABLE_DOC],
-+	[test "x$enable_docs" = "xyes"])
-+
-+AC_ARG_ENABLE([examples],
-+	[AS_HELP_STRING([--disable-exampels], [Control whether or not examples of libsquirrel use are installed.])],
-+	[enable_examples=$enableval],
-+	[enable_examples=yes])
-+AM_CONDITIONAL([ENABLE_EXAMPLES],
-+	[test "x$enable_examples" = "xyes"])
-+
-+AC_CONFIG_FILES([Makefile
-+libsquirrel.pc
-+libsqstdlib.pc])
-+AC_OUTPUT
-diff -r d6d89bbc08e5 -r c89309f5be40 libsqstdlib.pc.in
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/libsqstdlib.pc.in	Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,14 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: A library for libsquirrel users
-+Version: @VERSION@
-+URL: @PACKAGE_BUGREPORT@
-+Libs: -L${libdir} -lsqstdlib
-+# I don't like hard-coding this here, but it's an internal
-+# dependency so it's justified.
-+Libs.private: -lsquirrel
-+Cflags: -I${includedir}
-diff -r d6d89bbc08e5 -r c89309f5be40 libsquirrel.pc.in
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/libsquirrel.pc.in	Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: A dynamic scripting language for games
-+Version: @VERSION@
-+URL: @PACKAGE_BUGREPORT@
-+Libs: -L${libdir} -lsquirrel
-+Cflags: -I${includedir}
-diff -r d6d89bbc08e5 -r c89309f5be40 sq/Makefile
---- a/sq/Makefile	Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,21 +0,0 @@
--SQUIRREL= ..

--

--

--OUT= $(SQUIRREL)/bin/sq

--INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs

--LIBZ= -L$(SQUIRREL)/lib 

--LIB= -lsquirrel -lsqstdlib

--

--OBJS= sq.o

--	

--SRCS= sq.c

--	

--	

--sq32:

--	g++ -O2 -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)

--

--sqprof:

--	g++ -O2 -pg -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)

--	

--sq64:

--	g++ -O2 -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
-\ No newline at end of file
-diff -r d6d89bbc08e5 -r c89309f5be40 sqstdlib/Makefile
---- a/sqstdlib/Makefile	Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,30 +0,0 @@
--SQUIRREL= ..

--

--

--OUT= $(SQUIRREL)/lib/libsqstdlib.a

--INCZ= -I$(SQUIRREL)/include -I. -Iinclude

--

--SRCS= \

--	sqstdblob.cpp \

--	sqstdio.cpp \

--	sqstdstream.cpp \

--	sqstdmath.cpp \

--	sqstdsystem.cpp \

--	sqstdstring.cpp \

--	sqstdaux.cpp \

--	sqstdrex.cpp

--	

--	

--sq32:

--	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ)

--	ar rc $(OUT) *.o

--	rm *.o

--

--sqprof:

--	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ)

--	ar rc $(OUT) *.o

--	rm *.o

--sq64:

--	gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ)

--	ar rc $(OUT) *.o

--	rm *.o

-diff -r d6d89bbc08e5 -r c89309f5be40 squirrel/Makefile
---- a/squirrel/Makefile	Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,52 +0,0 @@
--SQUIRREL= ..

--

--

--OUT= $(SQUIRREL)/lib/libsquirrel.a

--INCZ= -I$(SQUIRREL)/include -I. -Iinclude

--DEFS= 

--LIB=	

--

--OBJS= \

--	sqapi.o \

--	sqbaselib.o \

--	sqcompiler.o \

--	sqdebug.o \

--	sqlexer.o \

--	sqobject.o \

--	sqparser.o \

--	sqstate.o \

--	sqtable.o \

--	sqvm.o \

--	sqmem.o \

--	sqclass.o

--	

--SRCS= \

--	sqapi.cpp \

--	sqbaselib.cpp \

--	sqfuncstate.cpp \

--	sqdebug.cpp \

--	sqlexer.cpp \

--	sqobject.cpp \

--	sqcompiler.cpp \

--	sqstate.cpp \

--	sqtable.cpp \

--	sqmem.cpp \

--	sqvm.cpp \

--	sqclass.cpp

--

--	

--	

--sq32:

--	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)

--	ar rc $(OUT) *.o

--	rm *.o

--

--sqprof:

--	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ) $(DEFS)

--	ar rc $(OUT) *.o

--	rm *.o

--

--sq64:

--	gcc -O2  -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)

--	ar rc $(OUT) *.o

--	rm *.o

diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch b/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch
deleted file mode 100644
index 032a4eb914a6..000000000000
--- a/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From fd2d422f16ca1134f3be8d693290e6b1c536bf71 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 7 Jun 2012 10:10:28 +0300
-Subject: [squirrel: PATCH] fix build breakage on gcc-4.7 and clang++
-
-gcc 4.7 got proper support for argument dependent lookup
-for builtin types:
-    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46075
-
-It exposed old problem:
-> gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp \
-  sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude
-  In file included from sqobject.h:5:0,
-                 from sqpcheader.h:16,
-                 from sqapi.cpp:4:
-  squtils.h: In instantiation of 'sqvector<T>::~sqvector() [with T = long long int]':
-  sqclosure.h:142:52:   required from here
-  squtils.h:46:4: error: 'sq_vm_free' was not declared in this scope, and no declarations were found by argument-dependent
-  lookup at the point of instantiation [-fpermissive]
-  In file included from sqpcheader.h:17:0,
-                 from sqapi.cpp:4:
-  sqstate.h:143:6: note: 'void sq_vm_free(void*, SQUnsignedInteger)' declared here, later in the translation unit
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- squirrel/sqstate.h |    3 ---
- squirrel/squtils.h |    4 ++++
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/squirrel/sqstate.h b/squirrel/sqstate.h
-index 3ed3307..e931404 100755
---- a/squirrel/sqstate.h
-+++ b/squirrel/sqstate.h
-@@ -138,7 +138,4 @@ private:
- 

- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);

- 

--void *sq_vm_malloc(SQUnsignedInteger size);

--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);

--void sq_vm_free(void *p,SQUnsignedInteger size);

- #endif //_SQSTATE_H_

-diff --git a/squirrel/squtils.h b/squirrel/squtils.h
-index bff7d24..ac3aef9 100755
---- a/squirrel/squtils.h
-+++ b/squirrel/squtils.h
-@@ -10,6 +10,10 @@
- 

- #define sq_aligning(v) (((size_t)(v) + (SQ_ALIGNMENT-1)) & (~(SQ_ALIGNMENT-1)))

- 

-+
-+void *sq_vm_malloc(SQUnsignedInteger size);

-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);

-+void sq_vm_free(void *p,SQUnsignedInteger size);

- //sqvector mini vector class, supports objects by value

- template<typename T> class sqvector

- {

--- 
-1.7.8.6
-
diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch b/dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch
deleted file mode 100644
index 911edcc79d34..000000000000
--- a/dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -r d6d89bbc08e5 -r 692b7872324b include/squirrel.h
---- a/include/squirrel.h	Thu Feb 11 15:08:35 2010 -0500
-+++ b/include/squirrel.h	Sat Feb 13 01:04:21 2010 -0500
-@@ -39,28 +39,22 @@
- #define SQUIRREL_API extern

- #endif

- 

--#if (defined(_WIN64) || defined(_LP64))

--#define _SQ64

--#endif

-+/* Get uintptr_t from a non standard or standard location */

-+#ifdef _MSC_VER

-+#include <stddef.h>

- 

--#ifdef _SQ64

--#ifdef _MSC_VER

--typedef __int64 SQInteger;

--typedef unsigned __int64 SQUnsignedInteger;

--typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/

--#else

--typedef long SQInteger;

--typedef unsigned long SQUnsignedInteger;

--typedef unsigned long SQHash; /*should be the same size of a pointer*/

--#endif

--typedef int SQInt32; 

--#else 

--typedef int SQInteger;

--typedef int SQInt32; /*must be 32 bits(also on 64bits processors)*/

--typedef unsigned int SQUnsignedInteger;

--typedef unsigned int SQHash; /*should be the same size of a pointer*/

--#endif

-+typedef __int32 SQInt32;

-+typedef __int64 SQInt64;

-+#else /* _MSC_VER */

-+#include <stdint.h>

- 

-+typedef int32_t SQInt32;

-+typedef int64_t SQInt64;

-+#endif /* _MSC_VER */

-+

-+typedef intptr_t SQInteger;

-+typedef uintptr_t SQUnsignedInteger;

-+typedef uintptr_t SQHash;

- 

- #ifdef SQUSEDOUBLE

- typedef double SQFloat;

-@@ -68,12 +62,8 @@
- typedef float SQFloat;

- #endif

- 

--#if defined(SQUSEDOUBLE) && !defined(_SQ64)

--#ifdef _MSC_VER

--typedef __int64 SQRawObjectVal; //must be 64bits

--#else

--typedef long SQRawObjectVal; //must be 64bits

--#endif

-+#if defined(SQUSEDOUBLE)

-+typedef SQInt64 SQRawObjectVal; /* must be 64 bits */

- #define SQ_OBJECT_RAWINIT() { _unVal.raw = 0; }

- #else

- typedef SQUnsignedInteger SQRawObjectVal; //is 32 bits on 32 bits builds and 64 bits otherwise

-@@ -453,4 +443,13 @@
- } /*extern "C"*/

- #endif

- 

-+/*

-+  Define for code which depends on squirrel to

-+  determine bitiness. IMO, this should be discouraged.

-+  --ohnobinki

-+*/

-+#if (defined(_WIN64) || defined(_LP64))

-+#define _SQ64

-+#endif

-+

- #endif /*_SQUIRREL_H_*/

diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch b/dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch
deleted file mode 100644
index e31eca5c1f96..000000000000
--- a/dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r 3e8a1ff66c3c -r bd1cfd3e3cdd sqstdlib/sqstdstream.cpp
---- a/sqstdlib/sqstdstream.cpp	Fri Feb 12 20:35:23 2010 -0500
-+++ b/sqstdlib/sqstdstream.cpp	Fri Feb 12 23:58:35 2010 -0500
-@@ -277,7 +277,7 @@
- 	sq_pop(v,1);

- }

- 

--SQRESULT declare_stream(HSQUIRRELVM v,SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)

-+SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)

- {

- 	if(sq_gettype(v,-1) != OT_TABLE)

- 		return sq_throwerror(v,_SC("table expected"));

-diff -r 3e8a1ff66c3c -r bd1cfd3e3cdd sqstdlib/sqstdstream.h
---- a/sqstdlib/sqstdstream.h	Fri Feb 12 20:35:23 2010 -0500
-+++ b/sqstdlib/sqstdstream.h	Fri Feb 12 23:58:35 2010 -0500
-@@ -14,5 +14,5 @@
- SQInteger _stream_flush(HSQUIRRELVM v);

- 

- #define _DECL_STREAM_FUNC(name,nparams,typecheck) {_SC(#name),_stream_##name,nparams,typecheck}

--SQRESULT declare_stream(HSQUIRRELVM v,SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);

-+SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);

- #endif /*_SQSTD_STREAM_H_*/

diff --git a/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild b/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild
deleted file mode 100644
index cf2c0636a257..000000000000
--- a/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit autotools eutils multilib
-
-MY_P="${PN}_${PV}_stable"
-DESCRIPTION="A interpreted language mainly used for games"
-HOMEPAGE="http://squirrel-lang.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${PV:0:1}/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples static-libs"
-
-# /usr/bin/sq conflicts
-RDEPEND="!app-text/ispell"
-
-S="${WORKDIR}/SQUIRREL${PV:0:1}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	epatch "${FILESDIR}"/${P}-supertux-const.patch
-	epatch "${FILESDIR}"/${P}-stdint.h.patch
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable doc) \
-		$(use_enable examples) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if ! use static-libs; then
-		rm -v "${ED}"/usr/$(get_libdir)/*.la || die
-	fi
-
-	dodoc HISTORY README || die
-}
diff --git a/dev-lang/squirrel/squirrel-3.1.ebuild b/dev-lang/squirrel/squirrel-3.1.ebuild
index 0b304c06c11b..4a149398eb44 100644
--- a/dev-lang/squirrel/squirrel-3.1.ebuild
+++ b/dev-lang/squirrel/squirrel-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/albertodemichelis/squirrel/archive/v${PV}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples static-libs"
 
 RDEPEND=""