revbump w/ api breakage and new patches

Package-Manager: portage-2.1.1-r1

diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 0cc350c9c154173810eb425dc0348b1d6b0c950d..6b3cdf5d6820870e0b427e9a1fa8ce28ffc9bd5f 100644 (file)
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -33,6 +33,18 @@ AUX lua-5.0.3-shared.patch 1360 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987
 MD5 17d4d55107af46b9d72581c953f5a06e files/lua-5.0.3-shared.patch 1360
 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987 files/lua-5.0.3-shared.patch 1360
 SHA256 c9ba1d3258ded3da1ca48210faf67b699ee80b115fec5fb4e9319cf7755dfc55 files/lua-5.0.3-shared.patch 1360
+AUX lua-5.1.1-make.patch 2475 RMD160 d4434c1b572d1190b83d653672df83448aa88932 SHA1 50f39b83338c1821dff7f042262823cc90220b2a SHA256 c7fa34b1529813b15f17ddd1398206091c4da2dba36223fb800bcf8302d6da80
+MD5 f915281e4d8ee50234752fa0c54a22d0 files/lua-5.1.1-make.patch 2475
+RMD160 d4434c1b572d1190b83d653672df83448aa88932 files/lua-5.1.1-make.patch 2475
+SHA256 c7fa34b1529813b15f17ddd1398206091c4da2dba36223fb800bcf8302d6da80 files/lua-5.1.1-make.patch 2475
+AUX lua-5.1.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e SHA1 50cb1438b7c50536ebf712d16d153eac40599562 SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7
+MD5 e60ef15deefb72a5930c498f1184aced files/lua-5.1.1-module_paths.patch 1078
+RMD160 31a3f13af427bdcae784e21a9456f9197c59379e files/lua-5.1.1-module_paths.patch 1078
+SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7 files/lua-5.1.1-module_paths.patch 1078
+AUX lua-5.1.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 SHA1 25baabcb1d3449c3c38726fc7de6c4abb34667a6 SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2
+MD5 f2205b897edb31292a1f597a7fd638cb files/lua-5.1.1-readline.patch 360
+RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 files/lua-5.1.1-readline.patch 360
+SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2 files/lua-5.1.1-readline.patch 360
 AUX lua-ppc-macos-Makefile.patch 2681 RMD160 96be558e865831b2298eddadd3b251f46846a37b SHA1 8fd652137350c6112dbfa553768e56080eeadb15 SHA256 ee61106a273935047fe1557c5af86f7b743427e38c4f552fab3841a199f48f8b
 MD5 710b33a666e65c67841362970d8afb83 files/lua-ppc-macos-Makefile.patch 2681
 RMD160 96be558e865831b2298eddadd3b251f46846a37b files/lua-ppc-macos-Makefile.patch 2681
@@ -40,6 +52,7 @@ SHA256 ee61106a273935047fe1557c5af86f7b743427e38c4f552fab3841a199f48f8b files/lu
 DIST lua-4.0.1.tar.gz 158426
 DIST lua-5.0.2.tar.gz 190442 RMD160 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30 SHA1 a200cfd20a9a4c7da1206ae45dddf26186a9e0e7 SHA256 a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc
 DIST lua-5.0.3.tar.gz 191384 RMD160 cb3ed4320b438d73c8ff6c93a02275c9fb461883 SHA1 e7e91f78b8a8deb09b13436829bed557a46af8ae SHA256 1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671
+DIST lua-5.1.1.tar.gz 207810 RMD160 0b9cc31cca1a0f4c2ebb62f177dc157677953a4c SHA1 be13878ceef8e1ee7a4201261f0adf09f89f1005 SHA256 c5daeed0a75d8e4dd2328b7c7a69888247868154acbda69110e97d4a6e17d1f0
 EBUILD lua-4.0.1.ebuild 780 RMD160 15ee8800a341b1b57cb800c7fd60e5b843b13758 SHA1 22a94d953375d28ea3cffa831094f0942859fcbc SHA256 5cdbdb1bfa9959585a438f643a93c68479f92d40ac75a9d0cc9889a7ec29a880
 MD5 eba6f162259ed67c8d07ac9169b9e4b8 lua-4.0.1.ebuild 780
 RMD160 15ee8800a341b1b57cb800c7fd60e5b843b13758 lua-4.0.1.ebuild 780
@@ -52,6 +65,10 @@ EBUILD lua-5.0.3.ebuild 3091 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef SHA
 MD5 5c82889af9fbb1331fb9966216562c02 lua-5.0.3.ebuild 3091
 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef lua-5.0.3.ebuild 3091
 SHA256 5e5232053c6de487ba7a6103f51111f0339a6aa79838988090256548f6b7f069 lua-5.0.3.ebuild 3091
+EBUILD lua-5.1.1.ebuild 1985 RMD160 deb3523bd87749777bdad52e5498d03f5ceb33f7 SHA1 0fbbe5d346750191b87e5b1661c2f41d1d97a9b3 SHA256 58c9ced97ad0cf2058aa9852783e7a42c2b5de152d8b315b6237e862978533ef
+MD5 a33659ab8efe389c8917d53b49c82037 lua-5.1.1.ebuild 1985
+RMD160 deb3523bd87749777bdad52e5498d03f5ceb33f7 lua-5.1.1.ebuild 1985
+SHA256 58c9ced97ad0cf2058aa9852783e7a42c2b5de152d8b315b6237e862978533ef lua-5.1.1.ebuild 1985
 MISC ChangeLog 6981 RMD160 1984da9566ef566fce74dd801f225260f5a10aed SHA1 14b3219ee663598776ac11079740cbe615852a85 SHA256 8c5aa683845917c19549b96d4a14c2fc50231f66d143e86b49086a1162fd918f
 MD5 3c1b68cce096707d986c6d84b14b1b9c ChangeLog 6981
 RMD160 1984da9566ef566fce74dd801f225260f5a10aed ChangeLog 6981
@@ -69,10 +86,13 @@ SHA256 dd85bd3af3bdca85924820c75cd663147dcd19c6b89c64161e406ee39e0fdf96 files/di
 MD5 23154e6d41fb3e070a7c9390e991e13c files/digest-lua-5.0.3 229
 RMD160 13f30c4580ef37b67160942adc5497820c09d556 files/digest-lua-5.0.3 229
 SHA256 4a4b5a506f9226dc2e8bb8d52129a6c4b66f27b7d9d0a91c81b0379605c34d0f files/digest-lua-5.0.3 229
+MD5 541613cc1c7f33c6ab0e8858d2812bc2 files/digest-lua-5.1.1 229
+RMD160 8dbfca4720b6ff909dc6f2fa3496373083970771 files/digest-lua-5.1.1 229
+SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/digest-lua-5.1.1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVpi9amhnQswr0vIRAsYaAKCFt8CfAZAgiUiz+nm5MQgeHRsCfgCgpqM0
-+u9vqsyRzb6O1eNJ0o+DYRE=
-=y73c
+iD8DBQFFXihyfNMcoUhJ7GwRAgrnAKCDzaJgjhIdWI6WcmPT9BYL5UJcKwCgn9Yn
+I5uIVqq6jWt1pBTTNlzSQbc=
+=8DOi
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/lua/files/digest-lua-5.1.1 b/dev-lang/lua/files/digest-lua-5.1.1
new file mode 100644 (file)
index 0000000..5a0845c
--- /dev/null
+++ b/dev-lang/lua/files/digest-lua-5.1.1
@@ -0,0 +1,3 @@
+MD5 22f4f912f20802c11006fe9b84d5c461 lua-5.1.1.tar.gz 207810
+RMD160 0b9cc31cca1a0f4c2ebb62f177dc157677953a4c lua-5.1.1.tar.gz 207810
+SHA256 c5daeed0a75d8e4dd2328b7c7a69888247868154acbda69110e97d4a6e17d1f0 lua-5.1.1.tar.gz 207810

diff --git a/dev-lang/lua/files/lua-5.1.1-make.patch b/dev-lang/lua/files/lua-5.1.1-make.patch
new file mode 100644 (file)
index 0000000..7522e56
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.1.1-make.patch
@@ -0,0 +1,74 @@
+--- /home/mabi/gentoo/lua-5.1.1.orig/Makefile  2006-06-02 12:53:38.000000000 +0200
++++ ./Makefile 2006-11-16 02:16:53.000000000 +0100
+@@ -22,10 +22,10 @@
+ # How to install. You may prefer "install" instead of "cp" if you have it.
+ # To remove debug information from binaries, use "install -s" in INSTALL_EXEC.
+ #
+-INSTALL_EXEC= $(CP)
+-INSTALL_DATA= $(CP)
+-#INSTALL_EXEC= $(INSTALL) -m 0755
+-#INSTALL_DATA= $(INSTALL) -m 0644
++#INSTALL_EXEC= $(CP)
++#INSTALL_DATA= $(CP)
++INSTALL_EXEC= $(INSTALL) -m 0755
++INSTALL_DATA= $(INSTALL) -m 0644
+ 
+ # Utilities.
+ CP= cp
+@@ -127,3 +127,21 @@
+ .PHONY: all $(PLATS) clean test 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_test: gentoo_linux
++      src/lua-$(V) test/hello.lua
++
++gentoo_install:
++      mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN)
++      cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua-$(V) luac-$(V) $(INSTALL_BIN)
++      cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
++      cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
+--- /home/mabi/gentoo/lua-5.1.1.orig/src/Makefile      2006-03-22 01:41:49.000000000 +0100
++++ ./src/Makefile     2006-11-16 02:10:27.000000000 +0100
+@@ -176,3 +176,32 @@
+   ltm.h lzio.h lmem.h lopcodes.h lundump.h
+ 
+ # (end of Makefile)
++
++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.  While we are at it, our desired version
++# suffixes are added to the targets, preventing conflicts with rules in
++# the upstream makefile.
++
++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_NAME:.la=.a): $(LIB_OBJS)
++      $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
++            -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
++
++lua-$(V): $(LUA_O) $(LIB_NAME)
++      $(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
++
++luac-$(V): $(LUAC_O) $(LIB_NAME)
++      $(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME)
++
++gentoo_clean:
++      $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua-$(V) luac-$(V)
++
++gentoo_all: $(LIB_NAME) lua-$(V) luac-$(V)

diff --git a/dev-lang/lua/files/lua-5.1.1-module_paths.patch b/dev-lang/lua/files/lua-5.1.1-module_paths.patch
new file mode 100644 (file)
index 0000000..29ac4c3
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.1.1-module_paths.patch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## src_luaconf.h.dpatch by John V. Belmonte <jbelmonte@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Set Lua's default PATH and CPATH.
+
+@DPATCH@
+diff -urNad trunk~/src/luaconf.h trunk/src/luaconf.h
+--- trunk~/src/luaconf.h       2006-02-10 12:44:06.000000000 -0500
++++ trunk/src/luaconf.h        2006-02-17 21:32:55.000000000 -0500
+@@ -83,13 +83,17 @@
+ 
+ #else
+ #define LUA_ROOT      "/usr/local/"
++#define LUA_ROOT2     "/usr/"
+ #define LUA_LDIR      LUA_ROOT "share/lua/5.1/"
++#define LUA_LDIR2     LUA_ROOT2 "share/lua/5.1/"
+ #define LUA_CDIR      LUA_ROOT "lib/lua/5.1/"
++#define LUA_CDIR2     LUA_ROOT2 "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \
+               "./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+-                          LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
++                          LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
++                          LUA_LDIR2"?.lua;"  LUA_LDIR2"?/init.lua"
+ #define LUA_CPATH_DEFAULT \
+-      "./?.so;"  LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
++      "./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"
+ #endif
+ 
+ 

diff --git a/dev-lang/lua/files/lua-5.1.1-readline.patch b/dev-lang/lua/files/lua-5.1.1-readline.patch
new file mode 100644 (file)
index 0000000..f144861
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.1.1-readline.patch
@@ -0,0 +1,10 @@
+--- lua-5.1.1.orig/src/luaconf.h       2006-04-10 20:27:23.000000000 +0200
++++ lua-5.1.1/src/luaconf.h    2006-11-15 14:53:07.000000000 +0100
+@@ -36,7 +36,6 @@
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN                /* needs an extra library: -ldl */
+-#define LUA_USE_READLINE      /* needs some extra libraries */
+ #endif
+ 
+ #if defined(LUA_USE_MACOSX)

diff --git a/dev-lang/lua/lua-5.1.1.ebuild b/dev-lang/lua/lua-5.1.1.ebuild
new file mode 100644 (file)
index 0000000..2d96058
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1.ebuild,v 1.1 2006/11/17 21:23:12 mabi Exp $
+
+inherit eutils portability
+
+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="~ppc"
+IUSE="readline"
+
+RDEPEND="readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-make.patch
+       epatch "${FILESDIR}"/${P}-module_paths.patch
+
+       sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
+
+       if ! use readline ; then
+               epatch "${FILESDIR}"/${P}-readline.patch
+       fi
+}
+
+src_compile() {
+       myflags=
+       # what to link to liblua
+       liblibs="-lm"
+       if use ppc-macos; then
+               mycflags="${mycflags} -DLUA_USE_MACOSX"
+       else # building for standard linux (and bsd too)
+               mycflags="${mycflags} -DLUA_USE_LINUX"
+               liblibs="${liblibs} -ldl"
+       fi
+
+       # what to link to the executables
+       mylibs=
+       if use readline; then
+               mylibs="-lreadline"
+       fi
+
+       cd src
+       emake CFLAGS="${mycflags} ${CFLAGS}" \
+                       RPATH="/usr/$(get_libdir)/" \
+                       LUA_LIBS="${mylibs}" \
+                       LIB_LIBS="${liblibs}" \
+                       V=${PV} \
+                       gentoo_all || die "emake failed"
+}
+
+src_install() {
+       emake INSTALL_TOP="${D}/usr/" V=${PV} gentoo_install \
+       || die "emake install gentoo_install failed"
+
+       dodoc HISTORY README
+       dohtml doc/*.html doc/*.gif
+
+       insinto /usr/share/pixmaps
+       doins etc/lua.ico
+       insinto /usr/$(get_libdir)/pkgconfig
+       doins etc/lua.pc
+}
+
+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
+               src/${P} test/${test}.lua &> /dev/null || die "test $test failed"
+       done
+
+       for test in ${negative}; do
+               src/${P} test/${test}.lua &> /dev/null && die "test $test failed"
+       done
+}