version bump for lua-5.1

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 128 insertions, 12 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 9ae2af8dd314..0f4387373b28 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/lua
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.157 2012/03/05 23:25:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.158 2012/03/17 20:41:46 mabi Exp $
+
+*lua-5.1.5 (17 Mar 2012)
+
+  17 Mar 2012; Matti Bickel <mabi@gentoo.org> +lua-5.1.5.ebuild:
+  version bump for lua-5.1
 
   05 Mar 2012; Zac Medico <zmedico@gentoo.org> lua-5.2.0.ebuild:
   Add missing newline escape in src_compile emake command.
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 0e821ebb57d7..dd25cfc1ee6a 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.1.4/01_all_boolean_expression.upstream.patch 1064 RMD160 7c10f8cf7aa842cdfd43fd8f8db5d6fbdf76459b SHA1 4cc7050fe4d5f16b4103b7b83ecd54c087f46396 SHA256 9506fa6932454abe735b9d620ca0b322b4e2eb03b38a5d3d717823508110620e
 AUX 5.1.4/02_all_table.upstream.patch 643 RMD160 340ccc72f65cf6a82e76b3f641e0dcf5d97d3db0 SHA1 7a91ffb6258e59c1e2a1f150e73a639bc46e3d59 SHA256 e55930ccbfadf384b2b981da3454b0dfd8544ffcb29e10ad07c7404142447b09
 AUX 5.1.4/03_all_debug_getfenv.upstream.patch 232 RMD160 1c3a0bdeff3ab07bcaa185079d19bf90e83de0c5 SHA1 c9d685ab40f5964082927cb245373ca717b2823f SHA256 a6aa45a96ba44f04fd516851fc4188d89ad0c6d2b927d3be9faf84808c4a138d
@@ -22,16 +19,11 @@ AUX lua-5.1.4-test.patch 340 RMD160 5ab1fdfaf1c18d26c66096ade8944223c21ce9ca SHA
 AUX lua-5.2-make.patch 2025 RMD160 d15c1e4589da736545ebed384ae2ad8fa0cc1edb SHA1 fb2dd53c7938f03504f02f4bb4a705ad7f92b46f SHA256 384e6c9fad1c0677868afc69115e0c0f2b6314bc3956a39a66e10e980864c917
 AUX lua.pc 658 RMD160 05a768e440680898b06cc698178418edc07b2e47 SHA1 a7659d6d50ce62e72c10b285b463fad297334297 SHA256 ff7ae80c41698f27f4d1168c4cb2931d7b232e66528d9a2b0939723f4bb00145
 DIST lua-5.1.4.tar.gz 216679 RMD160 c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef SHA1 2b11c8e60306efb7f0734b747588f57995493db7 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
+DIST lua-5.1.5.tar.gz 221213 RMD160 b0c2234675335a8bf158a125b6778cf800c754a0 SHA1 b3882111ad02ecc6b972f8c1241647905cb2e3fc SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
 DIST lua-5.2.0.tar.gz 246377 RMD160 6153bddd57493490b72e700cc99135432bf653f0 SHA1 08f84c355cdd646f617f09cebea48bd832415829 SHA256 cabe379465aa8e388988073d59b69e76ba0025429d2c1da80821a252cdf6be0d
 EBUILD lua-5.1.4-r4.ebuild 3145 RMD160 bf486b578561b16a7c148430fa7a8c9c9ef15fef SHA1 947ce75e6f870b40f53b9df630f5b1df1e62e28f SHA256 e7bd80f13d14ab0ce5fd15fd2a8f665d04da2d26ec40b3a11af9f3e7355ff38a
 EBUILD lua-5.1.4-r8.ebuild 3199 RMD160 5f45782eab260d044a43aba2212d0ac7c90d1387 SHA1 60fca10e077f2f549ccafa657875faaa0b55b2e0 SHA256 30f1cf4aa50bc2b2a45783f6b96e9710dc60c89f2c9bc97b6175a79d2ec16fec
+EBUILD lua-5.1.5.ebuild 3197 RMD160 e2723b2eb6c2bf1006ab51a795aadb57e1c7c8db SHA1 ced3e07805e95eb9346bd59a9ebc7575335fb807 SHA256 c36210eda5362963f1fddb9183213e3286034356da82e953b73003b8133af5ba
 EBUILD lua-5.2.0.ebuild 2936 RMD160 c81e275cddcca4af7f2487388d811753a656bd53 SHA1 78ee175a99c0bc357a770528905fbf1be82eef2a SHA256 4c047ef8e60e42de4b126df49d76ee0a86fd7ef5606c2aa6a3ee18ffd9787463
-MISC ChangeLog 24186 RMD160 d526dda5c639188f872fdd10fbf35e90da944c6b SHA1 0e3a5c5cc0e14ce290727824c9123b9c43ec769e SHA256 1a51ca92b524164bf0685105952bc6083b11963dd66f6614d9efb05dd3bc4aab
+MISC ChangeLog 24302 RMD160 c0a67e87a273a29a6c67cdf375715d73ef6c2902 SHA1 1bcd661a21961618810de4dee112f09f6ae5dea8 SHA256 9ffa50fae5bf40c41fd37ef350e880e4c3f8926281cf22a1227e4f706116add4
 MISC metadata.xml 418 RMD160 ff4ea0d01af18280fc00136f8e502fd90f7d8b89 SHA1 25d2a98fa8edbd5bc471dacd60cbe1f3821b3383 SHA256 ecdbace4d7d07830cc308755b909384644dc449cf7a3f32faefeecf6d3752b55
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk9VS28ACgkQ/ejvha5XGaM2vQCg60FL5RpXDvi2QX5aT3OORzLS
-NX4AoLxIrJC4DO1vvaUxGtmFkoSVxX7O
-=mOGc
------END PGP SIGNATURE-----
diff --git a/dev-lang/lua/lua-5.1.5.ebuild b/dev-lang/lua/lua-5.1.5.ebuild
new file mode 100644
index 000000000000..a0d423e89d12
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.5.ebuild
@@ -0,0 +1,119 @@
+# 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.5.ebuild,v 1.1 2012/03/17 20:41:46 mabi Exp $
+
+EAPI=4
+
+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_prepare() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+
+	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:5: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 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
+		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
+}
+
+# no need for a configure phase
+src_configure() { true; }
+
+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="${EPREFIX}/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="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${PV} gentoo_install \
+	|| die "emake install gentoo_install failed"
+
+	dodoc HISTORY README
+	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
+
+	insinto /usr/share/pixmaps
+	doins 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
+}