gentoo resync : 05.01.2018

13 files changed, 17 insertions, 356 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 69670da5ad55..27d51d047145 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index ff3e66a6d989..345911cd1425 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,14 +1,4 @@
-AUX lpeg-0.12-makefile.patch 833 BLAKE2B f47ee41a30ec16310aa028a5390ad4b84f2b7c55db8a005492ec308b51b19afa4754acf19e6837d6f4078ead9e323b981ae6ac89151767ed2dc4bf9afcedc046 SHA512 50b880fca90ff5d833ea83ce66aae1a5c846d20ea161ef317f9d926c7d4327687d09eb95c70b7a5b0f63096c31df028c5a7edd6b361753a53ef75519cdcf0d55
 AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca7653c6701eafe9ec9b3e5284a2ff8b7f989fb65425840da0513e719fe5fa820deb4814d3e838dd5b33651eb4e3c4e SHA512 8f49c6c3b1575cc77d0d9d6c8b75098889af1f8fda58fee1f58150669909e6c4ecbd953738e9c917adcbb1bddc16debe5564b70694d6983295439e06e26782d6
-DIST lpeg-0.12.1.tar.gz 67519 BLAKE2B dc5ae88c04194ac650151fab1c645322b0405551df5432842b8e6d5a0cab9c8388e3d22c1cdde365d127d18149c9551dc1c04480a40fb72cdb1bb78f56d1f710 SHA512 8cd47e169ce97c2eb40b865b0ef975b7a8fc58de1bde504518d9396b2a12efd92e7b2cfa1ccca59dd6a0cc22444fd1915a09e0d17fe78ba2a59bc3748546f60c
-DIST lpeg-0.12.2.tar.gz 68122 BLAKE2B 96b7c535b390d81f867028643885453a8490f4c4a3ea65dd20e4358a13a1fe30ea2fcd188e64a4b0af03c69538d9c13fd46047644c749f77fa5b990f087c0076 SHA512 81505674473d83e2c777d470cd6ba4eead48ecc32e58e52bc192ca7a167f882e722c5a0cae62937fb3f5f71d6216de1ba4ea3d932e72265028f293d778df5e9e
-DIST lpeg-0.12.tar.gz 66649 BLAKE2B fca37f9bf399967c1e8f229649daebf2292d50e628a9dbb12fda6338beb19de0efc27bec5a81df7cfb72f8eb49057c940eeda04f0c32a964abbb85ef7d8b07cf SHA512 bf8c4fe486f5e965b793d8526dd1fc5c8905c4b065a1abe52ec8e41ebbe48292315a7460dc56fb7a029b4673057f9da7e53854bb79bb54dd8a4378391efc24a2
-DIST lpeg-1.0.0.tar.gz 70267 BLAKE2B a48f8e4e56465f030b58f4b2d9c38735cec68ab2011e806b541df13eaac2e2ae42f4938cb36003519cd22baefbd9d2c329888ee7f0224e30b6461a35b1ce197a SHA512 a245d2e0b8604121d8b4466052ab5da4f2b1f81c1c4b2579d8d5498920fc351d46fe4159a0b5948d1b377ef9bda410c4bf40ffd228b9f26bf346dfba2a7b9fb7
 DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
-EBUILD lpeg-0.12.1.ebuild 801 BLAKE2B 97b6a5940ef742f80db29e66ed45d86cd9332613bde7f7738ce9286637a23c12b6c4a8a2da92f650061cbfa2f1b76e8183e95802344180d8eca55edfa61fd182 SHA512 23936ca4fb3a3439fc0ecd7da63db6663a7ab81bda395ae905785b0a830e99ee60dfedc25fd675ece61e36d67a5c04c2257a8470bc8e6e9d10bebf115716711b
-EBUILD lpeg-0.12.2.ebuild 825 BLAKE2B f35eb07a19444396cf99f80ad72259b1bd91ddc46544e3bc460a5b6f5ee7ea4a6b3fd79f546dbe294254b842f1d2aebcf0af4d878d1ad171a6ba1996b09dd847 SHA512 00963968d9ea51b6e5fc7d49c8640efd1e540758818ce157070c7c7e73c71e942f5153729d378d6a374267f27dce704637497a3e130e554562cb215e63bf8c2b
-EBUILD lpeg-0.12.ebuild 798 BLAKE2B d4ce05ca0e504f2108d3aaf7b214b2804645c34569b7c64c106127f794d90bd5dd38146551e151e5a1351235106803a9af41425d11c42b6378811f5b2018634d SHA512 c4a79172a8c86e98ea9d22f0409f979f256d470b49a4c4a982ad2384a85898eea03255f99af4d17d711e4b9832c0d2fc171b564d8da15fec085ca7e2f6ccb1ad
-EBUILD lpeg-1.0.0-r1.ebuild 1228 BLAKE2B cf533bc8cc6998535a129bb663fbfde691f98072ee0d559aa81bc97d5936f13e008a81546d6def5055865974dd7e60c2ff10cad3accae058a9494100af2b6630 SHA512 7763085f63bfac4778eaa538fba7bc271d062b5ae53f0c9c64fbf2f309d7009194de45563d4f9f3e8fc566d263c30bd98c9c3b057bcb3d8d77bb7228b9bb40ed
-EBUILD lpeg-1.0.0.ebuild 861 BLAKE2B 6679fa40af021ea0a60121ed7472278c00c0d15d34db7d1178858f8e7ef4316e7f20cfef1eceef2634173132a9a3fa72f077377781c210b1e93f1848637a18d0 SHA512 fc6783d718d10c0ab3de85f82be9a3c6671e0aaaf58893147dffe190e3690bab575a4d9bfff5bee7531fb7a86487c9123341264fb8eab88c92360e20895230f4
-EBUILD lpeg-1.0.1.ebuild 1235 BLAKE2B 1517697a6d7691e1bf4d69045245172492ae0727b1a44c6bff3b222c41c7ffa0d5079fb6133867d3f683a33d97daf5ab2b3ccc1ed1d1e48bed24470b91bab71d SHA512 6037bf092afb3f719c6731215e8db50bf436967aec7544c57b888e5a69c3fa6c8f68ad8d1599d12e5eb80ca20a5ca1ee0c309f394097e0f0f2d70169bb93a908
+EBUILD lpeg-1.0.1.ebuild 1240 BLAKE2B a6439bdcdab1622dc7c78019b4028b3a3dc8d89be04c50290a3f7b81f6bd1bb83fb1a519244cbf029ae7be2f3ab383209daeeccc5dbb10442f7db84627b765ff SHA512 17e6c9af9716cba6d84ffd6e7d590db59279475e62b4d636e24859fab37e9e5ae8822f5e84b9bf5f90e45795a74b712cbef3d668670607bc5e85a0936888a1af
 MISC metadata.xml 611 BLAKE2B 755eed729733d8f6c161527f18e90de7d59513d48005313b0a5ec202052b4199206041bcc3c69ca6d2792185d837caa4433da0bb56fe94913bc434ba7770cc95 SHA512 7accecfd343b559b674a9351c72ff9c592ab3011878c89517c44f19d72461193cbb3b564e2895791c52311ab46fb0d3852b62cfb4e6398bc994f4920a04cddd6
diff --git a/dev-lua/lpeg/files/lpeg-0.12-makefile.patch b/dev-lua/lpeg/files/lpeg-0.12-makefile.patch
deleted file mode 100644
index 5734de9f55d8..000000000000
--- a/dev-lua/lpeg/files/lpeg-0.12-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- lpeg-0.12/makefile
-+++ lpeg-0.12/makefile
-@@ -1,7 +1,7 @@
- LIBNAME = lpeg
- LUADIR = /usr/include/lua5.1/
- 
--COPT = -O2
-+#COPT = -O2
- # COPT = -DLPEG_DEBUG -g
- 
- CWARNS = -Wall -Wextra -pedantic \
-@@ -22,21 +22,21 @@
- # -Wunreachable-code \
- 
- 
--CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
-+CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
- CC = gcc
- 
- FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
- 
- # For Linux
- linux:
--	make lpeg.so "DLLFLAGS = -shared -fPIC"
-+	$(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
- 
- # For Mac OS
- macosx:
--	make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
-+	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
- 
- lpeg.so: $(FILES)
--	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
-+	env $(CC) $(CFLAGS) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
- 
- $(FILES): makefile
- 
diff --git a/dev-lua/lpeg/lpeg-0.12.1.ebuild b/dev-lua/lpeg/lpeg-0.12.1.ebuild
deleted file mode 100644
index 53f25f0a893e..000000000000
--- a/dev-lua/lpeg/lpeg-0.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-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 ~hppa ~mips ~x86"
-IUSE="debug doc"
-
-RDEPEND=">=dev-lang/lua-5.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	use debug && append-cflags -DLPEG_DEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_test() {
-	lua test.lua || die
-}
-
-src_install() {
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-	doexe lpeg.so
-
-	dodoc HISTORY
-
-	use doc && dohtml *
-}
diff --git a/dev-lua/lpeg/lpeg-0.12.2.ebuild b/dev-lua/lpeg/lpeg-0.12.2.ebuild
deleted file mode 100644
index 6319080ac625..000000000000
--- a/dev-lua/lpeg/lpeg-0.12.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-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 ~hppa ~mips ppc ppc64 sparc ~x86"
-IUSE="debug doc"
-
-RDEPEND=">=dev-lang/lua-5.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.1-makefile.patch
-	use debug && append-cflags -DLPEG_DEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_test() {
-	lua test.lua || die
-}
-
-src_install() {
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-	doexe lpeg.so
-
-	dodoc HISTORY
-
-	use doc && dohtml *
-}
diff --git a/dev-lua/lpeg/lpeg-0.12.ebuild b/dev-lua/lpeg/lpeg-0.12.ebuild
deleted file mode 100644
index effaef3753fd..000000000000
--- a/dev-lua/lpeg/lpeg-0.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-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 hppa ~mips x86"
-IUSE="debug doc"
-
-RDEPEND=">=dev-lang/lua-5.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	use debug && append-cflags -DLPEG_DEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_test() {
-	lua test.lua || die
-}
-
-src_install() {
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-	doexe lpeg.so
-
-	dodoc HISTORY
-
-	use doc && dohtml *
-}
diff --git a/dev-lua/lpeg/lpeg-1.0.0-r1.ebuild b/dev-lua/lpeg/lpeg-1.0.0-r1.ebuild
deleted file mode 100644
index a3f02c029a24..000000000000
--- a/dev-lua/lpeg/lpeg-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~hppa ~ppc ~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}-0.12.1-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/lpeg/lpeg-1.0.0.ebuild b/dev-lua/lpeg/lpeg-1.0.0.ebuild
deleted file mode 100644
index 49e27a58c953..000000000000
--- a/dev-lua/lpeg/lpeg-1.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-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 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc"
-
-RDEPEND=">=dev-lang/lua-5.1:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.1-makefile.patch
-	use debug && append-cflags -DLPEG_DEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_test() {
-	lua test.lua || die
-}
-
-src_install() {
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-	doexe lpeg.so
-
-	dodoc HISTORY
-
-	if use doc; then
-		docinto html
-		dodoc *.html
-	fi
-}
diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild
index 9bf23d5a55b4..cf961125df8e 100644
--- a/dev-lua/lpeg/lpeg-1.0.1.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.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
@@ -11,12 +11,15 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86"
 IUSE="debug doc luajit"
 
-RDEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
 	luajit? ( dev-lang/luajit:2= )"
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS=( "HISTORY" )
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 538886d25282..bfe91bdcce4a 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,7 +1,3 @@
-DIST mpack-1.0.2.tar.gz 44671 BLAKE2B 2c1760d2920a6b1d87f8abf1a3c0b91889d75bb80bf956fdbabe651e30543fb3fd5f34ed30f311534583cdfee438c218a6be228f5ff67f823dec46baa3498271 SHA512 307ae26799e59224dd624d1f5473c86d5cf975155c58b7ccfd17be98321afb0f7235d06a7a2c50112d4630b3cc7c185c9b307007be5cdbd792819ec2991fa3d2
-DIST mpack-1.0.3.tar.gz 45720 BLAKE2B 13b9e1586ebd377ba2fa037f817180a9ee509d89d8760a98b59a85b149efb52f0b0bac04d6d46adf0ba1ef0204b13179471b40b495d50e5a1e20e4f293d33c60 SHA512 3024d2830d83a7572a648ee6074467e2096dc6af7c92aaf3c6531e4c25c1c57d9853a60f5b2d1f50039ceeb80bae83f8fdc7241fa48f789cb636bba32fc2a9ba
 DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
-EBUILD mpack-1.0.2.ebuild 891 BLAKE2B e7fcfe63b6a2dfc7fe75b96cc6e743ff07bac8123a65717ace73df768e3499c563ebddc6abc1b69f5a9dcc11f7700747638e1b385c7624c04117d654a493a88a SHA512 89ee3dc5a45102fcb63a1da09f48cdf5d168852ab99a5247da2c77f0d43fff688c988dd6f0f2925466ee8a09655f52baa86edafd0283c30526159b2dcfddb5c9
-EBUILD mpack-1.0.3.ebuild 1012 BLAKE2B 5c8278b03b6b985fb51b2fbd71a7c6a598c54070e004dbd2c55e399a4d0a78c34544d6f6f369a015c008dada6679f71f4a24b25149b8029327540d044aff2fe2 SHA512 d641a42577a6bc88902a23a111a31571e671df36b65987ad04a15af83a8b569d167eb61e808bcd0b749b39ba678e9b772ca6be991c12d6925c9ece40c3bfa5ed
-EBUILD mpack-1.0.4.ebuild 1017 BLAKE2B da2d08f6da4c823f39c6bf7c315d444eac7793945b88e9a79dfcc927533d537604312d998f0ee57fa6931455a968ef89a261a10d4a3d413d1d1b484fd0d72f71 SHA512 702d0b1b2ef739c183cdfaa80cdf5c30818bd8a371e6f23be381777612f1051fccccda682e7e7d4c4dac195f6421863aaa6943e5005f69187dcba62d06342cdc
+EBUILD mpack-1.0.4.ebuild 1017 BLAKE2B 9ea57f9f1db116b99cdfb69fb42e9882f1aa23c2e2c750d29cd384a7942daf89fd7ceac7bfff49b48dc2ca72815c12b3df3a7c687043b778a3988b9906bba948 SHA512 0e8ff61f4b76779adb421d742c005d0b9a9ee8e723e9c94382696e0ad10c2f73f3140e4e8c38005b7ce516e3c7f1115080fdb834f5c8920a499554fac3132b03
 MISC metadata.xml 556 BLAKE2B ea253bc22d10923681b1c0c4dd030945fad8e92a537246263cdedcdeef8045a1205f50fa7e9a5a602bd8089a39187905f374c714f74527acea1ba11981600608 SHA512 b45378cb9a883edf95ef2a8bda32f914d6bd4833669aab1493f88a94e94f4cddfe1087e23f518ee134b4f6c17b517d1c72e93534ba29bcc39d2255bb1d5db7cf
diff --git a/dev-lua/mpack/mpack-1.0.2.ebuild b/dev-lua/mpack/mpack-1.0.2.ebuild
deleted file mode 100644
index 40bf46a7e6a7..000000000000
--- a/dev-lua/mpack/mpack-1.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua bindings for libmpack"
-HOMEPAGE="https://github.com/tarruda/libmpack/"
-SRC_URI="https://github.com/tarruda/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libmpack-${PV}/binding/lua"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="luajit test"
-
-RDEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:2= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lua/busted )"
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} $($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua')) -fPIC -DPIC -shared lmpack.c -o mpack.so || die
-}
-
-src_test() {
-	busted -o gtest test.lua || die
-}
-
-src_install() {
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-	doexe mpack.so
-}
diff --git a/dev-lua/mpack/mpack-1.0.3.ebuild b/dev-lua/mpack/mpack-1.0.3.ebuild
deleted file mode 100644
index 8c3b450c3021..000000000000
--- a/dev-lua/mpack/mpack-1.0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua bindings for libmpack"
-HOMEPAGE="https://github.com/tarruda/libmpack/"
-SRC_URI="https://github.com/tarruda/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libmpack-${PV}/binding/lua"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="luajit test"
-
-RDEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:2= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lua/busted )"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		USE_SYSTEM_LUA=yes \
-		LUA_INCLUDE="$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))" \
-		LUA_LIB="$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	busted -o gtest test.lua || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		USE_SYSTEM_LUA=yes \
-		LUA_CMOD_INSTALLDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" \
-		install
-}
diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild
index 8665ccc4f901..354d35b57794 100644
--- a/dev-lua/mpack/mpack-1.0.4.ebuild
+++ b/dev-lua/mpack/mpack-1.0.4.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
@@ -7,17 +7,20 @@ inherit toolchain-funcs
 
 DESCRIPTION="Lua bindings for libmpack"
 HOMEPAGE="https://github.com/tarruda/libmpack/"
-SRC_URI="https://github.com/tarruda/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/tarruda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/libmpack-${PV}/binding/lua"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="luajit test"
 
-RDEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
 	luajit? ( dev-lang/luajit:2= )"
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-lua/busted )"