version bump (bug #395057). also now uses local libtool (bug #336167)

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

6 files changed, 215 insertions, 2 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 0fe0f6613b91..bf6570b48176 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,12 @@
 # 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.153 2012/01/24 21:44:53 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.154 2012/03/04 22:58:29 mabi Exp $
+
+*lua-5.2.0 (04 Mar 2012)
+
+  04 Mar 2012; Matti Bickel <mabi@gentoo.org> +files/configure.in,
+  +files/lua-5.2-make.patch, +files/lua.pc, +lua-5.2.0.ebuild:
+  version bump (bug #395057). also now uses local libtool (bug #336167)
 
 *lua-5.1.4-r8 (24 Jan 2012)
 
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index fccc04260632..62ee93a2fc42 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -19,6 +19,7 @@ AUX 5.1.4/06_all_io_read.upstream.patch 319 RMD160 1ccff488eb6455d82b5f201c11e00
 AUX 5.1.4/07_all_boolean_expression.upstream.patch 679 RMD160 5fa9592a3bfe34213d7b2447dc6b838d13f5bacf SHA1 827b7a38be81c3bde81761951f37a14e99d7b5ef SHA256 40567e96231919a350ba460abc911d5105edacd630bcacb40ce987c3c9cb666b
 AUX 5.1.4/08_all_metatable.upstream.patch 379 RMD160 f3cc6dcfea36823190acf12b6cd8faa1ed78b7ef SHA1 29ba2e7c30afa831947d4d314cad011635b9f170 SHA256 6ead3599283478a7dec288620beaf58357253154a580a80f93f1b14607a44c7f
 AUX 5.1.4/09_all_prototype_collection.upstream.patch 459 RMD160 eab4367eec92a13e241801120999a18e54446e10 SHA1 87461d7c3df40feb41a786f87437ce81803d74f3 SHA256 643a4a61f8812c274e3a24f5b73a4257cf4185900913deab34a06243b72f9350
+AUX configure.in 66 RMD160 21c1c1f7f59a43c163d85bd0d1388f6697f4f8f5 SHA1 60cb0de8a6ca2714114b93e2b3f0fbb45b4dc2a5 SHA256 1b4477324c94c0793df2117e80bd325bb2cc1cf6be16658151b272d4aca023c6
 AUX lua-5.1-make-r1.patch 2229 RMD160 9dfd3494f93a673e724e642f10543b80466dd547 SHA1 0896a440ad823c55f0a7a3354a09f4e29bceccf7 SHA256 bf691afd2480a496bfa9b2c46fcbb396e7034ea58e94399788e05ab7872ae46f
 AUX lua-5.1-make.patch 2209 RMD160 03d6ff5c31aa2ea8cb4dec871ae4ba4d711d2240 SHA1 103efb333cef67ab3f521e49bda56f647c633f7a SHA256 3ffa297c79ad7ba378eba3de2b730670e60c7ea28181fcca4e0d0e25612997c4
 AUX lua-5.1-make_static-r1.patch 644 RMD160 fc1d837228066f987c09a7bf7c536de31f25685a SHA1 814a3429fabc12836b4520918df6b04bb68cfcf8 SHA256 077f5da55b9b354b8b901d8a769c92aad104d79ba0a6acee0096c9a5d94b259a
@@ -27,9 +28,13 @@ AUX lua-5.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c593
 AUX lua-5.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 SHA1 25baabcb1d3449c3c38726fc7de6c4abb34667a6 SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2
 AUX lua-5.1.4-deprecated.patch 1417 RMD160 c2f51932850ca7deb6a0df41e4fe67764e48608c SHA1 f003694a532f6cb4bb629918d8c2db8c52696723 SHA256 8d4d3c35d9cfb65f6caa360c09d1fa0c5dc1ee0de3389c1e73602fef86cd0e9f
 AUX lua-5.1.4-test.patch 340 RMD160 5ab1fdfaf1c18d26c66096ade8944223c21ce9ca SHA1 9e1fc7b770f2586dd386bea60717962f650a1923 SHA256 cdbb06f6fc5e75512c912360e1efc12e1e62ac7079972ff1c9c9273898bf9e31
+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.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.4.ebuild 3038 RMD160 c04ff8ff3cdd501bebfff733913ae7670406ba4c SHA1 94191221181437be684c5b68bccc93455ee9c11c SHA256 11b4b7491872656645e66b343e3f2c2da87b2e5a9bcc90d00228d86267bc9e5f
-MISC ChangeLog 23051 RMD160 7e34a1e673d1f724decf722b58a9070c6ba78859 SHA1 40b648734227b10099a2ce5ca8f3497d45ad37b6 SHA256 79e124a393bacb755805572ba940c71a1cdd045b0c14c362eb63e5f2d1b2e8e8
+EBUILD lua-5.2.0.ebuild 2925 RMD160 8a18a3ef7901672740d45f9f7d15c5ab2db897e2 SHA1 5741b433028f2c6ca4b8cc97019438ac92231ce9 SHA256 dd103c0ea26ba740f933b3254773b586b11aa4754f3ad8d9dd2d53a42d83bb6b
+MISC ChangeLog 23280 RMD160 83e4d2f498992f1634f94de902554d0d83ba620f SHA1 b4907c4027ee5798a85fe681e932a1f4c55be683 SHA256 4e13c3e94e03318bcb16a9e732133efde76afbf8879688cf1a90b7a5cca4c0ce
 MISC metadata.xml 418 RMD160 ff4ea0d01af18280fc00136f8e502fd90f7d8b89 SHA1 25d2a98fa8edbd5bc471dacd60cbe1f3821b3383 SHA256 ecdbace4d7d07830cc308755b909384644dc449cf7a3f32faefeecf6d3752b55
diff --git a/dev-lang/lua/files/configure.in b/dev-lang/lua/files/configure.in
new file mode 100644
index 000000000000..e4ba8164bbb5
--- /dev/null
+++ b/dev-lang/lua/files/configure.in
@@ -0,0 +1,5 @@
+top_buildir=.
+
+AC_INIT(src/luaconf.h)
+AC_PROG_LIBTOOL
+AC_OUTPUT()
diff --git a/dev-lang/lua/files/lua-5.2-make.patch b/dev-lang/lua/files/lua-5.2-make.patch
new file mode 100644
index 000000000000..431bbde3521e
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.2-make.patch
@@ -0,0 +1,60 @@
+--- lua-5.1.1.orig/Makefile	2006-06-02 12:53:38.000000000 +0200
++++ lua-5.1.1/Makefile	2006-11-16 02:16:53.000000000 +0100
+@@ -127,3 +127,18 @@
+ .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer
+ 
+ # (end of Makefile)
++
++# Use libtool for binary installs, etc.
++
++export V
++export LIBTOOL = ../libtool --quiet --tag=CC
++# See libtool manual about how to set this
++
++gentoo_clean:
++	cd src; $(MAKE) $@
++
++gentoo_install:
++	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
++	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
+--- lua-5.1.1.orig/src/Makefile	2006-03-22 01:41:49.000000000 +0100
++++ lua-5.1.1/src/Makefile	2006-11-16 02:10:27.000000000 +0100
+@@ -54,1 +54,1 @@
+-$(LUA_T): $(LUA_O) $(LUA_A)
++origin$(LUA_T): $(LUA_O) $(LUA_A)
+@@ -57,1 +57,1 @@
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
++origin$(LUAC_T): $(LUAC_O) $(LUA_A)
+@@ -185,3 +185,30 @@
+ lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
+  lzio.h
+
++
++export LIBTOOL = ../libtool --quiet --tag=CC
++export LIB_VERSION = 6:1:1
++
++# The following rules use libtool for compiling and linking in order to
++# provide shared library support.
++
++LIB_NAME = liblua.la
++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
++
++%.lo %.o: %.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++
++$(LIB_NAME): $(LIB_OBJS)
++	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
++            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
++
++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
++
++$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
++
++gentoo_clean:
++	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
++
++gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
diff --git a/dev-lang/lua/files/lua.pc b/dev-lang/lua/files/lua.pc
new file mode 100644
index 000000000000..e53971852c10
--- /dev/null
+++ b/dev-lang/lua/files/lua.pc
@@ -0,0 +1,31 @@
+# lua.pc -- pkg-config data for Lua
+
+# vars from install Makefile
+
+# grep '^V=' ../Makefile
+V= 5.1
+# grep '^R=' ../Makefile
+R= 5.1.4
+
+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+prefix= /usr
+INSTALL_BIN= ${prefix}/bin
+INSTALL_INC= ${prefix}/include
+INSTALL_LIB= ${prefix}/,lib,
+INSTALL_MAN= ${prefix}/man/man1
+INSTALL_LMOD= ${prefix}/share/lua/${V}
+INSTALL_CMOD= ${prefix}/,lib,/lua/${V}
+
+# canonical vars
+exec_prefix=${prefix}
+libdir=${exec_prefix}/,lib,
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
+
+# (end of lua.pc)
diff --git a/dev-lang/lua/lua-5.2.0.ebuild b/dev-lang/lua/lua-5.2.0.ebuild
new file mode 100644
index 000000000000..52b3b621eeda
--- /dev/null
+++ b/dev-lang/lua/lua-5.2.0.ebuild
@@ -0,0 +1,106 @@
+# 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.2.0.ebuild,v 1.1 2012/03/04 22:58:29 mabi Exp $
+
+EAPI=4
+
+inherit eutils autotools 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.patch
+
+	sed -i \
+		-e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \
+		-e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\17:0:2/' src/Makefile
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
+
+	if ! use readline ; then
+		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h
+	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
+	fi
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}"
+	eautoreconf
+}
+
+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
+
+	local legacy=""
+	use deprecated && legacy="-DLUA_COMPAT_ALL"
+
+	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${legacy} ${CFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=${PV} \
+			gentoo_all || die "emake failed"
+}
+
+src_install() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${PV} gentoo_install \
+	|| die "emake install gentoo_install failed"
+
+	dodoc README
+	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
+
+	doman doc/lua.1 doc/luac.1
+
+	# We want packages to find our things...
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}"
+	sed -i \
+		-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"
+	doins "${WORKDIR}/lua.pc"
+}