dev-lisp/newlisp: Bumps version to 10.7.1. Cleans old versions

10 files changed, 483 insertions, 174 deletions

diff --git a/dev-lisp/newlisp/Manifest b/dev-lisp/newlisp/Manifest
index 61f1c4b0..7f1efdd7 100644
--- a/dev-lisp/newlisp/Manifest
+++ b/dev-lisp/newlisp/Manifest
@@ -1,10 +1,6 @@
-AUX newlisp-makefile-install-10.5.4.patch 619 SHA256 c1da043b6969f3fb762b39812b5411c4d27ff7878ba0bda3e058c914f8f8bec7 SHA512 0e63c81ca5f4d7124653640aa1b7822c0811b0edeba33dea73c47756c0c7473eeff87c436e274f8c88ceb015d5227ceff4cc1f797e2669fd0cfe9afb28daa6a5 WHIRLPOOL 46e0fc5adaacd00bccf6a8a1282c6b9f367e770658a6f4876155a6c216b1bbdc2db5675ef519e86c016991e855e574eb5987cc5371b3e3851bcda0a6eb8a3be3
-AUX newlisp-makefile-install-10.6.2.patch 615 SHA256 a27a5c9ff94e5e7465bde7052345dc16dd93ed703840e5c0f30af37917dc5066 SHA512 458a7bc154fc8f73f2af45d4ce40115a7f0e5781463b62e70658da07c04ccb4a3ca13fa8fa2f7b78f3c524d3a3669bddf991012faf3926732f37d689b992faf4 WHIRLPOOL 82f38fdf9d450b6a300fec2b21aad36ca98080146c5d86cd5fd3c620fb5f3534dd40da6f13cdd40625ee18a469503419a32768962c2970d4f7842552ac1d2adf
-AUX newlisp-makefile-install-10.7.0.patch 615 SHA256 a27a5c9ff94e5e7465bde7052345dc16dd93ed703840e5c0f30af37917dc5066 SHA512 458a7bc154fc8f73f2af45d4ce40115a7f0e5781463b62e70658da07c04ccb4a3ca13fa8fa2f7b78f3c524d3a3669bddf991012faf3926732f37d689b992faf4 WHIRLPOOL 82f38fdf9d450b6a300fec2b21aad36ca98080146c5d86cd5fd3c620fb5f3534dd40da6f13cdd40625ee18a469503419a32768962c2970d4f7842552ac1d2adf
-AUX newlisp-path-10.7.0.patch 29096 SHA256 9e8880399deb071c4d261dac83e54758d2ee3df8d59f321824284b37b3130d37 SHA512 dac9859641a3a9a4d37c0365a2d10113ecdb79e64332d49026fe598a116f52df4efc63c74d24f4f303bf8ad019e3c295a45d0e6c0388635a143fc5a8b251475f WHIRLPOOL e247caca2be4f458e2d88bd64a4e3ae7ed12c4451df81209b644926a987519f1feaa69ff95cebb3eb0ee46ce46ded7d1e098efd4770d75ad851b19b9c55871a3
-DIST newlisp-10.5.4.tgz 1637762 SHA256 e4561e03c89e7c89a30dfa7daf12091085a474e96b0fbbb4ee62454463175eb0 SHA512 f77203fe9bfcb77d7f1c76d8735a24c31b77a818a64f2e9d72bf1b59d03dfcf0e2eaf6bde66f6a99b5c203018bc57c1d94f8528ae6c85b2e47b42a2dc0641ff0 WHIRLPOOL 3ba7514267463c4c59fe962199c23f776941f7675804131d6c88a2ba08f5e97f51a7876f964f5b48805f956e3cdead3b2c302d54a93c69fe1f8701d231a2bee4
-DIST newlisp-10.6.2.tgz 1671798 SHA256 ae3ab77987cb2cfef4e986104be5be5ac9469317e9d74884c3ea89c2e4bb4040 SHA512 50a08def660df95af4a773f341440cd5cb8883c14f3e4728b307e7c9dbfcefa03c0b76bc7c358572c06b1424935abdcb7b6424edc377b661943ba433cf945e5c WHIRLPOOL 6cb9283a20bbad15859424726759ddbd70c65339b87c841706f07b9df1c409724e0690789d43b8cc1e849cfa8b55781f90d6a48ce1b339595db49f1eae192792
-DIST newlisp-10.7.0.tgz 1741661 SHA256 c4963bf32d67eef7e4957f7118632a0c40350fd0e28064bce095865b383137bb SHA512 11140e3f356fb4bd22d2019a8cb9e1370843ad94f241f672e7bf90e730fa7f87c2a92388b611741290061c2c92a48e77a67fa3d5bf37300d0f924b212d58a04f WHIRLPOOL 81089250a2fea645a9a288f9457c0f9166893e18a4f0e3262ef22708cd3b179ae3183e1aa203fa2fc5cecd867fa3c0048fb5155733067d0a0a02b6a6e56eef4f
-EBUILD newlisp-10.5.4.ebuild 1475 SHA256 f10be300f622f79a234d8a32bdf5ed44fe80442f13c2cc99b6e361b8602fd541 SHA512 3acd843c1cb15d27cf402eb470329b3e345070be321365909d926508d80f0286484cdd95f85d65aed612b1721d1a296374f3a815987176ec7385ba468a162a21 WHIRLPOOL dfbe01b4f258857f7155ac1ed6b1ce9b4f32c9346ff2e60abe54b53c9258901905058d97a277175c7c8ff96f4806d89c9eed7a5940cd8a39c181cab71ae504db
-EBUILD newlisp-10.6.2.ebuild 1531 SHA256 1ca28a8cba2d0374c20c52589ac920a969823fcf726c8cf97a79b6c9ebf4e18b SHA512 887f78ca4d3f3e530e49f3e9a1c2c2d2783897fd52557bb93f3f36a4b4a1d4adf8032d6c68db94350afa043eb2c69d7937389e782d8246ef14236860348f4c72 WHIRLPOOL fca6c6938a04b9b94c820ebc8648e398c3d03568bb625fa759671215368510772d8ea085e260133b8b65ddd1cb06cd82442dd5b4981e131c71f9cf7d56d3c42f
-EBUILD newlisp-10.7.0.ebuild 1576 SHA256 294d1799c9dcea4e7fb173713d3464528d2183dbc1312b7b3b36e0c37f6445a6 SHA512 886782471566cbb33261e6e282de693cca15eda69baa9c2a50bdd6c41bc2fb14ad97053b7b634a7bc22e401c6574cd515f51198e42b13611e16f6e545e9ed8ed WHIRLPOOL 2f47489821e89d53416e1bfc4e2a8646073327d8be91260acbf7a0a3cc26d871788734baef74422a14b13be85f9d119701a8ec6ed437bdbd3647c1e7382b8546
+AUX newlisp-10.7.1-fix-makefiles.patch 6620 BLAKE2B 47a6e436946922080efeb9c7f6bd91cc3003df28f3b79e3a57d7b6d59e8091fa0c44a26d2d26f482428f23d64c3f7fd4e995f2c6893c50aacbed9d0c6f0b4d74 SHA512 e2476379d0bac2a5a93e109c49e93b2c4f49d70261127c1d1d23c24b3cac8ab9130ca003b0959e90d1892cdce17e7bce1fb2afcda1b44b8c1c36c5031c5672b7
+AUX newlisp-10.7.1-fix-path.patch 29096 BLAKE2B ca774c2a7f03b0c9d1e74cd26dd4ee765be8394c39a20c83b07b99eb62036bbb8a196e7bf6d289fd41a2dc38b8cfb06675c6b89dd8523b5b473a9d6f2f099ecc SHA512 dac9859641a3a9a4d37c0365a2d10113ecdb79e64332d49026fe598a116f52df4efc63c74d24f4f303bf8ad019e3c295a45d0e6c0388635a143fc5a8b251475f
+AUX newlisp-10.7.1-fix-paths.patch 13984 BLAKE2B 12fa00506672c53def5530d1df7e1ad52aec961e70d7e495c71051934edf8411b40a2d0de4023fdd714bd782c6df449929c2ef9715673abdb7a80158b59e361d SHA512 79478496d7b062cc9f7575f8348ca19c44aa879367054f625bac68e8f54df091cb0933f954aa539b0cff0ca1154300a9ee4fc5910347548a13b1407c257ad069
+AUX newlisp-10.7.1-makefile-install.patch 615 BLAKE2B 5211511afcde8d001eeb792c1f42d483ddedd89f861ab7241c676c936314b3d290a67e8f48b9f939589eb06aa810adf29b2205f8bf2b81fcdde5c382880143ec SHA512 458a7bc154fc8f73f2af45d4ce40115a7f0e5781463b62e70658da07c04ccb4a3ca13fa8fa2f7b78f3c524d3a3669bddf991012faf3926732f37d689b992faf4
+DIST newlisp-10.7.1.tgz 1721645 BLAKE2B c641f4caf77c413bc2d929fd237577c6347ea65488c5da6a5af647f16fe512737e212452e5b756b270ceba3a6690ffadec77a367b0b631d9b3db572c5cd18cae SHA512 dff9ea671581e9421028abec786ec4f4557b150ffff8357c42c03af414d6d78a277b7c13cf08cd9950427eff32570a15b85072009e7596e66592c8a4186c6560
+EBUILD newlisp-10.7.1.ebuild 1544 BLAKE2B 528348b67b51e3ac12b2cffd4dcdc902799f5b21ea71497bed8ffe6191f71856083b61edacbc31a97065cc00a91d0a98981d64d2ffe4ef62be49e1ca8f9d1bb5 SHA512 cf87d8891e69d51fb4a0929e6828312bdbba0bb7d9314ab3a6639ffde6c97e98faa8abbc0dec4a6b0e09dc1ff0fc51226a050bcdd1bcf35ba7df841f04a5a0c3
diff --git a/dev-lisp/newlisp/files/newlisp-10.7.1-fix-makefiles.patch b/dev-lisp/newlisp/files/newlisp-10.7.1-fix-makefiles.patch
new file mode 100644
index 00000000..fe40acd7
--- /dev/null
+++ b/dev-lisp/newlisp/files/newlisp-10.7.1-fix-makefiles.patch
@@ -0,0 +1,126 @@
+diff -Nuar a/guiserver/Makefile b/guiserver/Makefile
+--- a/guiserver/Makefile	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/Makefile	2018-03-17 23:35:34.393015795 +0100
+@@ -9,10 +9,10 @@
+ 	rm *.class
+ 
+ install:
+-	-install -d  /usr/local/share/newlisp/guiserver
+-	-install -d  /usr/local/share/doc/newlisp/guiserver
+-	-install -m 644 guiserver.jar /usr/local/share/newlisp/
+-	-install -m 644 guiserver.lsp /usr/local/share/newlisp/
+-	-install -m 644 index.html /usr/local/share/doc/newlisp/guiserver/
+-	-install -m 644 guiserver.lsp.html /usr/local/share/doc/newlisp/guiserver/
+-	-install -m 755 newlisp-edit.lsp /usr/local/bin/newlisp-edit
++	-install -d  /usr/share/newlisp/guiserver
++	-install -d  /usr/share/doc/newlisp/guiserver
++	-install -m 644 guiserver.jar /usr/share/newlisp/
++	-install -m 644 guiserver.lsp /usr/share/newlisp/
++	-install -m 644 index.html /usr/share/doc/newlisp/guiserver/
++	-install -m 644 guiserver.lsp.html /usr/share/doc/newlisp/guiserver/
++	-install -m 755 newlisp-edit.lsp /usr/bin/newlisp-edit
+diff -Nuar a/Makefile b/Makefile
+--- a/Makefile	2017-01-25 17:42:21.000000000 +0100
++++ b/Makefile	2018-03-17 23:35:23.273015842 +0100
+@@ -9,7 +9,7 @@
+ #
+ # for 'make install' you have to login as 'root' else do 'make install_home'
+ # note that 'make install_home' will not install guiserver files which
+-# must be in /usr/local/share/newlisp in MacOX X and UNIX machines
++# must be in /usr/share/newlisp in MacOX X and UNIX machines
+ #
+ # to make the distribution archive:  'make dist'
+ #
+@@ -39,8 +39,8 @@
+ 	@echo "\nDo one of the following:"
+ 	@echo "  make                 # auto-select one of the predefined makefiles and build newLISP"
+ 	@echo "  make help            # display this help"
+-	@echo "  make install         # install on LINUX/UNIX in /usr/local/bin and /usr/local/share (need to be root)"
+-	@echo "  make uninstall       # uninstall on LINUX/UNIX from /usr/local/bin and /usr/local/share (need to be root)"
++	@echo "  make install         # install on LINUX/UNIX in /usr/bin and /usr/share (need to be root)"
++	@echo "  make uninstall       # uninstall on LINUX/UNIX from /usr/bin and /usr/share (need to be root)"
+ 	@echo "  make install_home    # install on LINUX/UNIX in users home directory "
+ 	@echo "  make uninstall_home  # uninstall on LINUX/UNIX from users home directory "
+ 	@echo
+diff -Nuar a/makefile_linux_ffi b/makefile_linux_ffi
+--- a/makefile_linux_ffi	2017-01-25 17:42:21.000000000 +0100
++++ b/makefile_linux_ffi	2018-03-17 23:35:48.053015736 +0100
+@@ -6,7 +6,7 @@
+ OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \
+ 	nl-sock.o nl-import.o nl-xml-json.o nl-web.o nl-matrix.o nl-debug.o pcre.o
+ 
+-CFLAGS = -m32 -Wall -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include 
++CFLAGS = -m32 -Wall -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DLINUX -DFFI -I/usr/lib/libffi-3.0.13/include 
+ 
+ CC = gcc
+ 
+diff -Nuar a/makefile_linuxLP64_ffi b/makefile_linuxLP64_ffi
+--- a/makefile_linuxLP64_ffi	2017-01-25 17:42:21.000000000 +0100
++++ b/makefile_linuxLP64_ffi	2018-03-17 23:35:41.953015762 +0100
+@@ -6,7 +6,7 @@
+ OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \
+ 	nl-sock.o nl-import.o nl-xml-json.o nl-web.o nl-matrix.o nl-debug.o pcre.o
+ 
+-CFLAGS = -fPIC -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DNEWLISP64 -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include 
++CFLAGS = -fPIC -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DNEWLISP64 -DLINUX -DFFI -I/usr/lib/libffi-3.0.13/include 
+ 
+ CC = gcc
+ 
+diff -Nuar a/makefile_linuxLP64_utf8_ffi b/makefile_linuxLP64_utf8_ffi
+--- a/makefile_linuxLP64_utf8_ffi	2017-01-25 17:42:21.000000000 +0100
++++ b/makefile_linuxLP64_utf8_ffi	2018-03-17 23:35:44.993015749 +0100
+@@ -6,7 +6,7 @@
+ OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \
+ 	nl-sock.o nl-import.o nl-xml-json.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o
+ 
+-CFLAGS = -fPIC -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include 
++CFLAGS = -fPIC -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI -I/usr/lib/libffi-3.0.13/include 
+ 
+ # replace -O2 with -Oz when using clang/llvm
+ #CC = clang 
+diff -Nuar a/makefile_linux_utf8_ffi b/makefile_linux_utf8_ffi
+--- a/makefile_linux_utf8_ffi	2017-01-25 17:42:21.000000000 +0100
++++ b/makefile_linux_utf8_ffi	2018-03-17 23:35:51.193015723 +0100
+@@ -6,7 +6,7 @@
+ OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \
+ 	nl-sock.o nl-import.o nl-xml-json.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o
+ 
+-CFLAGS = -fPIC -m32 -Wall -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include
++CFLAGS = -fPIC -m32 -Wall -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DLINUX -DFFI -I/usr/lib/libffi-3.0.13/include
+ 
+ CC = gcc
+ 
+diff -Nuar a/makefile_original_install b/makefile_original_install
+--- a/makefile_original_install	2017-01-25 17:42:21.000000000 +0100
++++ b/makefile_original_install	2018-03-17 23:36:45.533015490 +0100
+@@ -6,16 +6,16 @@
+ # run in an environment, where NEWLISPDIR is predefined,
+ # else NEWLISPDIR will be defined during newlisp startup
+ # as /usr/share/newlisp which is hardcoded in newlisp.c
+-prefix=/usr/local
++prefix=/usr
+ datadir=$(prefix)/share
+ bindir=$(prefix)/bin
+ mandir=$(prefix)/share/man
+ 
+-# if prefix is not /usr/local then several places in the file 
++# if prefix is not /usr then several places in the file 
+ # guiserver/newlisp-edit.lsp must change too
+ GUISERVER = $(prefix)/share/newlisp/guiserver
+ 
+-# this is the standard install in /usr/local/bin and /usr/local/share
++# this is the standard install in /usr/bin and /usr/share
+ # which as to be done as 'root' with supersuser permissions
+ # for an install in your home directory use make install_home
+ #
+@@ -31,7 +31,9 @@
+ 	-install -d $(datadir)/newlisp/modules
+ 	-install -d $(datadir)/newlisp/util
+ 	-install -d $(datadir)/doc/newlisp
+-	-rm $(bindir)/newlisp
++	-install -d $(datadir)/man
++	-install -d $(datadir)/man/man1
++	-install -d $(bindir)
+ 	-install -m 755  newlisp $(bindir)/newlisp-$(VERSION)
+ 	-ln -s $(bindir)/newlisp-$(VERSION) $(bindir)/newlisp
+ 	-install -m 755 util/newlispdoc $(bindir)/newlispdoc
diff --git a/dev-lisp/newlisp/files/newlisp-path-10.7.0.patch b/dev-lisp/newlisp/files/newlisp-10.7.1-fix-path.patch
index c603e53e..c603e53e 100644
--- a/dev-lisp/newlisp/files/newlisp-path-10.7.0.patch
+++ b/dev-lisp/newlisp/files/newlisp-10.7.1-fix-path.patch
diff --git a/dev-lisp/newlisp/files/newlisp-10.7.1-fix-paths.patch b/dev-lisp/newlisp/files/newlisp-10.7.1-fix-paths.patch
new file mode 100644
index 00000000..6636c625
--- /dev/null
+++ b/dev-lisp/newlisp/files/newlisp-10.7.1-fix-paths.patch
@@ -0,0 +1,345 @@
+diff -Nuar a/configure b/configure
+--- a/configure	2017-01-25 17:42:21.000000000 +0100
++++ b/configure	2018-03-17 23:38:36.303015016 +0100
+@@ -90,7 +90,7 @@
+ 	fi
+ elif [ ${os_type} = _BSD ] ; then
+ 	if [ ${memory_model} = LP64 ] ; then
+-		if [ -f /usr/local/include/ffi.h ] ; then
++		if [ -f /usr/include/ffi.h ] ; then
+ 			cp makefile_bsdLP64_utf8_ffi makefile_build
+ 		else
+ 			cp makefile_bsdLP64_utf8 makefile_build
+diff -Nuar a/configure-alt b/configure-alt
+--- a/configure-alt	2017-01-25 17:42:21.000000000 +0100
++++ b/configure-alt	2018-03-17 23:38:42.193014991 +0100
+@@ -328,7 +328,7 @@
+ esac
+ done
+ 
+-if [ -z "$prefix" ] ; then prefix="/usr/local"; fi
++if [ -z "$prefix" ] ; then prefix="/usr"; fi
+ if [ -z "$exec_prefix" ] ; then exec_prefix="$prefix"; fi
+ if [ -z "$bindir" ] ; then bindir="${exec_prefix}/bin"; fi
+ if [ -z "$datarootdir" ] ; then datarootdir="${prefix}/share"; fi
+diff -Nuar a/guiserver/allfonts-demo.lsp b/guiserver/allfonts-demo.lsp
+--- a/guiserver/allfonts-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/allfonts-demo.lsp	2018-03-17 23:38:47.253014969 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; allfonts-demo.lsp - show all fonts on the system
+ ;; this program also demonstrates that strings can be used instead 
+diff -Nuar a/guiserver/animation-demo.lsp b/guiserver/animation-demo.lsp
+--- a/guiserver/animation-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/animation-demo.lsp	2018-03-17 23:38:53.323014943 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; animation-demo.lsp - demonstrate gs:move-tag for making animations
+ ;; and the mouse-wheel moving a text object
+diff -Nuar a/guiserver/border-layout-demo.lsp b/guiserver/border-layout-demo.lsp
+--- a/guiserver/border-layout-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/border-layout-demo.lsp	2018-03-17 23:38:57.043014927 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; border-layout-demo.lsp - demonstrate the border layout
+ 
+diff -Nuar a/guiserver/button-demo.lsp b/guiserver/button-demo.lsp
+--- a/guiserver/button-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/button-demo.lsp	2018-03-17 23:39:01.623014908 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ; button-demo.lsp - demonstrate the button control
+ 
+diff -Nuar a/guiserver/clipboard-demo.lsp b/guiserver/clipboard-demo.lsp
+--- a/guiserver/clipboard-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/clipboard-demo.lsp	2018-03-17 23:39:15.393014849 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; clipboard-demo.lsp - demonstrate the gs:paste-text function
+ 
+diff -Nuar a/guiserver/cursor-demo.lsp b/guiserver/cursor-demo.lsp
+--- a/guiserver/cursor-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/cursor-demo.lsp	2018-03-17 23:39:20.653014826 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; cursor-demo - demonstrate cursor shapes with gs:set-cursor
+ 
+diff -Nuar a/guiserver/drag-demo.lsp b/guiserver/drag-demo.lsp
+--- a/guiserver/drag-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/drag-demo.lsp	2018-03-17 23:39:25.043014808 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; drag-demo.lsp - demonstrate dragging of objects with the mouse
+ ;;
+diff -Nuar a/guiserver/font-demo.lsp b/guiserver/font-demo.lsp
+--- a/guiserver/font-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/font-demo.lsp	2018-03-17 23:39:27.153014798 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; font-demo.lsp - show all built-in Java fonts (available on all platforms)
+ 
+diff -Nuar a/guiserver/frameless-demo.lsp b/guiserver/frameless-demo.lsp
+--- a/guiserver/frameless-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/frameless-demo.lsp	2018-03-17 23:39:30.313014785 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ 
+ ;; frameless-demo.lsp - frameless and transparent (on MacOS X)
+ 
+diff -Nuar a/guiserver/guiserver.lsp b/guiserver/guiserver.lsp
+--- a/guiserver/guiserver.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/guiserver.lsp	2018-03-17 23:40:13.003014602 +0100
+@@ -41,7 +41,7 @@
+ ;; <h2>Usage</h2>
+ ;; At the beginning of the program file, include a 'load' statement for the module:
+ ;; <pre>
+-;; (load "/usr/local/share/newlisp/guiserver.lsp")
++;; (load "/usr/share/newlisp/guiserver.lsp")
+ ;; </pre>
+ ;; or on MS Windows:
+ ;; <pre>
+@@ -50,7 +50,7 @@
+ ;; 'guiserver.lsp' expects the server 'guiserver.jar' to be
+ ;; in the directoey specified in the environment variable NEWLISPDIR.
+ ;; When newLISP starts up and this variable is not set yet, it sets it
+-;; to a default value of '/usr/local/share/newlisp' on MacOS X and Unix OSs, and 
++;; to a default value of '/usr/share/newlisp' on MacOS X and Unix OSs, and 
+ ;; to 'C:\Program Files\newlisp' or whatever it finds in the 'PROGRAMFILES'
+ ;; environment variable on MS Windows systems and adding '/newlisp' to it.
+ ;; This can be overwritten by specifying system wide  setting for the environment 
+@@ -132,12 +132,12 @@
+ ;; A second method to start a newLISP-GS application starts the 'guiserver.jar' first, which then
+ ;; starts the newLISP application:
+ ;; <pre>
+-;;     java -jar /usr/local/share/newlisp/guiserver.jar 64001 /usr/home/aUser/MyApplication.lsp
++;;     java -jar /usr/share/newlisp/guiserver.jar 64001 /usr/home/aUser/MyApplication.lsp
+ ;; </pre>
+ ;; A different port number can be used. Port numbers below 1024 need administrator
+ ;; permissions. Optionally a splash screen can be specified as the last parameter:
+ ;; <pre>
+-;;     java -jar /usr/local/share/newlisp/guiserver.jar 64001 /home/apps/myapp.lsp /local/newLISP128.png
++;;     java -jar /usr/share/newlisp/guiserver.jar 64001 /home/apps/myapp.lsp /local/newLISP128.png
+ ;; </pre>
+ ;; The example specifies an image inside 'guiserver.jar'. Any other image path on the local file system
+ ;; can be used.
+@@ -718,7 +718,7 @@
+ ;; instrument for all 128 different keys/notes.
+ ;;
+ ;; Basic capabilities of the sound API are shown in the demo files <tt>midi-demo.lsp</tt>
+-;; and <tt>midi2-demo.lsp</tt> in the <tt>/usr/local/share/newlisp/guiserver/</tt> or 
++;; and <tt>midi2-demo.lsp</tt> in the <tt>/usr/share/newlisp/guiserver/</tt> or 
+ ;; <tt>c:\Program files\newlisp\guiserver\</tt> directory.
+ ;; <pre>
+ ;;    (gs:add-track <int channel><list-notes>)
+diff -Nuar a/guiserver/html-demo.lsp b/guiserver/html-demo.lsp
+--- a/guiserver/html-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/html-demo.lsp	2018-03-17 23:40:20.683014569 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; html-demo.lsp - demonstrate  the text pane with HTML
+ 
+diff -Nuar a/guiserver/image-demo.lsp b/guiserver/image-demo.lsp
+--- a/guiserver/image-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/image-demo.lsp	2018-03-17 23:40:23.003014559 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; image-demo.lsp - demonstrate images rotating and zooming
+ ;; and the mouse-wheel rotating an object
+diff -Nuar a/guiserver/midi2-demo.lsp b/guiserver/midi2-demo.lsp
+--- a/guiserver/midi2-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/midi2-demo.lsp	2018-03-17 23:40:36.173014503 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ 
+ (load (append (env "NEWLISPDIR") "/guiserver.lsp"))
+ (gs:init)
+diff -Nuar a/guiserver/mouse-demo.lsp b/guiserver/mouse-demo.lsp
+--- a/guiserver/mouse-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/mouse-demo.lsp	2018-03-17 23:40:40.033014487 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; mouse-demo.lsp - demonstrate mouse handlers and gs:delete-tag
+ ;; v.1.1
+diff -Nuar a/guiserver/move-resize-demo.lsp b/guiserver/move-resize-demo.lsp
+--- a/guiserver/move-resize-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/move-resize-demo.lsp	2018-03-17 23:40:43.283014473 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ; move-resize-demo.lsp - demonstrate gs:window-moved and hs:window-resized events
+ 
+diff -Nuar a/guiserver/newlisp-edit.lsp b/guiserver/newlisp-edit.lsp
+--- a/guiserver/newlisp-edit.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/newlisp-edit.lsp	2018-03-17 23:40:50.823014440 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ 
+ ; newlisp-edit.lsp - multiple tab LISP editor and support for running code from the editor
+ ; needs 9.9.2 version minimum to run
+diff -Nuar a/guiserver/pinballs-demo.lsp b/guiserver/pinballs-demo.lsp
+--- a/guiserver/pinballs-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/pinballs-demo.lsp	2018-03-17 23:40:59.453014403 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;; pinballs-demo.lsp - demos animations and gs:check-event function
+ 
+ ;; GS 1.05+
+diff -Nuar a/guiserver/properties-demo.lsp b/guiserver/properties-demo.lsp
+--- a/guiserver/properties-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/properties-demo.lsp	2018-03-17 23:41:01.723014394 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; property-demo.lsp - demonstrate gs:get-screen and gs:get-version
+ 
+diff -Nuar a/guiserver/rotation-demo.lsp b/guiserver/rotation-demo.lsp
+--- a/guiserver/rotation-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/rotation-demo.lsp	2018-03-17 23:41:04.653014381 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; rotationn-demo.lsp - demonstrate gs:rotate-tag, gs:translate-tag and  gs:scale-tag
+ ;; and the mouse-wheel rotating an object
+diff -Nuar a/guiserver/shapes-demo.lsp b/guiserver/shapes-demo.lsp
+--- a/guiserver/shapes-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/shapes-demo.lsp	2018-03-17 23:41:08.783014364 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; shapes-demo.lsp - demonstrate different lines, outlines and shapes
+ ;; v.1.1
+diff -Nuar a/guiserver/sound-demo.lsp b/guiserver/sound-demo.lsp
+--- a/guiserver/sound-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/sound-demo.lsp	2018-03-17 23:41:15.463014335 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ; button-demo.lsp - demonstrate the button control
+ 
+diff -Nuar a/guiserver/stroke-demo.lsp b/guiserver/stroke-demo.lsp
+--- a/guiserver/stroke-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/stroke-demo.lsp	2018-03-17 23:41:17.533014326 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; strokes-demo.lsp - demonstrate strokes with round endings in different lines and outlines
+ ;; v. 1.1
+diff -Nuar a/guiserver/table-demo.lsp b/guiserver/table-demo.lsp
+--- a/guiserver/table-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/table-demo.lsp	2018-03-17 23:41:19.933014316 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ 
+ ; table-demo.lsp - demo of the table UI
+ 
+diff -Nuar a/guiserver/tabs-demo.lsp b/guiserver/tabs-demo.lsp
+--- a/guiserver/tabs-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/tabs-demo.lsp	2018-03-17 23:41:22.553014305 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; tabs-demo.lsp - demonstrate tabs and icons
+ ;; for 10.6.3 ideprecated gs:table-set-row-number was replaced with gs:table-show-row-number
+diff -Nuar a/guiserver/textfield-demo.lsp b/guiserver/textfield-demo.lsp
+--- a/guiserver/textfield-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/textfield-demo.lsp	2018-03-17 23:41:24.663014296 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ; textfield-demo.lsp - demonstrate the test-field widget
+ 
+diff -Nuar a/guiserver/textrot-demo.lsp b/guiserver/textrot-demo.lsp
+--- a/guiserver/textrot-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/textrot-demo.lsp	2018-03-17 23:41:27.363014284 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; textrot-demo.lsp - demonstrate gs:rotate-tag on text
+ ;; and the mouse-wheel rotating an object
+diff -Nuar a/guiserver/widgets-demo-jp.lsp b/guiserver/widgets-demo-jp.lsp
+--- a/guiserver/widgets-demo-jp.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/widgets-demo-jp.lsp	2018-03-17 23:41:33.983014256 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; widgets-demo.lsp - demonstrate all widgets
+ 
+diff -Nuar a/guiserver/widgets-demo.lsp b/guiserver/widgets-demo.lsp
+--- a/guiserver/widgets-demo.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/widgets-demo.lsp	2018-03-17 23:41:37.023014243 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp
++#!/usr/bin/newlisp
+ ;;
+ ;; widgets-demo.lsp - demonstrate all widgets
+ 
+diff -Nuar a/guiserver/widgets-demo-ru.lsp b/guiserver/widgets-demo-ru.lsp
+--- a/guiserver/widgets-demo-ru.lsp	2017-01-25 17:42:21.000000000 +0100
++++ b/guiserver/widgets-demo-ru.lsp	2018-03-17 23:41:40.463014228 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/newlisp

++#!/usr/bin/newlisp

+ ;;

+ ;; widgets-demo.lsp - demonstrate all widgets

+ 

+diff -Nuar a/newlisp.h b/newlisp.h
+--- a/newlisp.h	2017-01-25 17:42:21.000000000 +0100
++++ b/newlisp.h	2018-03-17 23:43:10.193013844 +0100
+@@ -37,7 +37,7 @@
+ #ifdef NEWCONFIG
+ #include "config.h"
+ #else
+-#define NEWLISPDIR "/usr/local/share/newlisp"
++#define NEWLISPDIR "/usr/share/newlisp"
+ #endif
+ 
+ /* force ISO_C90 restrictions */
+diff -Nuar a/README b/README
+--- a/README	2017-01-25 17:42:21.000000000 +0100
++++ b/README	2018-03-17 23:38:31.183015038 +0100
+@@ -100,7 +100,7 @@
+ Note that for a minumum install only the executable newlisp or newlisp.exe
+ in Win32 is necessary.
+ 
+-On Mac OS X or other UNIX copy  newlisp to /usr/local/bin or /usr/bin or ~/bin 
++On Mac OS X or other UNIX copy  newlisp to /usr/bin or /usr/bin or ~/bin 
+ and give it executable permissions.
+ 
+ 
diff --git a/dev-lisp/newlisp/files/newlisp-makefile-install-10.6.2.patch b/dev-lisp/newlisp/files/newlisp-10.7.1-makefile-install.patch
index c3b92153..c3b92153 100644
--- a/dev-lisp/newlisp/files/newlisp-makefile-install-10.6.2.patch
+++ b/dev-lisp/newlisp/files/newlisp-10.7.1-makefile-install.patch
diff --git a/dev-lisp/newlisp/files/newlisp-makefile-install-10.5.4.patch b/dev-lisp/newlisp/files/newlisp-makefile-install-10.5.4.patch
deleted file mode 100644
index fafb8b07..00000000
--- a/dev-lisp/newlisp/files/newlisp-makefile-install-10.5.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar a/makefile_original_install b/makefile_original_install
---- a/makefile_original_install	2013-10-01 17:52:03.000000000 +0200
-+++ b/makefile_original_install	2014-01-20 13:04:41.569999708 +0100
-@@ -31,7 +31,10 @@
- 	-install -d $(datadir)/newlisp/modules
- 	-install -d $(datadir)/newlisp/util
- 	-install -d $(datadir)/doc/newlisp
--	-rm $(bindir)/newlisp
-+		-install -d $(datadir)/man
-+	-install -d $(datadir)/man/man1
-+	-install -d $(bindir)
-+
- 	-install -m 755  newlisp $(bindir)/newlisp-$(VERSION)
- 	-ln -s $(bindir)/newlisp-$(VERSION) $(bindir)/newlisp
- 	-install -m 755 util/newlispdoc $(bindir)/newlispdoc
diff --git a/dev-lisp/newlisp/files/newlisp-makefile-install-10.7.0.patch b/dev-lisp/newlisp/files/newlisp-makefile-install-10.7.0.patch
deleted file mode 100644
index c3b92153..00000000
--- a/dev-lisp/newlisp/files/newlisp-makefile-install-10.7.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/makefile_original_install b/makefile_original_install
---- a/makefile_original_install	2015-01-19 18:10:12.000000000 +0100
-+++ b/makefile_original_install	2015-06-22 12:59:33.639980437 +0200
-@@ -31,7 +31,9 @@
- 	-install -d $(datadir)/newlisp/modules
- 	-install -d $(datadir)/newlisp/util
- 	-install -d $(datadir)/doc/newlisp
--	-rm $(bindir)/newlisp
-+	-install -d $(datadir)/man
-+	-install -d $(datadir)/man/man1
-+	-install -d $(bindir)
- 	-install -m 755  newlisp $(bindir)/newlisp-$(VERSION)
- 	-ln -s $(bindir)/newlisp-$(VERSION) $(bindir)/newlisp
- 	-install -m 755 util/newlispdoc $(bindir)/newlispdoc
diff --git a/dev-lisp/newlisp/newlisp-10.5.4.ebuild b/dev-lisp/newlisp/newlisp-10.5.4.ebuild
deleted file mode 100644
index 12c85d40..00000000
--- a/dev-lisp/newlisp/newlisp-10.5.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib
-
-DESCRIPTION="newLISP - a new generation of Lisp!"
-HOMEPAGE="http://www.newlisp.org/"
-SRC_URI="http://www.newlisp.org/downloads/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libffi unicode"
-
-RDEPEND="sys-libs/readline:=
-	libffi? ( dev-libs/libffi )"
-DEPEND="${RDEPEND}"
-
-getmakefile() {
-	local arch=""
-	local opts=""
-
-	use amd64 && arch="LP64"
-	use libffi && use unicode && opts="_utf8_ffi"
-	use libffi && ! use unicode && opts="_ffi"
-	! use libffi && use unicode && opts="_utf8"
-
-	use unicode && utf8="utf8"
-	echo "makefile_linux${arch}${opts}"
-}
-
-getlibffipath() {
-	local version=$(best_version dev-libs/libffi)
-
-	version=$(echo ${version} | cut -d/ -f 2)
-	echo "/usr/$(get_libdir)/${version}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-makefile-install-${PV}.patch"
-}
-
-src_configure() {
-	local makefile=$(getmakefile)
-	if [[ -f ${makefile} ]] ; then
-		cp "${makefile}" makefile_build || die
-		sed -i 's/CFLAGS/MYCFLAGS/g' makefile_build || die
-		sed -i 's/-O2 -g/$(CFLAGS)/g' makefile_build || die
-		sed -i '/strip newlisp/d' makefile_build || die
-	else
-		./configure-alt --prefix="${D}/usr"
-		sed -i '/$(STRIP) $(TARG)/d' makefile_build || die
-	fi
-	if use libffi ; then
-		sed -i "s|/usr/local/lib/libffi-3.0.13|$(getlibffipath)|" makefile_build || die
-	fi
-}
-
-src_install() {
-	make prefix="${D}/usr" install
-}
diff --git a/dev-lisp/newlisp/newlisp-10.7.0.ebuild b/dev-lisp/newlisp/newlisp-10.7.0.ebuild
deleted file mode 100644
index bf0a5bf1..00000000
--- a/dev-lisp/newlisp/newlisp-10.7.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="newLISP - a new generation of Lisp!"
-HOMEPAGE="http://www.newlisp.org/"
-SRC_URI="http://www.newlisp.org/downloads/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libffi unicode"
-
-RDEPEND="sys-libs/readline:=
-	libffi? ( dev-libs/libffi )"
-DEPEND="${RDEPEND}"
-
-getmakefile() {
-	local arch=""
-	local opts=""
-
-	use amd64 && arch="LP64"
-	use libffi && use unicode && opts="_utf8_ffi"
-	use libffi && ! use unicode && opts="_ffi"
-	! use libffi && use unicode && opts="_utf8"
-
-	use unicode && utf8="utf8"
-	echo "makefile_linux${arch}${opts}"
-}
-
-getlibffipath() {
-	local version=$(best_version dev-libs/libffi)
-
-	version=$(echo ${version} | cut -d/ -f 2)
-	echo "/usr/$(get_libdir)/${version}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-makefile-install-${PV}.patch"
-	epatch "${FILESDIR}/${PN}-path-${PV}.patch"
-}
-
-src_configure() {
-	local makefile=$(getmakefile)
-	if [[ -f ${makefile} ]] ; then
-		cp "${makefile}" makefile_build || die
-		sed -i 's/CFLAGS/MYCFLAGS/g' makefile_build || die
-		sed -i 's/-O2 -g/$(CFLAGS)/g' makefile_build || die
-		sed -i '/strip newlisp/d' makefile_build || die
-	else
-		./configure-alt --prefix="${D}/usr"
-		sed -i '/$(STRIP) $(TARG)/d' makefile_build || die
-	fi
-	if use libffi ; then
-		sed -i "s|/usr/local/lib/libffi-3.0.13|$(getlibffipath)|" makefile_build || die
-	fi
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-src_install() {
-	make prefix="${D}/usr" install
-}
diff --git a/dev-lisp/newlisp/newlisp-10.6.2.ebuild b/dev-lisp/newlisp/newlisp-10.7.1.ebuild
index b0a60069..53a115be 100644
--- a/dev-lisp/newlisp/newlisp-10.6.2.ebuild
+++ b/dev-lisp/newlisp/newlisp-10.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,11 @@ RDEPEND="sys-libs/readline:=
 	libffi? ( dev-libs/libffi )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-makefiles.patch"
+	"${FILESDIR}/${P}-fix-paths.patch"
+)
+
 getmakefile() {
 	local arch=""
 	local opts=""
@@ -38,10 +43,6 @@ getlibffipath() {
 	echo "/usr/$(get_libdir)/${version}"
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-makefile-install-${PV}.patch"
-}
-
 src_configure() {
 	local makefile=$(getmakefile)
 	if [[ -f ${makefile} ]] ; then