gentoo resync : 18.05.2019

13 files changed, 616 insertions, 12 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index a91599d93e49..a424c537b59e 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest
index 9555c33f534f..fa497e81174f 100644
--- a/dev-lua/ldoc/Manifest
+++ b/dev-lua/ldoc/Manifest
@@ -1,4 +1,4 @@
 AUX ldoc-1.4.6-mkdir.patch 230 BLAKE2B 672617f3a20ff6f74be02db5402288b4900f2d9d52a433ec9085f2fd2ce629609b9803732c50da6da252287efc7280895c2d3ce64ad4a30cf017e893ea2c5638 SHA512 5c047b48c987d107cf810dffc615ce29e5f2192b927fa91260dacbd2daee92c9aac5eeee0bfbccd9972d47d57928c37a867b9c2d453a7c845793cab0ac01385a
 DIST ldoc-1.4.6.tar.gz 126080 BLAKE2B c43a79141ce557a54b9aed3c7523b206bec85602d858c72373d650a70e1741b545b2b9bdd462856c7e16af97f6a5eeeeea26375832f678b52d9e9153547076be SHA512 bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af
-EBUILD ldoc-1.4.6.ebuild 521 BLAKE2B 8fce905741fd0c7f65b2349a90fd36f1a221ad5a75f9fe75e6436e350d878a2aae39442c4a362a4f4f95062996b8b6f38185f124dbb5ccd642f6e9f76e3b1ec6 SHA512 792eba8e9308ee85af156156640271c05b1fce438ded533249203f7948c3f9b5581ab12b4f4349d24dbe635e9190364c7731a57bf567e390bfcf13212c865ad1
+EBUILD ldoc-1.4.6.ebuild 522 BLAKE2B 881d1bf65fd3befc836981f9e50c8f3c80c0054dbae4ba00f1ea38744bcd384e9855c6a6be59f6fa7d9ccca712fb8e9cc6592ca5bf91946c8d13063a390403ee SHA512 b5e290b87ff96172b25b6bb16454c5d1a91a1acc610a1ed431b97ea3fdcb18888d22d8180de2048a1a9af5a6b99eb3a4ad16daff3a87e2ccd6393062485df028
 MISC metadata.xml 359 BLAKE2B ca63526d6602c0350130c45c2865b1ace204ca51f8b1a0d181b40ec8a7271108909224b87a73fab4f0940924221c6daccb5b9d5598a8ec7ff8ae68cbb604935a SHA512 b37aae3ec02e9f6ba8c2b0b75ed8442a9d96cc8f6e4933ed96f15b1f8310b30e7a34d9896d4168d6aa1e5e79763a62ed59d0c23f8a5f5cda9e220399a0af4891
diff --git a/dev-lua/ldoc/ldoc-1.4.6.ebuild b/dev-lua/ldoc/ldoc-1.4.6.ebuild
index e7155ddbb927..d7606c55a136 100644
--- a/dev-lua/ldoc/ldoc-1.4.6.ebuild
+++ b/dev-lua/ldoc/ldoc-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-lua/penlight"
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 38c254cf485a..911272040993 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1,3 +1,3 @@
 DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd
-EBUILD luacheck-0.20.0.ebuild 1034 BLAKE2B ef1d0350af38e755a25219018074d8a1526550cc0c9ecaabaaea814a18f357efb09bee1ed8fc10fbf2696a619ca5cb051918ae513dd11cb7b0c96558041b187c SHA512 004a8a8c6fa13dffce97b33e0a6eeae7de2a75b76ea14465d3f7e381b49a104ce41f2a9b40446bd9314d3fbb779285ee07fe1deac99d9271ebe976df56275b31
+EBUILD luacheck-0.20.0.ebuild 1030 BLAKE2B edaeb123056b1030dce4eed8570c8c55e5e41fddeb778260997fd4f52741b4aab1b139da4722da21e9cff729213756e95b481371250528ccd081fb531c0a7834 SHA512 141ae64d7e4b95185ec9e77b3e74162cf50e74f310deb2c55092083c66d43a557be4a79fb059397331ea34fdc134a78257ce12da3ef301965924ec8bf3f71107
 MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-lua/luacheck/luacheck-0.20.0.ebuild b/dev-lua/luacheck/luacheck-0.20.0.ebuild
index f4df09eefbb1..c0b0ad1d0974 100644
--- a/dev-lua/luacheck/luacheck-0.20.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="doc luajit test"
 
 RDEPEND="
diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
index 41ae8dc0d153..cc14b5f1090d 100644
--- a/dev-lua/luafilesystem/Manifest
+++ b/dev-lua/luafilesystem/Manifest
@@ -3,5 +3,5 @@ DIST luafilesystem-1.6.2.tar.gz 27886 BLAKE2B fa13cc529f3ff2b5c5bbf082c5071d066d
 DIST luafilesystem-1.6.3.tar.gz 30389 BLAKE2B 412d2893a59ccde2eb8912523bea4d06d4f140dee2f47b5e8e9795d1ca950a4be93a32eb5632775277ab2c2c22a9229c9f33d062e0d1fcd5397178962b96bae9 SHA512 47a2637903c9d42ce3ab7cf3e27b6457845aeed7ce90c0fee964ba9bf9eabf6a6eea940f960713f6b982f1b64167dbd5da8f217281284143c89e3cc5488b8404
 EBUILD luafilesystem-1.5.0.ebuild 791 BLAKE2B 6a7afcc5813045631d933abf2932d123e15c457bb014eff30c8c0a464a3be60ccadea38088d2d491f2bcd69d6d8ef1cadd1c3dc63653237d4634c9a266bc33a5 SHA512 687ca25601f8fe1822576be9c3724ece8562cca30c79c37f01da4378f7faec59731ddf7364ee10a5f4674c9d2c16a6ae440836168dbe77b1c1cbf1f17f220291
 EBUILD luafilesystem-1.6.2.ebuild 768 BLAKE2B 3493601326a2813f4ee4d7678d3bb27e28be66754fa5afc311e06a1d6710cc6df0da558e55d107577f9bbf73600fb43d8afe7a2e461180c2d4791fcd90bbf8a8 SHA512 36bb54693cf2d0dece4a8e704ac43cc18a58b9b9b0e3b2eefec074a1e7be6d34e1069f004afbc1fa806196714f29ffb6ec9eb0f9c054526bd880d31b95333aa1
-EBUILD luafilesystem-1.6.3.ebuild 1147 BLAKE2B 2bad1e87b63a1c8daede9e36281af7d0c0938a7221b2377fa45ea4aea4de2c810b1b18abe9160dc29be24b52c8c5d2efd53f3f55f6270b1fc0809a940d9fd346 SHA512 c4e6d64baf2132fd2de7a44b9fb82b3256ca8f819192a865f49c7e3f8c452766f5eb506b64046be006c9dd45681512880a431f86a8702386ca9f0e8af63eba15
+EBUILD luafilesystem-1.6.3.ebuild 1143 BLAKE2B 35e59e33233f133f324aa93be56b2c52d007f7864de43fe63646024db8f5c6fa889a134cae2e213a3e00abdbcb25adef638731b1a1fc82f3ac0b2861afbe3f36 SHA512 bd4c6f0d72e0a3a48a85aaf67615abf15fb445c4d8b463c8ce3396c65400e674ceea6c6cd01f11b373fb53f1cb86b50c9e48d8597643edcbe7dbd85dd807e530
 MISC metadata.xml 526 BLAKE2B 0c439a926e2d4658ac91b70fde013330186edc0978772dd636d88cc332fd536c38ebe26f4d4ccaad0a3397434d699bc55249cf0feb199546681540379a69ee14 SHA512 4625115566950198cede510f5db34531fe6c0ec55d449868f5d99ff524223a5bb0d666197ffdb3bd22c887db26041022956d8cee361e2bb31a2add67c4902a22
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
index 2b0ac49cf730..f1c996243aa9 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/keplerproject/luafilesystem/archive/v${MY_PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="luajit"
 
 RDEPEND="
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index f07ac6c35879..8c86429669c5 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -4,6 +4,6 @@ DIST luasec-0.6.tar.gz 51071 BLAKE2B d10761399e074eaa657abad2788936296a6fd33db64
 DIST luasec-0.7.tar.gz 47965 BLAKE2B 5bd19cfb5c2529a6fbee221442730c87394f1bf3d5089dd83d18e91ef1a2b88cde19c59988e438eb37e50c02c40a8906ad11ce9b3247b03ea11ed6d9e890b7d6 SHA512 6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358
 EBUILD luasec-0.5.1.ebuild 1081 BLAKE2B efb926c4f933bbddd415e583601f9b7cd8b33a6fcf377003b9390f02e853a26b937a540b97eb26969fc79ac12b96aeb929104fa7e91d882028bcd4f4fac33f71 SHA512 38eaacb4cbaa94f5549e0e6990fcc8c596428d30f901eb36b1f96bdf010a894983ad572d942d3692f131766dfb19ad99ebca289c043ddc4c1dc211ba5065b367
 EBUILD luasec-0.6.ebuild 1027 BLAKE2B d9aa030c4b22570fc58f43b1a2ccdb8efbf11d02913fe957dcb9ab65efc75f8a5909aade97b4bee5c5d3844321a28903dac4f38368eb8825869ffe28201fc2af SHA512 e8fb6764d9d480048edd2ae1ad68aa730e99c6f7b3839fd7f2dd2577bf162b194fca1093f9432657acbf5535c706b60a78cdaaf66884d30b1ee32ef09828d827
-EBUILD luasec-0.7.ebuild 1096 BLAKE2B 9ae3ac525136b70a4e21a287ac5be40ecd89f03824adbb003d43d8f2d3d7c11daf8c2ae51e397ad86deb16ac3ad919b845d385ed1b178cec5723d07cbbfcf259 SHA512 404162d929093dc74d606c729823dddc357cd6388e0a004c5543389a03f92c74c05b284d61dca5309633ba7986591b50ce42326d5170095735f3e802c53ec43e
+EBUILD luasec-0.7.ebuild 1095 BLAKE2B 5488a78a49819602b129e02e96a3f13e2519b895c7b4d085a8357972284d37af8960a329daf4ab0e2b4d64a77cae1f99cf6592d55ce7db53e1951a6c04498a2e SHA512 62c443b8447d40266c326e5368b44020d91489bd3b7d48edc757681ad78f5fc273ac9d178ed67823b587c3399c97b136bae26f89b46d40a165be48578424067d
 EBUILD luasec-9999.ebuild 1096 BLAKE2B 9ae3ac525136b70a4e21a287ac5be40ecd89f03824adbb003d43d8f2d3d7c11daf8c2ae51e397ad86deb16ac3ad919b845d385ed1b178cec5723d07cbbfcf259 SHA512 404162d929093dc74d606c729823dddc357cd6388e0a004c5543389a03f92c74c05b284d61dca5309633ba7986591b50ce42326d5170095735f3e802c53ec43e
 MISC metadata.xml 311 BLAKE2B af896b539ce840176bc39318cd4fb37c32159103bca6ac35afa80b9aace5a2668a5cfda1c5b43862181ea4ad12673f2858d61b99c5f5bb7258061e4b8275eec8 SHA512 f309e681ac9e07c650fec4685d93a513764277ac6cb830ff1de36620ec4348cfe578776adecb18475bb1e32ba4d41ed4e6d15b74e20e8bb4e4c2450cb753aaf3
diff --git a/dev-lua/luasec/luasec-0.7.ebuild b/dev-lua/luasec/luasec-0.7.ebuild
index df666e66d836..73ed9458e1b1 100644
--- a/dev-lua/luasec/luasec-0.7.ebuild
+++ b/dev-lua/luasec/luasec-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 	S=${WORKDIR}/${PN}-${P}
 fi
 
diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest
index 1ddb739a4754..2433f6220918 100644
--- a/dev-lua/toluapp/Manifest
+++ b/dev-lua/toluapp/Manifest
@@ -1,3 +1,7 @@
+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
 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
 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
new file mode 100644
index 000000000000..21ebc4992382
--- /dev/null
+++ b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-fix-multilib.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ 
+ project ( toluapp C )
+ cmake_minimum_required ( VERSION 2.8 )
+-include ( cmake/dist.cmake )
++include ( GNUInstallDirs )
+ 
+ find_package ( Lua REQUIRED )
+ include_directories ( include src/lib ${LUA_INCLUDE_DIR} )
+@@ -19,7 +19,7 @@
+ 
+ add_library ( toluapp_lib ${SRC_LIBTOLUAPP} ${DEF_FILE} )
+ target_link_libraries ( toluapp_lib ${LUA_LIBRARIES} )
+-set_target_properties ( toluapp_lib PROPERTIES OUTPUT_NAME toluapp CLEAN_DIRECT_OUTPUT 
++set_target_properties ( toluapp_lib PROPERTIES OUTPUT_NAME tolua++ CLEAN_DIRECT_OUTPUT 
+   1 )
+ 
+ # Build app
+@@ -27,10 +27,11 @@
+ set ( SRC_TOLUA src/bin/tolua.c src/bin/toluabind.c )
+ add_executable ( toluapp ${SRC_TOLUA} )
+ target_link_libraries ( toluapp toluapp_lib ${LUA_LIBRARIES} )
++set_target_properties ( toluapp PROPERTIES OUTPUT_NAME tolua++ )
+ 
+ # Install
+-install_library ( toluapp_lib )
+-install_executable ( toluapp )
+-install_header ( include/ )
+-install_data ( README INSTALL )
+-install_doc ( doc/ )
++install( TARGETS toluapp_lib DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++install( TARGETS toluapp DESTINATION ${CMAKE_INSTALL_BINDIR} )
++install( DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
++install( FILES README DESTINATION ${CMAKE_INSTALL_DOCDIR} )
++install( DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html )
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
new file mode 100644
index 000000000000..4da3e33e7fec
--- /dev/null
+++ b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua5.3.patch
@@ -0,0 +1,534 @@
+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.ebuild
new file mode 100644
index 000000000000..d6f8c841fb1a
--- /dev/null
+++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_PN=${PN/pp/++}
+COMMIT_ID="b34075b76835b778bb6b2ce0aa224afd9d182887"
+
+DESCRIPTION="A tool to integrate C/C++ code with Lua"
+HOMEPAGE="https://github.com/LuaDist/toluapp"
+SRC_URI="https://github.com/LuaDist/toluapp/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1.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"