3 files changed, 19 insertions, 134 deletions
diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index c6cffe4c57f5..6f8a8117d08e 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/lua
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.186 2014/05/24 22:03:11 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.187 2014/05/29 21:58:33 mabi Exp $
+
+  29 May 2014; Matti Bickel <mabi@gentoo.org> -lua-5.1.4-r4.ebuild:
+  remove stale EAPI1 ebuild
 
   24 May 2014; Matti Bickel <mabi@gentoo.org> lua-5.2.3.ebuild:
   omit broken tests, bug #510360
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 47cc7e9226e2..3d635b91c91c 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -30,7 +30,6 @@ DIST lua-5.1.5.tar.gz 221213 SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e
 DIST lua-5.2.0.tar.gz 246377 SHA256 cabe379465aa8e388988073d59b69e76ba0025429d2c1da80821a252cdf6be0d SHA512 48c4a35323309c983a785a320b9a5058401c8b6cc0a4296ace66ab13ecb435d5274fdbaa28498f232619bda3bdee6eae9d264421406a83e55a418e2a6e95388a WHIRLPOOL d14eeaa0322b611a65d698faf94e00611e3c4942363e2db068891838f6f7abab9b2ca509b6e3791b0f734ee69e41e07ac63a372d0bee60c9e8ffcc5a0f693909
 DIST lua-5.2.1.tar.gz 249882 SHA256 64304da87976133196f9e4c15250b70f444467b6ed80d7cfd7b3b982b5177be5 SHA512 d0548d2cc2aa4fb4b5ae19d0ff675027370e3ee22d6e1ba448651c6f1f6f5e6b6214c81b760a23954f1e270936248bc021b9594a75191de4c1921e73d1ae48fb WHIRLPOOL 2a8d3d3c6ae37307bd667ab0619f7992f12ad4fb6c2709c2b4ee797b33d6eebee2d0298b7cb1b1a62d6140d3f9563ed7479c508da55234148981e57fe159e842
 DIST lua-5.2.3.tar.gz 251195 SHA256 13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449 WHIRLPOOL d278a1e38416bcf7f82eb3e7fd5fb423e60ccb69e9d57a937070516ff8be2d19a98bbfdaf37ec6fd6fb3ef2d625900977ca0cb47e46cb0ede5ebd5d37a9454ef
-EBUILD lua-5.1.4-r4.ebuild 3113 SHA256 68893db7b4094dfc78a480b86b4dc26d37bca61f4f2931aff43703bf69f0835d SHA512 f5f5c7ba6c5e65e2fac43eb3e0595863783699ad9c0c780c45d7da36095d9c7b4b99c727964b70b72428d37abbb5974f7e0e545e6a4d1f1df1d044d7d7097e2c WHIRLPOOL 93bbe3e475c0aba54e16e6ed24d5d664021ec352531a829307a2f525119f98dc880f56fb1cfca1eb0f79c61da7978d2edd86a17c81ca59f0c76fa5737a0e9f59
 EBUILD lua-5.1.4-r8.ebuild 3164 SHA256 0e408cc508160c80c10165b9d029063700a5aa21092cc0d1cc21fb126c52d840 SHA512 e29d6b1684d4acbcc6cf9a14b4958461f03d8b39ac3d462db2b9733335a8c775f3f0a25b830b6268b6f126096f6743a0676f94fcccd5e499e134a9300ec9d75c WHIRLPOOL 6b00772cbd20cdbe10c4dfcfd948626160c238b08aaef49f400d8d28b928e29f309adcb5b59b46a6cef17e465c2e9cebbfff9f3fa2d0f5960682acd7e377b912
 EBUILD lua-5.1.5-r1.ebuild 3300 SHA256 74e8985ffb0de810c7725ffb33079570b67afd981e3ee246252b22ad6a80b7da SHA512 faa30dd73e4477cd8c8367854b7ded9824b3978ef38a4194d54eacfefb96f170fa703d2d933f6b787652d27663a586f87b43be2a5646d24c4010ddade419d896 WHIRLPOOL 0ee24144dc4a736bd863909ec5eb1a27ac683840484c88a0ff931ff087acd395a223bbb408b7d02bc2849e5c4cffb13bf52b67e147f4f8965b014b6bba4fc539
 EBUILD lua-5.1.5-r2.ebuild 3445 SHA256 ec33b9a69ba0e08ac3b2a6b1b4aefecf1c8ef1a78b51008b73cbfcade5002b39 SHA512 876d8e0569bde3c1b6c8d361e3f27c70aeee37605ea78061420830204bcd6d6815cc3364cc442752369447fce027f06bb234ec4927104512c7fea435314740bf WHIRLPOOL b69a2affa4f6d9f153da8e67fae629928eb60d4ef1a4735fe7bb6d53c828ef8a26623978348803e03aa3ad855e9ac5a45274361ff6ed8f0dbf5a6848200a0387
@@ -39,24 +38,24 @@ EBUILD lua-5.2.0-r1.ebuild 3026 SHA256 09a25322e66963d135bad400ebca3863bf5ca6b10
 EBUILD lua-5.2.0.ebuild 2949 SHA256 ff6d72650e730be5a8850208762e0246293ce7f06d70f3e5b42b6c3a1bb468e5 SHA512 864fc6e2da4c649d6e80289485581e89318b750b6ed7c139b7f4b13adf471976bb92c671339ba7b0bb55232f55b1ca25622015d0efaf92bd97e65420e200169d WHIRLPOOL 10fb2a7019df3274af6a8618c1ead587993dee27785d6876b52f04481d770a722771490e29bcdd0c938c88f1c6dd4d0e31ef70c654d916d9b27818135b18f3d6
 EBUILD lua-5.2.1.ebuild 3101 SHA256 1cf60be8ca113663718b8656eb9d5b6617a9a39cd9820e253a5c8d04398ae21b SHA512 4d68daa4c27688ed2ab128bd11e649a87aad690f2bac40b4a400cc0c07ceefb424ee1d60f3d7d87c42eafb5baebd0bec4e8384106c1e425850d63f13aa249086 WHIRLPOOL f722fe3fcca3785b1c4e6bc109afec3869212b9cb52a55b04c807cc0727ae1f48a536d66925cac8eb51408ab476135b72a2c1dac45d00a46865994f911568ef4
 EBUILD lua-5.2.3.ebuild 3376 SHA256 4db9fa174d155ac7caae823f4b9a4a9ca0abc060e0e1fa6f0ff3f3294ded2d57 SHA512 5d9d211c25887a94182275d910c0005b65f92ae3c94e8141b9fb50e2fb027dac6e5d45f93d3f29f595c7ac8abbdc66ecdf133ef1a5cf3bc546303915393a52ec WHIRLPOOL 99197ca0b42fe961c6f56023f78803866875c85e181b4d7f153ff1c4559bf02e824eb78c0fbec0924ae6e5d1ced554d5f9d557474c6f19ad106b41959e64e7aa
-MISC ChangeLog 27824 SHA256 4f069358ec3703c6f3722e466b694e9d1ede39198e2b0f51e09af8f51e4adbd7 SHA512 8ccc51ebb7c25fdb31783bf17311da19a84bc0dc26d00f6dbca0ab2eb3a3d49432a3f9f650143d981dc46fbe6e37fa9a57884169d183a3fe556be068b9972c96 WHIRLPOOL 4fb017a72447db1c62be6472213e26385527a3c34a76c59630ff7e42de0357fb99bafc5f2629efd4fdb4ad2f976bd1324aaefd8b7d6b5d255b723a77eefe69f0
+MISC ChangeLog 27921 SHA256 3b5275e17d34c0d8030467bfad25ed4006c921c849403aba4d46f60cd31e6268 SHA512 4fb5da8280fa3a21655a5d240eb0aeee10a070196bf3e9b376224fa0749945cfb949f67e736df1fccaf1ee2f18595136afcf0f6d6d29c80ad4c5c7744ede5ecf WHIRLPOOL fa29b371e266c037b9532422e0c27c8040138c832a9c3945bb7fba1a188357822fd5ded4b2fafd10068a165a02fa93d5505db979941a535a87be906970fb9fec
 MISC metadata.xml 418 SHA256 ecdbace4d7d07830cc308755b909384644dc449cf7a3f32faefeecf6d3752b55 SHA512 f545c84ef7c020511117e59ee232984409ebe2dd418c2a3e61adb8fa33649d435df86dcb70391d48ed7e2be9b04575757bf2c2e5347114f5c38a9c9335352490 WHIRLPOOL e9e84ca81f1e173e723e07bed3fc954b3d39fd288b47792c1cb61fd7e493eafe6401247a5e35ac7bc4845b21ea40d64aa1f2f643df2942491f6815a9fe7ecb2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTgRcrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTh62lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNzE1M0M4QzQxMzM4REREMjMzQjg4NUZE
-REY5NzFGMTE4RUVBNUU2AAoJEN35cfEY7qXmLbcP/22i+aKH8084cRabBGp5zp57
-KDmofojxNvYLRhLpldY9DVWv29ptbddRep1IwYwDl9AbUyeibi5Irb7ZHu1BdxcO
-udisIlgHBssorHeQerzahIVvqgYBK/Wk7cElbwkEru5/Nygmg/yB7aGgzU8sFFYJ
-4tHYVOK1Zf3G1GZn/4WmbdaPjkZJgiVdfIQDGB2q+OYAcKXa6CwAeUreNerWUEYE
-/4fb8kzku+pE7nnN5y6scLOLn4QxOb3g2VgkDz8gCte/TkB2wVPNtvKOWKIzE1/Q
-obiFW3j8MyUXI/DOhxk1AZVrXiBsV2/2bLnaKZPB4ptiBbYqU7koPiOoroghVuiU
-pCZX7RwDJ+Xv27ImlwPqtLsFXRP9tuHgUedA2NURYRqLyYvySlwsumBmDLVcixOK
-iLd+tfxSdAJFyBGaYcvU5OzIXMXBzkqjplgCMw5V3JH+61MB8ZaVNky6UeCnD4Op
-ZYdj+adM9T4oYE41UmcILZ/IqGua/SYLGALrT/iUXvBLcykfp64l5Cbd3xrJUbgQ
-+FJgDAXdMPMsPbW17y2D4SWd535RAOg9/fpDFLyqZjwA6NlVfMrx3j0hkowiCQvG
-xMIDs/9+bzGvuYDO+kiRvaUqVTgIYXlVHshBr8Ulo/L9EZynkBhfILfBNvqGEa7A
-ulbHmh3gksXn06zp+6ge
-=sc1h
+REY5NzFGMTE4RUVBNUU2AAoJEN35cfEY7qXmXUwP/0qTJn4gxsnb/ZSpgnm8WT5X
+9BcSMHpm0/LwB8O4pMd8XXIJwkhIZqMtEGp7L1O+r0N36eKemNYQDG4kTXBXgO2Q
+cqyoFJDx2vBsadqllKskyAxpgFNlEPXmslKVjrlhs8abKKf3XN9TszEWX9s8PtyU
+jpXdpKwuz2bEvXiklY2DqaH7hj2+uP/ZYGZwwU8lcej/8Pse2Q/F83MB2PI8X/fG
+HNp+FcgKKdV8VLAwVTwKRJtfg3GDRs2ZrAZbHkfYSBUIJeE54be4HWi4P22R7gOh
+3PVJNvGvIb8xGY/s024HSfTUQeziwDMUJqDctRaRb2y6kE+fEKD93GN4GIzP3ilk
+q2i8b3eIREL3PMqPoD7YwxHgYpbpAfUTpbe1Udf94BjxjCiEO0DLUCCrgnco8cu6
+1yPbl5j3T1s8P3hM267FTFKUaC5g9B7gedoLRlMqfZ1uefamWQPxgezjECBLfUof
+tZgOn0+vyKENft5EDrCrlwuo9nvUIrHbQqy6ZAEaFbOkd/upFSRWD1QM/HZDIxnR
+qaA+5uaG5xbUKxVAtptd5IUB3aKhcrV02KVo5Rcz3WGD4JNbaHNBy2Lz/fXVp6qC
+cntzu0J3C2gu6ZjbS5t/elDGJk1GnidXAxdnRcpOA5dFz/koWIIO6cM0eVatwCih
+UWiZsXLIsdFjcZQnhmrm
+=S6Sp
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/lua-5.1.4-r4.ebuild b/dev-lang/lua/lua-5.1.4-r4.ebuild
deleted file mode 100644
index 1d53f87be7cd..000000000000
--- a/dev-lang/lua/lua-5.1.4-r4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r4.ebuild,v 1.12 2012/09/05 09:28:49 jlec Exp $
-
-EAPI="1"
-
-inherit eutils multilib portability toolchain-funcs versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-src_unpack() {
-	local PATCH_PV=$(get_version_component_range 1-2)
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
-
-	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
-
-	# correct lua versioning
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:4:1/' src/Makefile
-
-	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
-	if ! use deprecated ; then
-		epatch "${FILESDIR}"/${P}-deprecated.patch
-		epatch "${FILESDIR}"/${P}-test.patch
-	fi
-
-	if ! use readline ; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
-	fi
-
-	# Using dynamic linked lua is not recommended upstream 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
-	# Not 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
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
-	fi
-
-	# We want packages to find our things...
-	sed -i \
-		-e 's:/usr/local:/usr:' \
-		-e "s:/\<lib\>:/$(get_libdir):g" \
-		etc/lua.pc
-}
-
-src_compile() {
-	tc-export CC
-	myflags=
-	# what to link to liblua
-	liblibs="-lm"
-	liblibs="${liblibs} $(dlopen_lib)"
-
-	# what to link to the executables
-	mylibs=
-	if use readline; then
-		mylibs="-lreadline"
-	fi
-
-	cd src
-	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
-			RPATH="${ROOT}/usr/$(get_libdir)/" \
-			LUA_LIBS="${mylibs}" \
-			LIB_LIBS="${liblibs}" \
-			V=${PV} \
-			gentoo_all || die "emake failed"
-
-	mv lua_test ../test/lua.static
-}
-
-src_install() {
-	emake INSTALL_TOP="${D}/usr/" INSTALL_LIB="${D}/usr/$(get_libdir)/" \
-			V=${PV} gentoo_install \
-	|| die "emake install gentoo_install failed"
-
-	dodoc HISTORY README
-	dohtml doc/*.html doc/*.gif
-
-	doicon etc/lua.ico
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins etc/lua.pc
-
-	doman doc/lua.1 doc/luac.1
-}
-
-src_test() {
-	local positive="bisect cf echo env factorial fib fibfor hello printf sieve
-	sort trace-calls trace-globals"
-	local negative="readonly"
-	local test
-
-	cd "${S}"
-	for test in ${positive}; do
-		test/lua.static test/${test}.lua || die "test $test failed"
-	done
-
-	for test in ${negative}; do
-		test/lua.static test/${test}.lua && die "test $test failed"
-	done
-}