gentoo resync 31.01.2019

15 files changed, 389 insertions, 24 deletions

diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index eefd2362bbc7..0a1a357ff028 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -22,17 +22,23 @@ AUX lua-5.2-make-r1.patch 2442 BLAKE2B 7f281a96b602b992099869648cc72293125788906
 AUX lua-5.3-make-r1.patch 2854 BLAKE2B d60d1656a5f411b218b4f1f861f150759e6331ffadf28fde50cf219cbe01b5f1e6be4a3872b3c27a9ed561e80f91983e024124ca5c5871c6c63252cf0ac1c11d SHA512 80c2930bbd204551545cdd6793ec8dcd7d753fffc29710786b3662dde13b1af3a9825c95118e23bc98149f316f12f008223b675df929a244ef29c8a2a773560a
 AUX lua.pc 658 BLAKE2B 580504c8162c9cbde35b4a817c688b955cad1a35b1c21ed527488eda6e7cf78dfa81fa8b100737cf9ad620d34d94eceec01ba09e4fab0b121c5e4c673677cd3f SHA512 cb476ea6dd004a9aa0094cfc219d1888c5f578b44968a960acf1f2f32783a8e4d770bb033fb1ab4851f225188bbdd434b5d239718cae2c2c35f5b5f124a722ca
 DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
+DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B 323eaae02ee61cfde2535d606ed704d964461c32627cb3ad4097afdc95a16a0921b9b05677c5b9b26cbff0d7d8270045e7df32a2cea0fd99a82e6aa613a0bdae SHA512 699d5703dd1d03312f1e947ca4c68d8808bb226ae01337202c2bfb3d854a9b7d9ef9746630afd1f67e9ffe2868907ce3d600a6f5324a2c798540c5373a24aac8
 DIST lua-5.2.3.tar.gz 251195 BLAKE2B f3d11e180fe070cb5be98f0694081d26067e21eddeb09cd74b1bae6ecf01c53dc46746b871e38555525da155bf1b83f0e60bae5387c2b96b1d19b15f94b716dc SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449
+DIST lua-5.2.4.tar.gz 252651 BLAKE2B 6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0 SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c
 DIST lua-5.3.3.tar.gz 294290 BLAKE2B 8052d3fa5f34636df314886a62d63e46fc76ada765679da9352e751f484a458404ac55e5b32ad63ced9d2b16d629d62a52240b1b1a509bcdf5d5df85e405646d SHA512 7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc
-EBUILD lua-5.1.5-r100.ebuild 3759 BLAKE2B 191eb7aef48ba9b8e08254e1e7717e47a48ddbc21810274b3063c8d0d98790dd0da1bfe52128e1da5472285dc89c3f9770cb5b02a0121316c16121df5f1161dd SHA512 7191cf605f57063dabeb201f9fb747d0df1c4b7b9ede34bec21d8e0f0eeb8edebc4be82f7157a8b23b18f352f5b07bb03a83cd645856e6a019fcd5c2bd0c990a
-EBUILD lua-5.1.5-r101.ebuild 4020 BLAKE2B 9c151be5dd2bcbd340280f647e55d3db580b3e56367b3a18924e35223f9ccb9d4f9f2e05bd41ec8dd43e984bb28afd12bfe02a569776216d9dc78e518c32ba06 SHA512 16ef9fa4f9036aa7ab9683d3cf25cd3015fafbea13248b51d65ea47ceddd2c5ed378d5b5df36fd87398c5220389ae08c08103aa4ae789a03412ec7f4b6501a02
-EBUILD lua-5.1.5-r102.ebuild 4020 BLAKE2B b357a5e5f7831d6c98d716f651c4bfa2ebb8e2377a9e1c5be64f4eb0da6e818e2146feacd0e38328cf5ee9b66827b25795a70cb273a8a32ccb576abada6f0bdb SHA512 ace218026ab6fef8b758d6c9a2a6ab5126fbedf5a1bf6a8d3402c2e5c4423f56613bfd71226d7423e8e457d68eda03fb653226812399bbad45ccd1cc146489d3
-EBUILD lua-5.1.5-r4.ebuild 3650 BLAKE2B 766d8a5ef66db5e765091241ca5de32cb475052e8a6612fcf4f5c57d1b45262103aa296f2d208ae129abc37b7082c2ff701bc0a063b1b1784c0151c05efcad13 SHA512 fcb3f035652253697429fc4893ad7e8fe5ee53dbeb27897272f3ff145b91180f6896fbb1e2b670e27f338e6f86ed041bdb1c39971d07935e18814a7438f23e0e
-EBUILD lua-5.2.3-r1.ebuild 3782 BLAKE2B e600a525fa3762916ce36307969d15e97155df36aff7d4ef9f9e540811d7fbdbfe82b40252bc7681e11350613c933e7d1c2c37796a2f21157e8996aa44b43826 SHA512 1f682778d613ed1bb9f56122d156e616a8e03e6de647d52362263f37f459e7ce785e9d7491bf2139cdedf60a6466699e6562ae394a6a9e11a1ba4fbcfa157659
-EBUILD lua-5.2.3-r2.ebuild 4043 BLAKE2B a257fca93afc3dfda9e41e2222c40eb6cfb9f7cd221ab6b499c72273f90bdb5ae5e1a11e0b75c2b097c110565817124093b23da6ae5702552e6be43ac924da80 SHA512 2e7604989198e659d96fc807e820a118639a870f78bcacc18c8e87446252d8cb9d3fae4edc04f57448efbc92edaac104f296fd61321ded4c8fd7b1a983c63047
-EBUILD lua-5.2.3-r3.ebuild 4043 BLAKE2B 06127a7c35a4dc1ec47b0fb447fd1dd265625ef92da2427b8f09f82dec9aab0726c36b88f254b7a6aff6a2916c723c49f800db64b6b74859c01346dcbd2a1a4c SHA512 4bf9770781c348e3a71203a341c39a37b2a32804b2ce1304ed41fb39ff25a916d0729183bce49f994d8ca44c9c79dfb9c72501ad3d0ba2dc9ee21dad48c814e5
-EBUILD lua-5.2.3.ebuild 3268 BLAKE2B dc5a23765550709bb876b200c7ca6e33aa51ca79c5599344a6a111429b0e5ad9d785184bac372fa4e4db440cfdefe100d5abdfff59084e5143323b5d79afebd5 SHA512 1fac24f9f6526a9c75fa35796dbbd87cd0906d7913184301045ba184d259612316f1a7fe21d92c1f562fef1fdf7c59c9c20da8a6f62bbfa1fc93bcffcd99fb2c
-EBUILD lua-5.3.3-r1.ebuild 4055 BLAKE2B cb840b44fada44b133f0db32a2dab08cebe08a501da6d0ca7979a24b52cd6aaae5e02d7e9dfa6f87e216bbecc3c72aa893457a8c0c7146e62147c2eca1e88b1b SHA512 6a5f0a20d7c684853e5be8a7460771b5329c70af57d4ebf199b7812b4d7bd21d625f20536c4f7d234d3cc2467ff29e724e619afdaa2bef9c29d575d527d993bc
-EBUILD lua-5.3.3-r2.ebuild 4055 BLAKE2B 61ba1948449a7e44f57df783975106fce12ab5e9bb9fa761b6f49a8fef8fd95447856b7a1a84e2a0367259018bd41a96e4f3ad5a4d09198a0a177934cda031c2 SHA512 e210a7577bc6090d53cbb0c3863841bc4d649f6d592cdd2a2ce4944b1db1f54c30f5cb71a5603468dac1fe94ab7f0bceed3c668797c469adb6ecc3fe984124e6
-EBUILD lua-5.3.3.ebuild 3794 BLAKE2B 6b3222352e83d569651051474a184d4825db92aa4e6c0722c727e660b9c2d748a8354956b7f3baf9bb09b64968110c8ad061e194b766a4cece15692210dac5d0 SHA512 f7c487b9f6be32b49bc8bd71ac2ef601579a20d9936749829d0ca39a5bba8b465b406d6045f15c33dc1d18590ec58791dd92d1d9d9729095f03f187bf96bef92
-MISC metadata.xml 451 BLAKE2B 97895c97f22d1d17e8e888a311f8b01b345fb296189016efdd4da71384f2adcae47bfe30b4da92499fbeaa5f1257ddb9e3116aa31167e62366127b578a753b08 SHA512 ee674307c2a1daeeba3e9da078e440648ed379422801989007c15c4c8233e905b14f8e4fae66ae2804a5b39b0676e4cca9ff21fb8985874bccfef15b9dd918a9
+DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
+DIST lua-5.3.5.tar.gz 303543 BLAKE2B 8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b SHA512 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4
+EBUILD lua-5.1.5-r100.ebuild 3756 BLAKE2B d1803e806f7f1774eab24f30623b0b61a1432c2ede3d73110ddbc32cd3c44d2bd0146bbb3fecc724c2742e5f2feb752aeab779437766337109a6ccbed0fa87d6 SHA512 bb4d29092517a9f2f3b4e539cf901411bc3793fbad9fbf1d4aea46a88d755d260a7aa7c8d9ed99174f1a8af06e5795c5a5888e6ae70f0b9be28573c80c14aa83
+EBUILD lua-5.1.5-r101.ebuild 4017 BLAKE2B adb5163f2288dcea6aaf403e594d556ede8b1361e05b39c0fd18cd1c351eb942fef327d4f959e06d8314f5d87f069af3a4a9ac07bc250ba5eefd856a2ef8dd74 SHA512 45d9526c3981aa6a4042485ce6b34c2f48cdb4be3fe899473b86261eab1657f7dd62b363650128acc42e06f504c011ddf26b51c788449f12f46fd12243c5f66b
+EBUILD lua-5.1.5-r102.ebuild 4017 BLAKE2B 75c7f8aee292313fd3babeeb2661303caf726d0194b9895c4de62d0bf9ad848d11e7015480697eccee0413942b28ed554504b5c4112173115624e24c9f8f5184 SHA512 62c0bb5edb0bd192a74e69c874fe7b898ce9166f4a035bb162113542822dd8ec4b9a7d73f5a72dbae866a86e032c7e060e9da4ed89348b258901257d2ead971d
+EBUILD lua-5.1.5-r4.ebuild 3650 BLAKE2B 7675182fd8d03bef28acd88b4c55a664984145394201dab0b3c78093088f32ea559a8d2d26b563de4220910963c340acf1a6b97f4499b35ab8f2cfb9d5349795 SHA512 1a801b9ccce37b77fffb1ab3d1aa5f4689ac88d1954c67e0fbea028b119577786b3c7e8a8ea78e665b90077e451f95c6ea4354873621a60f4d5526ab9c0b8875
+EBUILD lua-5.2.3-r1.ebuild 3779 BLAKE2B 907080c531114da76597ee4c313acb5696729caf91c4e466aaf3ab4202fed84926e6dcf8efc6d3e9ee025455685b222c9e9c648af5c60764edc0543393667e3a SHA512 a0ca1dec38caae418bb4db08d64fc62e38d4cae4dee073464756ffa6c461e47b70fe011ea2a21820530437ff3b5026ca888f7b7636275fe5a4938cd42f411dc8
+EBUILD lua-5.2.3-r2.ebuild 4040 BLAKE2B 1bdfd504a8ac986aff793ff8bfcef9bfa3a36615bb2386da7749dbde6bec549edf062d117244f2a0df735a11fab9a3a296304304f26c359a71761e6a8f41fc08 SHA512 b830f696aa645b45a60ab98fd3240278cf294d936a68b59b5ab5cc3cd3cbeb585124ea95ea952079193a4ff72efcf0824a79d32877c191fe85048343f5437543
+EBUILD lua-5.2.3-r3.ebuild 4040 BLAKE2B d1aaba269259a5f3a7a0b38d607045873c9137b2b2b32cbf428d32a6c8db1e8cf723742478c62a41fa34c446f04ecba0c603c03ea0a51d0b4c57d2373fc29f3c SHA512 583c327f446ec0071db9771f7cc8581a52f51ed6ea83965375317d521e3454ecf2d3234a9705ec09fa9edc52e52a823f695748ecbc517181dd9b279a553a4338
+EBUILD lua-5.2.3.ebuild 3265 BLAKE2B 2ab93bfa8b8ad62d5b70a3a22bb2456fb8c93481cc78ac56d57f5e719df30d9f831093d5b41e905641a2dbf7c4d8fb5a1223966363c5aad3282a28f48e57e2f8 SHA512 7c664bfe0db22582828b07d854b587f0d5412878f6ac820e8a62e3595e59b4fb5b4728bb9ac73ab248518eaa8b7a1f8b25e4898817df099eaa461aa1f90365d8
+EBUILD lua-5.2.4.ebuild 5240 BLAKE2B 666dbc7ecee4bde99e2cd2b595d7b39a96469bd2bb2c2d0ecb48a91ccc1956a52bd1d8761d59097dc6838de71dd6dd4ac06354a54c738cc894ac983549dccfee SHA512 63c223c1753365fc12a682bb9382091913c6b83bc096905191bd410bb0805e9edb60b99a4054a75cfee2849615a4779ef2da24d7d7c2a63b431f2faa4556d2b8
+EBUILD lua-5.3.3-r1.ebuild 4052 BLAKE2B eee502f9e5f5898a7bf0425aaee25ac9b6e0be8a468afa4c2aedc6f12aa6425a25a0a807fac4b2d0ee2ebc5edd6160b2b9486a7bbfb3c20fda70c9bada4a55ae SHA512 c0289038b3bd7f0e21fe7a9bb337d69a5ed3ccd2fa2f50697bf9531fbcc9e8151a80a58a778990a9e17923ac2353121da617916cc8a7610d43dfab7fe169a246
+EBUILD lua-5.3.3-r2.ebuild 4052 BLAKE2B 333ac32a3fd3edf0b633f135df3562b7429bcc2feb601170e364ba4ee8abfbe58a1b18c999d9ff9b8513dc3881cce07867566812e53586536eaa2eb3ea3e9704 SHA512 cc8d6b2d22a5a790b26e7320d31ccb14c65b495ba4200049ec1fb50d9e460cc63132536efb19abe8c67992bc3e493a56b52e20042601dc5d76fa5d10ed9380c3
+EBUILD lua-5.3.3.ebuild 3791 BLAKE2B 46737c15ae2477e8c69d004540158ad25b2b58d0543e53e3a491b2d078d1f6b55d204e8d7dbdb780e24704549da4faa0c326a1f907ce6233a0aac73be4af9194 SHA512 3e73adcaa4eb067350086fb494739232a13160ea77332fe7aac13f3b0560ca2131e42c78c74d9415bae22671e6e860d1319efa8b7d043c88739fb0247b866983
+EBUILD lua-5.3.5.ebuild 5252 BLAKE2B 1d454cf7427c7084b2caffcfe14fb7705f0460157c9cb6a944cc507a2ba0d63513639faad8ef3828afd1eab6f98478dc5ef933bc1ce0b76868dcd207fe76a72c SHA512 21ccf28cf0b778f0a362b38c86197890802782b0e9223db70b7234b5bfa74c3babe0a987b16c32f50dd40009295407da114dfda86b9d01f2db0987de6d69e949
+MISC metadata.xml 531 BLAKE2B 5b177e49c99c8f5c8d2208c51efab1262bd7d9c7755d8e06166620445fc2420bca92b5c8dc07030ce91b26bf211b571469ebe4b4b07d091c1cb8ef556832946a SHA512 568bf43d530fabfd3b38eb443fb735c75d6a06293bad4c5b39fc9680654dcd4c93fd270db8250ec20dcba727365b3b18838dfb03c41c615dde179b12b000fb51
diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild
index f532abb7f4f1..2ea293401de6 100644
--- a/dev-lang/lua/lua-5.1.5-r100.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.1.5-r101.ebuild b/dev-lang/lua/lua-5.1.5-r101.ebuild
index 94a5f0a3080a..b26dc779b90d 100644
--- a/dev-lang/lua/lua-5.1.5-r101.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.1.5-r102.ebuild b/dev-lang/lua/lua-5.1.5-r102.ebuild
index cfd1cdfe50e5..4849b6596ff8 100644
--- a/dev-lang/lua/lua-5.1.5-r102.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild
index 4917c1a92275..74650eb17eda 100644
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r4.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=5
diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild
index 479f20de07dc..e4c08ff092a9 100644
--- a/dev-lang/lua/lua-5.2.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.2.3-r2.ebuild b/dev-lang/lua/lua-5.2.3-r2.ebuild
index 0021ce6efd56..24002f6d5195 100644
--- a/dev-lang/lua/lua-5.2.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.2.3-r3.ebuild b/dev-lang/lua/lua-5.2.3-r3.ebuild
index 4096b356b1c9..6e8d314636b3 100644
--- a/dev-lang/lua/lua-5.2.3-r3.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.2.3.ebuild b/dev-lang/lua/lua-5.2.3.ebuild
index 30bfdb2bbb17..11bdc573aa1a 100644
--- a/dev-lang/lua/lua-5.2.3.ebuild
+++ b/dev-lang/lua/lua-5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.2.4.ebuild b/dev-lang/lua/lua-5.2.4.ebuild
new file mode 100644
index 000000000000..a5e2cee1d0f9
--- /dev/null
+++ b/dev-lang/lua/lua-5.2.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="http://www.lua.org/"
+TEST_PV="5.2.2" # no 5.2.3-specific release yet
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
+PKG_A="${P}.tar.gz"
+SRC_URI="
+	http://www.lua.org/ftp/${PKG_A}
+	test? ( https://www.lua.org/tests/${TEST_A} )"
+
+LICENSE="MIT"
+SLOT="5.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated emacs readline static test test-complete"
+
+RDEPEND="readline? ( sys-libs/readline:0= )
+	app-eselect/eselect-lua
+	!dev-lang/lua:0"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+PDEPEND="emacs? ( app-emacs/lua-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+src_prepare() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
+
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	[ -d "${FILESDIR}/${PV}" ] && \
+		EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
+
+	if ! use readline ; then
+		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
+	fi
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries (both shared and static
+	# are installed)
+	if use static ; then
+		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
+	fi
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}"/ || die
+	eautoreconf
+
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	sed -r -i \
+		-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
+		-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
+		"${S}"/etc/lua.pc
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	sed -i \
+		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
+		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	econf
+}
+
+multilib_src_compile() {
+	tc-export CC
+
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	use readline && mylibs="-lreadline"
+
+	cd src
+
+	local myCFLAGS=""
+	use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
+
+	case "${CHOST}" in
+		*-mingw*) : ;;
+		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
+	esac
+
+	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(get_version_component_range 1-2) \
+			gentoo_all
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	# We want packages to find our things...
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}"
+	sed -i \
+		-e "s:^prefix= :prefix= ${EPREFIX}:" \
+		-e "s:^V=.*:V= ${PATCH_PV}:" \
+		-e "s:^R=.*:R= ${PV}:" \
+		-e "s:/,lib,:/$(get_libdir):g" \
+		"${WORKDIR}/lua.pc"
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
+}
+
+multilib_src_install_all() {
+	dodoc README
+	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
+
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+}
+
+# Makefile contains a dummy target that doesn't do tests
+# but causes issues with slotted lua (bug #510360)
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+	# https://www.lua.org/tests/
+	# There are two sets:
+	# basic
+	# complete.
+	#
+	# The basic subset is selected by passing -e'_U=true'
+	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
+	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
+	use test-complete || TEST_OPTS="-e_U=true"
+	TEST_MARKER="${T}/test.failed"
+	rm -f "${TEST_MARKER}"
+
+	# If we are failing, set the marker file, and only check it after done all ABIs
+	abi_src_test() {
+		debug-print-function ${FUNCNAME} "$@"
+		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
+		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
+		return 0
+	}
+
+	multilib_foreach_abi abi_src_test
+
+	if [ -e "${TEST_MARKER}" ]; then
+		cat "${TEST_MARKER}"
+		die "Tests failed"
+	fi
+}
diff --git a/dev-lang/lua/lua-5.3.3-r1.ebuild b/dev-lang/lua/lua-5.3.3-r1.ebuild
index 8addb54fd3e7..0a325d680957 100644
--- a/dev-lang/lua/lua-5.3.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.3.3-r2.ebuild b/dev-lang/lua/lua-5.3.3-r2.ebuild
index b813a414cb9d..61daaebe0229 100644
--- a/dev-lang/lua/lua-5.3.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.3.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.3.3.ebuild b/dev-lang/lua/lua-5.3.3.ebuild
index 89fd40c75eb3..234b85a128c2 100644
--- a/dev-lang/lua/lua-5.3.3.ebuild
+++ b/dev-lang/lua/lua-5.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-lang/lua/lua-5.3.5.ebuild b/dev-lang/lua/lua-5.3.5.ebuild
new file mode 100644
index 000000000000..99b6b2063774
--- /dev/null
+++ b/dev-lang/lua/lua-5.3.5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="http://www.lua.org/"
+TEST_PV="5.3.4" # no 5.3.5-specific release yet
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
+PKG_A="${P}.tar.gz"
+SRC_URI="
+	http://www.lua.org/ftp/${PKG_A}
+	test? ( https://www.lua.org/tests/${TEST_A} )"
+
+LICENSE="MIT"
+SLOT="5.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated emacs readline static test test-complete"
+
+RDEPEND="readline? ( sys-libs/readline:0= )
+	app-eselect/eselect-lua
+	!dev-lang/lua:0"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+PDEPEND="emacs? ( app-emacs/lua-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+src_prepare() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
+
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	[ -d "${FILESDIR}/${PV}" ] && \
+		EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
+
+	if ! use readline ; then
+		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
+	fi
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries (both shared and static
+	# are installed)
+	if use static ; then
+		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
+	fi
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
+	eautoreconf
+
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	sed -r -i \
+		-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
+		-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
+		"${S}"/etc/lua.pc
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	sed -i \
+		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
+		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	econf
+}
+
+multilib_src_compile() {
+	tc-export CC
+
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	use readline && mylibs="-lreadline"
+
+	cd src
+
+	local myCFLAGS=""
+	use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
+
+	case "${CHOST}" in
+		*-mingw*) : ;;
+		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
+	esac
+
+	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(get_version_component_range 1-2) \
+			gentoo_all
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	# We want packages to find our things...
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}"
+	sed -i \
+		-e "s:^prefix= :prefix= ${EPREFIX}:" \
+		-e "s:^V=.*:V= ${PATCH_PV}:" \
+		-e "s:^R=.*:R= ${PV}:" \
+		-e "s:/,lib,:/$(get_libdir):g" \
+		"${WORKDIR}/lua.pc"
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
+}
+
+multilib_src_install_all() {
+	dodoc README
+	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
+
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+}
+
+# Makefile contains a dummy target that doesn't do tests
+# but causes issues with slotted lua (bug #510360)
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+	# https://www.lua.org/tests/
+	# There are two sets:
+	# basic
+	# complete.
+	#
+	# The basic subset is selected by passing -e'_U=true'
+	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
+	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
+	use test-complete || TEST_OPTS="-e_U=true"
+	TEST_MARKER="${T}/test.failed"
+	rm -f "${TEST_MARKER}"
+
+	# If we are failing, set the marker file, and only check it after done all ABIs
+	abi_src_test() {
+		debug-print-function ${FUNCNAME} "$@"
+		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
+		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
+		return 0
+	}
+
+	multilib_foreach_abi abi_src_test
+
+	if [ -e "${TEST_MARKER}" ]; then
+		cat "${TEST_MARKER}"
+		die "Tests failed"
+	fi
+}
diff --git a/dev-lang/lua/metadata.xml b/dev-lang/lua/metadata.xml
index 0e7b568c3899..06a68a0e0492 100644
--- a/dev-lang/lua/metadata.xml
+++ b/dev-lang/lua/metadata.xml
@@ -9,5 +9,8 @@
 	<email>williamh@gentoo.org</email>
 	<name>William Hubbs</name>
 </maintainer>
-<use><flag name="deprecated">make deprecated data structures/routines available</flag></use>
+<use>
+	<flag name="deprecated">make deprecated data structures/routines available</flag>
+	<flag name="test-complete">Run the complete (non-portable) testsuite</flag>
+</use>
 </pkgmetadata>