gentoo resync : 16.06.2019

8 files changed, 92 insertions, 540 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 1af04e854ac8..f267ab882622 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 0fee4f5eaec3..c7c242bd369c 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,4 +1,7 @@
 AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca7653c6701eafe9ec9b3e5284a2ff8b7f989fb65425840da0513e719fe5fa820deb4814d3e838dd5b33651eb4e3c4e SHA512 8f49c6c3b1575cc77d0d9d6c8b75098889af1f8fda58fee1f58150669909e6c4ecbd953738e9c917adcbb1bddc16debe5564b70694d6983295439e06e26782d6
+AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
+DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
 EBUILD lpeg-1.0.1.ebuild 1246 BLAKE2B 3bd53964f81605c56758395984aaaf815a50bef2e03346a5dc658ac46d98d76c16f18df8af7a2224995206d49397cff0281b750a6b1aabc90a8e40ae2497cc06 SHA512 5a364050082fba5a1e1aa598d0892cbbe915b540981d99807b461346f98671ad8707286467243cc1f1f04014d455df747891dc23376e4ecabd13fc4408e6d0b5
+EBUILD lpeg-1.0.2.ebuild 1241 BLAKE2B 8ca6008090465d46fb8946c2d0d8d1e122014683afa756dccd4d16cbc4ea4455f3da24708598126e9bc4955274b18be200e01e4ae93ff5e98ffed15dbf30fc45 SHA512 b253d69d8ab5919e05f501194897ab4f78609bed58764953c31d32b69854445254099b00446461ba888acbe599a24a011722d1c70ce6e21b80554e9934c26b52
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/files/lpeg-1.0.2-makefile.patch b/dev-lua/lpeg/files/lpeg-1.0.2-makefile.patch
new file mode 100644
index 000000000000..ec8150443da4
--- /dev/null
+++ b/dev-lua/lpeg/files/lpeg-1.0.2-makefile.patch
@@ -0,0 +1,31 @@
+Respect user CFLAGS and LDFLAGS.
+
+--- lpeg-1.0.2/makefile
++++ lpeg-1.0.2/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = ../lua/
+ 
+-COPT = -O2 -DNDEBUG
++COPT = -DNDEBUG
+ # COPT = -g
+ 
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,7 +22,7 @@
+ # -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
+ CC = gcc
+ 
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+@@ -36,7 +36,7 @@
+ 	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+ 
diff --git a/dev-lua/lpeg/lpeg-1.0.2.ebuild b/dev-lua/lpeg/lpeg-1.0.2.ebuild
new file mode 100644
index 000000000000..5596fb03b62e
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug doc luajit"
+
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2= )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( HISTORY )
+HTML_DOCS=( lpeg.html re.html )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
+
+src_prepare() {
+	default
+	use debug && append-cflags -DLPEG_DEBUG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+}
+
+src_test() {
+	$(usex luajit 'luajit' 'lua') test.lua || die
+}
+
+src_install() {
+	local instdir
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+	exeinto "${instdir#${EPREFIX}}"
+	doexe lpeg.so
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+	insinto "${instdir#${EPREFIX}}"
+	doins re.lua
+
+	use doc && einstalldocs
+}
diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest
index 2433f6220918..2cdb7c06115e 100644
--- a/dev-lua/toluapp/Manifest
+++ b/dev-lua/toluapp/Manifest
@@ -1,7 +1,6 @@
-AUX toluapp-1.0.93_p20190513-fix-multilib.patch 1349 BLAKE2B e858078bbca8d548e958802ccbd442b3a73c8e6ab87e77e85d17b33cc4982ef52b2889e414b6d5dc87e6c95e1e6bedad144930062da1a0649a012b130fc197ec SHA512 746e6dc7f5e0c5d60ed97a0262eb32179be2051caaed9b5bdbad278b62adb6a06790a0e32bf0e14717c481c9c8d0733af7b54578f7cbcd98ee9fb1699b661351
-AUX toluapp-1.0.93_p20190513-lua5.3.patch 14228 BLAKE2B 53c0797cd842d8738471e5165c47bb62b976e000295e09b58c18ab77a4054a1e0f3fa4a69f72a391a2846cd6ec71c554bfe3bd3860ceb36a33ba31925be53b32 SHA512 23c15dd4035008221b6c548f629b548650f118fca33503c596d524a11561c1cdc5d9b5b35a7420cbd0c88118ec5d3e83d77d9386d6c67f8cee877cefe5eeab6d
+AUX toluapp-1.0.93_p20190513-fix-multilib.patch 1435 BLAKE2B cdcfa5e194dafa466cca5fb05d8cdfc285b97ff3a91c81fe71159601245576527a2f3d8539c3a3f15be745eab14cfe084a3fc90042e141b503dcee8063c85f8f SHA512 2cf6c341e3749aff13a89cc5894b900132b78b423a3b3c858d0235735c2c237b5503ea5a187ddcb851c12a69d42400da1e7556081e178edaafd406b84fb6e893
 DIST tolua++-1.0.93.tar.bz2 163956 BLAKE2B e4ff54ec130036654446a6e1f5d487d40af9ebbf2fdb3a8ae055fd20768fad6434fdfd4f359369dbc3669565f54dad3d6957da06c6e029e6abe6a529861ff96e SHA512 d1ae56b2dd38437e0aef81d5230d1a954b8f914133cfa199a18193d05ecfd188ec2bbeec76e63846ef673dc89c12e47bfd9727c227b71833d622cc441c071013
 DIST toluapp-1.0.93_p20190513.tar.gz 248043 BLAKE2B 08db9f86f224c95532ede354d93317680beeacb7ab8c0e41ddd8ed785a682ab4a3664265d10fae7d36fab33864442fcb403985176a9c01797e29c72708500968 SHA512 5750f9d4bbb39832650ac6874c2933f4ed3ff5f6a40a2345ab795f6fea841ccdbc93cd1fee53ffc93db3cee43bfdb367fa1ec19cf0cd1f75edf6bdb8ee269442
 EBUILD toluapp-1.0.93.ebuild 1090 BLAKE2B 0d63d5898ff64f87f639ca7cda694858d18849577c53cb126487da3b9365dc8e30b821e3a710c0e299c18ce7397cd139f5476e27d4606a533f7b56064c3a5a96 SHA512 c1ce00a29c5ca0217a423167de7c9f35a1070d6ba008bc0bae6268e3d34b1480dab561d0253c4817b6350b16a6ce213db3126db615d373748e31871baba4128d
-EBUILD toluapp-1.0.93_p20190513.ebuild 760 BLAKE2B e3e1a246ea092c44675e0499eb66d7a4fafb06b7a5269795f63e74ec8e440dd97467cad1c2659b891da7e651475723b560b759a3d2229af685c256dbf3c22c21 SHA512 59d87f22b6cfc6ec31ca6c855ef0a3296711be66051a3f26df6f582fa0fd8ce02ea6d544f61d4270e34980d41aef26c6b412fa30e97190fe9b558e4c23a7dd8b
+EBUILD toluapp-1.0.93_p20190513-r1.ebuild 707 BLAKE2B 19c8f71114a5319d6d14641416a4a56b5f2103afeb10bcc4d8dc99f698736dd247bdb73d6955b31ed62dfc718279ffcf3f0f981b7466bf6a26c4d7031c79c896 SHA512 4119b58227ebd93e1316a057c697a49422df1d835b5582f0088e60c78ce506de83a252b3bfa33ce16e049b3e8abe6fb7a1290093375650162e5e9268f74a74ab
 MISC metadata.xml 228 BLAKE2B 6647e8693ddcece1ed5d215bc3502e0a16df0f2fedbf03c0dedac5b669bf0ca178284c69eae29b933f94ec58543c951e7d207d0d8a774fc7e4bfd64f3371ae74 SHA512 27499f64eb2cb593e91dd72dc5498d5df3ea7c4402e86897f79ef6fc7f040c6c09be497959af35ee54943f36ac228a6b92302b5d85763e4d0e96398670e81f45
diff --git a/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-fix-multilib.patch b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-fix-multilib.patch
index 21ebc4992382..b8f1cd3759ff 100644
--- a/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-fix-multilib.patch
+++ b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-fix-multilib.patch
@@ -18,7 +18,7 @@
    1 )
  
  # Build app
-@@ -27,10 +27,11 @@
+@@ -27,10 +27,12 @@
  set ( SRC_TOLUA src/bin/tolua.c src/bin/toluabind.c )
  add_executable ( toluapp ${SRC_TOLUA} )
  target_link_libraries ( toluapp toluapp_lib ${LUA_LIBRARIES} )
@@ -35,3 +35,4 @@
 +install( DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
 +install( FILES README DESTINATION ${CMAKE_INSTALL_DOCDIR} )
 +install( DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html )
++install( DIRECTORY src/bin/lua/ DESTINATION ${CMAKE_INSTALL_DATADIR}/toluapp/luapp )
diff --git a/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua5.3.patch b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua5.3.patch
deleted file mode 100644
index 4da3e33e7fec..000000000000
--- a/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua5.3.patch
+++ /dev/null
@@ -1,534 +0,0 @@
-Taken from https://aur.archlinux.org/cgit/aur.git/tree/tolua53.patch?h=tolua%2b%2b_5.3
-and slimmed down
-
---- a/src/bin/lua/all.lua
-+++ b/src/bin/lua/all.lua
-@@ -1,8 +1,8 @@
- dofile(path.."compat-5.1.lua")
- dofile(path.."compat.lua")
--dofile(path.."basic.lua")
- dofile(path.."feature.lua")
- dofile(path.."verbatim.lua")
-+dofile(path.."basic.lua")
- dofile(path.."code.lua")
- dofile(path.."typedef.lua")
- dofile(path.."container.lua")
---- a/src/bin/lua/basic.lua
-+++ b/src/bin/lua/basic.lua
-@@ -75,8 +75,8 @@
- end
- 
- function applyrenaming (s)
--	for i=1,getn(_renaming) do
--	 local m,n = gsub(s,_renaming[i].old,_renaming[i].new)
-+	for i,v in ipairs(_renaming) do
-+	 local m,n = gsub(s,v.old,v.new)
- 		if n ~= 0 then
- 		 return m
- 		end
-@@ -252,7 +252,8 @@
- -- concatenate all parameters, following output rules
- function concatparam (line, ...)
-  local i=1
-- while i<=arg.n do
-+ local arg={...}
-+ while i<=#arg do
-   if _cont and not strfind(_cont,'[%(,"]') and
-      strfind(arg[i],"^[%a_~]") then
- 	    line = line .. ' '
-@@ -263,7 +264,7 @@
-   end
-   i = i+1
-  end
-- if strfind(arg[arg.n],"[%/%)%;%{%}]$") then
-+ if strfind(arg[#arg],"[%/%)%;%{%}]$") then
-   _cont=nil line = line .. '\n'
-  end
- 	return line
-@@ -272,7 +273,8 @@
- -- output line
- function output (...)
-  local i=1
-- while i<=arg.n do
-+ local arg = {...}
-+ while i<=#arg do
-   if _cont and not strfind(_cont,'[%(,"]') and
-      strfind(arg[i],"^[%a_~]") then
- 	    write(' ')
-@@ -283,7 +285,7 @@
-   end
-   i = i+1
-  end
-- if strfind(arg[arg.n],"[%/%)%;%{%}]$") then
-+ if strfind(arg[#arg],"[%/%)%;%{%}]$") then
-   _cont=nil write('\n')
-  end
- end
-@@ -373,9 +375,10 @@
- 
- end
- 
-+
- -- called to output an error message
- function output_error_hook(...)
--	return string.format(...)
-+	return string.format(table.unpack{...})
- end
- 
- -- custom pushers
---- a/src/bin/lua/class.lua
-+++ b/src/bin/lua/class.lua
-@@ -92,7 +92,7 @@
- 	self.btype = typevar(self.base)
- 	self.ctype = 'const '..self.type
- 	if self.extra_bases then
--		for i=1,table.getn(self.extra_bases) do
-+		for i=1,#self.extra_bases do
- 			self.extra_bases[i] = typevar(self.extra_bases[i])
- 		end
- 	end
-@@ -138,9 +138,9 @@
- -- Expects the name, the base (array) and the body of the class.
- function Class (n,p,b)
- 
--	if table.getn(p) > 1 then
-+	if #p > 1 then
- 		b = string.sub(b, 1, -2)
--		for i=2,table.getn(p),1 do
-+		for i=2,#p,1 do
- 			b = b.."\n tolua_inherits "..p[i].." __"..p[i].."__;\n"
- 		end
- 		b = b.."\n}"
---- a/src/bin/lua/clean.lua
-+++ b/src/bin/lua/clean.lua
-@@ -19,14 +19,14 @@
- }
- 
- function mask (s)
-- for i = 1,getn(MASK)  do
-+ for i = 1,#MASK  do
-   s = gsub(s,MASK[i][2],MASK[i][1])
-  end
-  return s
- end
- 
- function unmask (s)
-- for i = 1,getn(MASK)  do
-+ for i = 1,#MASK  do
-   s = gsub(s,MASK[i][1],MASK[i][2])
-  end
-  return s
---- a/src/bin/lua/compat-5.1.lua
-+++ b/src/bin/lua/compat-5.1.lua
-@@ -25,10 +25,10 @@
- 		end

- 	end

- 

--	local f = load(getfile, path)

-+	local f, errmsg = load(getfile, path)

- 	if not f then

- 	

--		error("error loading file "..path)

-+		error("error loading file "..path ..": " .. errmsg)

- 	end

- 	return f()

- end

---- a/src/bin/lua/compat.lua
-+++ b/src/bin/lua/compat.lua
-@@ -40,15 +40,13 @@
-   end
- end
- 
--function dostring(s) return do_(loadstring(s)) end
-+function dostring(s) return do_(load(s)) end
- -- function dofile(s) return do_(loadfile(s)) end
- 
- -------------------------------------------------------------------
- -- Table library
- local tab = table
--foreach = tab.foreach
--foreachi = tab.foreachi
--getn = tab.getn
-+getn = function (tab) return #tab end
- tinsert = tab.insert
- tremove = tab.remove
- sort = tab.sort
-@@ -78,7 +76,7 @@
- frexp = math.frexp
- ldexp = math.ldexp
- log = math.log
--log10 = math.log10
-+log10 = function(val) return math.log(10, val) end
- max = math.max
- min = math.min
- mod = math.mod
-@@ -177,17 +175,19 @@
- 
- function read (...)
-   local f = _INPUT
-+  local arg = {...}
-   if rawtype(arg[1]) == 'userdata' then
-     f = tab.remove(arg, 1)
-   end
--  return f:read(unpack(arg))
-+  return f:read(table.unpack(arg))
- end
- 
- function write (...)
-   local f = _OUTPUT
-+  local arg = {...}
-   if rawtype(arg[1]) == 'userdata' then
-     f = tab.remove(arg, 1)
-   end
--  return f:write(unpack(arg))
-+  return f:write(table.unpack(arg))
- end
- 
---- a/src/bin/lua/declaration.lua
-+++ b/src/bin/lua/declaration.lua
-@@ -137,7 +137,7 @@
- 	if b then
- 
- 		m = split_c_tokens(string.sub(m, 2, -2), ",")
--		for i=1, table.getn(m) do
-+		for i=1, #m do
- 			m[i] = string.gsub(m[i],"%s*([%*&])", "%1")
- 			if not isbasic(m[i]) then
- 				if not isenum(m[i]) then _, m[i] = applytypedef("", m[i]) end
-@@ -522,7 +522,7 @@
-  end
- 
-  -- check the form: mod type* name
-- local s1 = gsub(s,"(%b\[\])",function (n) return gsub(n,'%*','\1') end)
-+ local s1 = gsub(s,"(%b%[%])",function (n) return gsub(n,'%*','\1') end)
-  t = split_c_tokens(s1,'%*')
-  if t.n == 2 then
-   t[2] = gsub(t[2],'\1','%*') -- restore * in dimension expression
---- a/src/bin/lua/feature.lua
-+++ b/src/bin/lua/feature.lua
-@@ -132,7 +132,7 @@
-  if not fname or fname == '' then
-  	fname = self.name
-  end
--  n = string.gsub(n..'_'.. (fname), "[<>:, \.%*&]", "_")
-+  n = string.gsub(n..'_'.. (fname), "[<>:, \\.%*&]", "_")
- 
-   return n
- end
---- a/src/bin/lua/function.lua
-+++ b/src/bin/lua/function.lua
-@@ -520,7 +520,7 @@
- function join(t, sep, first, last)
- 
- 	first = first or 1
--	last = last or table.getn(t)
-+	last = last or #t
- 	local lsep = ""
- 	local ret = ""
- 	local loop = false
---- a/src/bin/lua/package.lua
-+++ b/src/bin/lua/package.lua
-@@ -39,7 +39,7 @@
-  self.code = gsub(self.code,"\n%s*%$%]","\2")
-  self.code = gsub(self.code,"(%b\1\2)",       function (c)
-                                                tinsert(L,c)
--                                               return "\n#["..getn(L).."]#"
-+                                               return "\n#[".. #L .."]#"
-                                               end)
-  -- avoid preprocessing embedded C code
-  local C = {}
-@@ -47,14 +47,14 @@
-  self.code = gsub(self.code,"\n%s*%$%>","\4")
-  self.code = gsub(self.code,"(%b\3\4)",       function (c)
-                                                tinsert(C,c)
--                                               return "\n#<"..getn(C)..">#"
-+                                               return "\n#<".. #C ..">#"
-                                               end)
-  -- avoid preprocessing embedded C code
-  self.code = gsub(self.code,"\n%s*%$%{","\5") -- deal with embedded C code
-  self.code = gsub(self.code,"\n%s*%$%}","\6")
-  self.code = gsub(self.code,"(%b\5\6)",       function (c)
-                                                tinsert(C,c)
--                                               return "\n#<"..getn(C)..">#"
-+                                               return "\n#<".. #C..">#"
-                                               end)
- 
-  --self.code = gsub(self.code,"\n%s*#[^d][^\n]*\n", "\n\n") -- eliminate preprocessor directives that don't start with 'd'
-@@ -64,7 +64,7 @@
-  local V = {}
-  self.code = gsub(self.code,"\n(%s*%$[^%[%]][^\n]*)",function (v)
-                                                tinsert(V,v)
--                                               return "\n#"..getn(V).."#"
-+                                               return "\n#".. #V .."#"
-                                               end)
- 
-  -- perform global substitution
-@@ -152,14 +152,14 @@
- 	if flags.t then
- 		output("#ifndef Mtolua_typeid\n#define Mtolua_typeid(L,TI,T)\n#endif\n")
- 	end
--	foreach(_usertype,function(n,v)
-+	for n,v in pairs(_usertype) do
- 		if (not _global_classes[v]) or _global_classes[v]:check_public_access() then
- 			output(' tolua_usertype(tolua_S,"',v,'");')
- 			if flags.t then
- 				output(' Mtolua_typeid(tolua_S,typeid(',v,'), "',v,'");')
- 			end
- 		end
--	 end)
-+	 end
-  output('}')
-  output('\n')
- end
-@@ -288,7 +288,7 @@
- 				local t = {code=s}
- 				extra = string.gsub(extra, "^%s*,%s*", "")
- 				local pars = split_c_tokens(extra, ",")
--				include_file_hook(t, fn, unpack(pars))
-+				include_file_hook(t, fn, table.unpack(pars))
- 				return "\n\n" .. t.code
- 			else
- 				error('#Invalid include directive (use $cfile, $pfile, $lfile or $ifile)')
-@@ -322,7 +322,7 @@
-       table.insert(chunk, string.sub(line, 3) .. "\n")
-      else
-       local last = 1
--      for text, expr, index in string.gfind(line, "(.-)$(%b())()") do 
-+      for text, expr, index in string.gmatch(line, "(.-)$(%b())()") do 
-         last = index
-         if text ~= "" then
-           table.insert(chunk, string.format('table.insert(__ret, %q )', text))
-@@ -334,10 +334,9 @@
-     end
-   end
-   table.insert(chunk, '\nreturn table.concat(__ret)\n')
--  local f,e = loadstring(table.concat(chunk))
-+  local f,e = load(table.concat(chunk), nil, "t", _extra_parameters)
-   if e then
-   	error("#"..e)
-   end
--  setfenv(f, _extra_parameters)
-   return f()
- end
---- a/src/bin/lua/template_class.lua
-+++ b/src/bin/lua/template_class.lua
-@@ -22,7 +22,7 @@
- 	for i =1 , types.n do
- 
- 		local Il = split_c_tokens(types[i], " ")
--		if table.getn(Il) ~= table.getn(self.args) then
-+		if #Il ~= #self.args then
- 			error("#invalid parameter count for "..types[i])
- 		end
- 		local bI = self.body
-@@ -31,16 +31,16 @@
- 			--Tl[j] = findtype(Tl[j]) or Tl[j]
- 			bI = string.gsub(bI, "([^_%w])"..self.args[j].."([^_%w])", "%1"..Il[j].."%2")
- 			if self.parents then
--				for i=1,table.getn(self.parents) do
-+				for i=1,#self.parents do
- 					pI[i] = string.gsub(self.parents[i], "([^_%w]?)"..self.args[j].."([^_%w]?)", "%1"..Il[j].."%2")
- 				end
- 			end
- 		end
- 		--local append = "<"..string.gsub(types[i], "%s+", ",")..">"
--		local append = "<"..concat(Il, 1, table.getn(Il), ",")..">"
-+		local append = "<"..concat(Il, 1, #Il, ",")..">"
- 		append = string.gsub(append, "%s*,%s*", ",")
- 		append = string.gsub(append, ">>", "> >")
--		for i=1,table.getn(pI) do
-+		for i=1,#pI do
- 			--pI[i] = string.gsub(pI[i], ">>", "> >")
- 			pI[i] = resolve_template_types(pI[i])
- 		end
---- a/src/bin/tolua.c
-+++ b/src/bin/tolua.c
-@@ -67,7 +67,11 @@
- static void add_extra (lua_State* L, char* value) {
- 	int len;
- 	lua_getglobal(L, "_extra_parameters");
-+#if LUA_VERSION_NUM > 501
-+	len = lua_rawlen(L, -1);
-+#else
- 	len = luaL_getn(L, -1);
-+#endif
- 	lua_pushstring(L, value);
- 	lua_rawseti(L, -2, len+1);
- 	lua_pop(L, 1);
-@@ -145,7 +149,7 @@
-   }
-   lua_pop(L,1);
-  }
--/* #define TOLUA_SCRIPT_RUN */
-+#define TOLUA_SCRIPT_RUN
- #ifndef TOLUA_SCRIPT_RUN
-  {
-   int tolua_tolua_open (lua_State* L);
-@@ -153,16 +157,17 @@
-  }
- #else
-  {
--  char* p;
--  char  path[BUFSIZ];
--  strcpy(path,argv[0]);
--  p = strrchr(path,'/');
--  if (p==NULL) p = strrchr(path,'\\');
--  p = (p==NULL) ? path : p+1;
--  sprintf(p,"%s","../src/bin/lua/");
--  lua_pushstring(L,path); lua_setglobal(L,"path");
--		strcat(path,"all.lua");
--  lua_dofile(L,path);
-+  lua_pushstring(L, "/usr/share/toluapp/luapp/"); lua_setglobal(L,"path");
-+  if (luaL_loadfile(L, "/usr/share/toluapp/luapp/all.lua") != 0) {
-+    fprintf(stderr, "luaL_loadfile failed\n");
-+    return 1;
-+  }
-+  if (lua_pcall(L, 0,0,0) != 0) {
-+    const char *errmsg = lua_tostring(L, -1);
-+    fprintf(stderr, "lua_pcall failed: %s\n", errmsg);
-+    lua_pop(L, 1);
-+    return 1;
-+  }
-  }
- #endif
-  return 0;
---- a/src/lib/tolua_event.c
-+++ b/src/lib/tolua_event.c
-@@ -23,12 +23,20 @@
- static void storeatubox (lua_State* L, int lo)
- {
- 	#ifdef LUA_VERSION_NUM
-+#if LUA_VERSION_NUM > 501
-+		lua_getuservalue(L, lo);
-+#else
- 		lua_getfenv(L, lo);
-+#endif
- 		if (lua_rawequal(L, -1, TOLUA_NOPEER)) {
- 			lua_pop(L, 1);
- 			lua_newtable(L);
- 			lua_pushvalue(L, -1);
-+#if LUA_VERSION_NUM > 501
-+			lua_setuservalue(L, lo);	/* stack: k,v,table  */
-+#else
- 			lua_setfenv(L, lo);	/* stack: k,v,table  */
-+#endif
- 		};
- 		lua_insert(L, -3);
- 		lua_settable(L, -3); /* on lua 5.1, we trade the "tolua_peers" lookup for a settable call */
-@@ -141,7 +149,11 @@
- 	{
- 		/* Access alternative table */
- 		#ifdef LUA_VERSION_NUM /* new macro on version 5.1 */
-+#if LUA_VERSION_NUM > 501
-+		lua_getuservalue(L, 1);
-+#else
- 		lua_getfenv(L,1);
-+#endif
- 		if (!lua_rawequal(L, -1, TOLUA_NOPEER)) {
- 			lua_pushvalue(L, 2); /* key */
- 			lua_gettable(L, -2); /* on lua 5.1, we trade the "tolua_peers" lookup for a gettable call */
-@@ -420,6 +432,8 @@
- */
- TOLUA_API int class_gc_event (lua_State* L)
- {
-+  if (lua_type(L,1) == LUA_TUSERDATA)
-+  {
- 	void* u = *((void**)lua_touserdata(L,1));
- 	int top;
- 	/*fprintf(stderr, "collecting: looking at %p\n", u);*/
-@@ -427,7 +441,8 @@
- 	lua_pushstring(L,"tolua_gc");
- 	lua_rawget(L,LUA_REGISTRYINDEX);
- 	*/
--	lua_pushvalue(L, lua_upvalueindex(1));
-+	lua_pushstring(L,"tolua_gc");
-+	lua_rawget(L,LUA_REGISTRYINDEX);   /* gc */
- 	lua_pushlightuserdata(L,u);
- 	lua_rawget(L,-2);            /* stack: gc umt    */
- 	lua_getmetatable(L,1);       /* stack: gc umt mt */
-@@ -456,6 +471,7 @@
- 		lua_rawset(L,-5);           /* stack: gc umt mt */
- 	}
- 	lua_pop(L,3);
-+  }
- 	return 0;
- }
- 
---- a/src/lib/tolua_map.c
-+++ b/src/lib/tolua_map.c
-@@ -262,8 +262,12 @@
- 
- 		lua_pop(L, 1);
- 		lua_pushvalue(L, TOLUA_NOPEER);
--	};
-+	}
-+#if LUA_VERSION_NUM > 501
-+	lua_setuservalue(L, -2);
-+#else
- 	lua_setfenv(L, -2);
-+#endif
- 
- 	return 0;
- };
-@@ -271,7 +275,11 @@
- static int tolua_bnd_getpeer(lua_State* L) {
- 
- 	/* stack: userdata */
-+#if LUA_VERSION_NUM > 501
-+	lua_getuservalue(L, -1);
-+#else
- 	lua_getfenv(L, -1);
-+#endif
- 	if (lua_rawequal(L, -1, TOLUA_NOPEER)) {
- 		lua_pop(L, 1);
- 		lua_pushnil(L);
-@@ -411,7 +419,11 @@
- 		lua_rawget(L,-2);
- 	}
- 	else
-+#if LUA_VERSION_NUM > 501
-+	 lua_pushglobaltable(L);
-+#else
- 	 lua_pushvalue(L,LUA_GLOBALSINDEX);
-+#endif
- }
- 
- /* End module
-@@ -445,7 +457,11 @@
- 	else
- 	{
- 		/* global table */
-+#if LUA_VERSION_NUM > 501
-+		lua_pushglobaltable(L);
-+#else
- 		lua_pushvalue(L,LUA_GLOBALSINDEX);
-+#endif
- 	}
- 	if (hasvar)
- 	{
-@@ -473,7 +489,11 @@
- 	else
- 	{
- 		/* global table */
-+#if LUA_VERSION_NUM > 501
-+		lua_pushglobaltable(L);
-+#else
- 		lua_pushvalue(L,LUA_GLOBALSINDEX);
-+#endif
- 	}
- 	if (hasvar)
- 	{
---- a/src/lib/tolua_push.c
-+++ b/src/lib/tolua_push.c
-@@ -79,7 +79,11 @@
- 
-    #ifdef LUA_VERSION_NUM
-    lua_pushvalue(L, TOLUA_NOPEER);
-+#if LUA_VERSION_NUM > 501
-+   lua_setuservalue(L, -2);
-+#else
-    lua_setfenv(L, -2);
-+#endif
-    #endif
-   }
-   else
diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild
index d6f8c841fb1a..2340fd572121 100644
--- a/dev-lua/toluapp/toluapp-1.0.93_p20190513.ebuild
+++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild
@@ -17,13 +17,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/lua-5.1.1:=[deprecated]"
+RDEPEND="=dev-lang/lua-5.1*:=[deprecated]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch
-	"${FILESDIR}"/${PN}-1.0.93_p20190513-lua5.3.patch
 )
 CMAKE_REMOVE_MODULES_LIST="dist.cmake lua.cmake FindLua.cmake"