gentoo resync : 05.01.2018

4 files changed, 9 insertions, 87 deletions

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 )"