From 8829daf400bce66862162b71051497f903930012 Mon Sep 17 00:00:00 2001 From: Matti Bickel Date: Mon, 22 Jan 2007 21:40:12 +0000 Subject: [PATCH] Slotted lua officially dead Package-Manager: portage-2.1.1-r2 --- dev-lang/lua/Manifest | 32 +---- dev-lang/lua/files/digest-lua-5.0.3-r1 | 3 - dev-lang/lua/files/digest-lua-5.1.1-r1 | 3 - dev-lang/lua/files/lua-5.1.1-Makefile.patch | 138 -------------------- dev-lang/lua/lua-5.0.3-r1.ebuild | 129 ------------------ dev-lang/lua/lua-5.1.1-r1.ebuild | 106 --------------- 6 files changed, 7 insertions(+), 404 deletions(-) delete mode 100644 dev-lang/lua/files/digest-lua-5.0.3-r1 delete mode 100644 dev-lang/lua/files/digest-lua-5.1.1-r1 delete mode 100644 dev-lang/lua/files/lua-5.1.1-Makefile.patch delete mode 100644 dev-lang/lua/lua-5.0.3-r1.ebuild delete mode 100644 dev-lang/lua/lua-5.1.1-r1.ebuild diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index c5ca933c527f..62f78ce269c2 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -29,10 +29,6 @@ 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-Makefile.patch 4006 RMD160 48299fb4640d6acf25a18e638be7cd90268413fd SHA1 9f2561137fabd33b13b749b199dab75bae9b2ec0 SHA256 c1387e5c3b143a5becac70c9665d064b3a2e9cb2e335f5900fff06c86c72e6f1 -MD5 9664dd00060e4542292519980ce86092 files/lua-5.1.1-Makefile.patch 4006 -RMD160 48299fb4640d6acf25a18e638be7cd90268413fd files/lua-5.1.1-Makefile.patch 4006 -SHA256 c1387e5c3b143a5becac70c9665d064b3a2e9cb2e335f5900fff06c86c72e6f1 files/lua-5.1.1-Makefile.patch 4006 AUX lua-5.1.1-make.patch 2596 RMD160 a76d78441089a3a439fab70597d08f6c93f8aa34 SHA1 1c8348018b6e1a46ef978771ac8884ca854d5698 SHA256 1f52d1247957bb63c7cc7d0a0b830c7cce93078d53953365ffb72d333d62fbcb MD5 286c8ec6928d114016308c26691dc650 files/lua-5.1.1-make.patch 2596 RMD160 a76d78441089a3a439fab70597d08f6c93f8aa34 files/lua-5.1.1-make.patch 2596 @@ -60,26 +56,18 @@ EBUILD lua-5.0.2.ebuild 3024 RMD160 74d25ca38c448f0c2ab57c2802bd061b35138600 SHA MD5 4e504ff97c115c2cb1167f1b5aa3de42 lua-5.0.2.ebuild 3024 RMD160 74d25ca38c448f0c2ab57c2802bd061b35138600 lua-5.0.2.ebuild 3024 SHA256 3bb9270c305b3d2b1b50bb69a22599fededff9f4c837bd4d5d92b555d31a5086 lua-5.0.2.ebuild 3024 -EBUILD lua-5.0.3-r1.ebuild 3615 RMD160 6125ce16470349ba39cedfcb7d58c5da2a71b8b9 SHA1 bd5a90f2b693e7ab30f84f64249fb0c7c8bb6561 SHA256 e58a310c11b534e01cfbb09088027c98e769e280c0d1c752cf2b7d53f2f273b6 -MD5 f1e3efcec71b9d074545ac58d4853ad6 lua-5.0.3-r1.ebuild 3615 -RMD160 6125ce16470349ba39cedfcb7d58c5da2a71b8b9 lua-5.0.3-r1.ebuild 3615 -SHA256 e58a310c11b534e01cfbb09088027c98e769e280c0d1c752cf2b7d53f2f273b6 lua-5.0.3-r1.ebuild 3615 EBUILD lua-5.0.3.ebuild 3091 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef SHA1 a26ff9fb4871e80b9fb6b96790843fa09ea7f52c SHA256 5e5232053c6de487ba7a6103f51111f0339a6aa79838988090256548f6b7f069 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-r1.ebuild 2769 RMD160 deaf651025e90c9a6dee4c8e87e0d462c9ebd0f7 SHA1 a11af2b8fd12475d42c629f6aee52ed58d20a52e SHA256 e1d1721383acc76d987110ec70584a2b67407dda34acb92656a652ad9a5884bd -MD5 fe0377d1d3a9b02555c9038652d4d199 lua-5.1.1-r1.ebuild 2769 -RMD160 deaf651025e90c9a6dee4c8e87e0d462c9ebd0f7 lua-5.1.1-r1.ebuild 2769 -SHA256 e1d1721383acc76d987110ec70584a2b67407dda34acb92656a652ad9a5884bd lua-5.1.1-r1.ebuild 2769 EBUILD lua-5.1.1.ebuild 2409 RMD160 6bf631b9855b07bf15b784898be2b495e328ebb5 SHA1 183e2e5b2dcb0a13f9668494176ad350b47c7e86 SHA256 6d434295cd59062f307ddb428e4ef69cf530d568a5e28f3475e1ff5cf3be321d MD5 d1a0b67ec27adc9a4850cf611e2ea1d1 lua-5.1.1.ebuild 2409 RMD160 6bf631b9855b07bf15b784898be2b495e328ebb5 lua-5.1.1.ebuild 2409 SHA256 6d434295cd59062f307ddb428e4ef69cf530d568a5e28f3475e1ff5cf3be321d lua-5.1.1.ebuild 2409 -MISC ChangeLog 8920 RMD160 090427be7ce4a6b7bb248ce8bb2344e522971170 SHA1 fa029d0507215ee328feec664cbf9491c0c8f54c SHA256 05621d1bdfb18fc8e8a9cdb5929907a4012fbd3a3e05951afdeca063a7744f8b -MD5 63629d17575f33f94e1229e4da825d11 ChangeLog 8920 -RMD160 090427be7ce4a6b7bb248ce8bb2344e522971170 ChangeLog 8920 -SHA256 05621d1bdfb18fc8e8a9cdb5929907a4012fbd3a3e05951afdeca063a7744f8b ChangeLog 8920 +MISC ChangeLog 9078 RMD160 9eeef9d2335e3cf5cee8e8bbeeb08177a8a52bcf SHA1 9fe6b1dae6784cd21624003324dacec2d91aa5dc SHA256 65234819c314025dd6fab5fc8b96082106fc5b4b06f99f4ee37461f00acbb8f9 +MD5 6e67a9bb65160367e0ff615fdc805d24 ChangeLog 9078 +RMD160 9eeef9d2335e3cf5cee8e8bbeeb08177a8a52bcf ChangeLog 9078 +SHA256 65234819c314025dd6fab5fc8b96082106fc5b4b06f99f4ee37461f00acbb8f9 ChangeLog 9078 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531 MD5 ae5edc540c3c3ae7307d2ac4c0e16773 metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 metadata.xml 246 @@ -90,19 +78,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 23154e6d41fb3e070a7c9390e991e13c files/digest-lua-5.0.3-r1 229 -RMD160 13f30c4580ef37b67160942adc5497820c09d556 files/digest-lua-5.0.3-r1 229 -SHA256 4a4b5a506f9226dc2e8bb8d52129a6c4b66f27b7d9d0a91c81b0379605c34d0f files/digest-lua-5.0.3-r1 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 -MD5 541613cc1c7f33c6ab0e8858d2812bc2 files/digest-lua-5.1.1-r1 229 -RMD160 8dbfca4720b6ff909dc6f2fa3496373083970771 files/digest-lua-5.1.1-r1 229 -SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/digest-lua-5.1.1-r1 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFrQtsfNMcoUhJ7GwRAqZsAJ94it0NP56SLelyYkSH2NY3BGgUYgCeI8Py -xYBqK9CcrwaaY58F7WwuKWo= -=zJ8A +iD8DBQFFtS8kfNMcoUhJ7GwRArxjAJ9jEJGgJQcgBpuMYN0FKrS0zDcUxACeIaXv +fjIdAG2CgSym8QEyFwigmo8= +=oIxY -----END PGP SIGNATURE----- diff --git a/dev-lang/lua/files/digest-lua-5.0.3-r1 b/dev-lang/lua/files/digest-lua-5.0.3-r1 deleted file mode 100644 index b3c83fe64eaa..000000000000 --- a/dev-lang/lua/files/digest-lua-5.0.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 feee27132056de2949ce499b0ef4c480 lua-5.0.3.tar.gz 191384 -RMD160 cb3ed4320b438d73c8ff6c93a02275c9fb461883 lua-5.0.3.tar.gz 191384 -SHA256 1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671 lua-5.0.3.tar.gz 191384 diff --git a/dev-lang/lua/files/digest-lua-5.1.1-r1 b/dev-lang/lua/files/digest-lua-5.1.1-r1 deleted file mode 100644 index 5a0845c161bb..000000000000 --- a/dev-lang/lua/files/digest-lua-5.1.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -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-Makefile.patch b/dev-lang/lua/files/lua-5.1.1-Makefile.patch deleted file mode 100644 index dd509962c076..000000000000 --- a/dev-lang/lua/files/lua-5.1.1-Makefile.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- Makefile.orig 2006-06-02 12:53:38.000000000 +0200 -+++ Makefile 2007-01-13 00:03:46.000000000 +0100 -@@ -7,25 +7,29 @@ - # Your platform. See PLATS for possible values. - PLAT= none - -+# Lua version and release. -+V= 5.1 -+R= 5.1.1 -+ - # Where to install. The installation starts in the src directory, so take care - # if INSTALL_TOP is not an absolute path. (Man pages are installed from the - # doc directory.) - # - INSTALL_TOP= /usr/local - INSTALL_BIN= $(INSTALL_TOP)/bin --INSTALL_INC= $(INSTALL_TOP)/include -+INSTALL_INC= $(INSTALL_TOP)/include/lua-$V - INSTALL_LIB= $(INSTALL_TOP)/lib --INSTALL_MAN= $(INSTALL_TOP)/man/man1 -+INSTALL_MAN= $(INSTALL_TOP)/share/man/man1 - INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V - INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V - - # 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 -@@ -40,22 +44,18 @@ - PLATS= aix ansi bsd generic linux macosx mingw posix solaris - - # What to install. --TO_BIN= lua luac -+TO_BIN= lua-$V luac-$V - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp --TO_LIB= liblua.a -+TO_LIB= liblua-$V.a - TO_MAN= lua.1 luac.1 - --# Lua version and release. --V= 5.1 --R= 5.1.1 -- - all: $(PLAT) - - $(PLATS) clean: - cd src && $(MAKE) $@ - - test: dummy -- src/lua test/hello.lua -+ src/lua-$V test/hello.lua - - install: dummy - cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) -@@ -127,3 +127,22 @@ - .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 -+ test/lua.static test/hello.lua -+ -+gentoo_install: -+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) $(TO_LIB:%.a=%.la) $(INSTALL_LIB) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) -+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) ---- src/Makefile.orig 2006-03-22 01:41:49.000000000 +0100 -+++ src/Makefile 2007-01-12 23:40:15.000000000 +0100 -@@ -29,10 +29,10 @@ - LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ - lstrlib.o loadlib.o linit.o - --LUA_T= lua -+LUA_T= lua-$V - LUA_O= lua.o - --LUAC_T= luac -+LUAC_T= luac-$V - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) -@@ -176,3 +176,35 @@ - ltm.h lzio.h lmem.h lopcodes.h lundump.h - - # (end of Makefile) -+ -+export LIBTOOL = libtool --quiet --tag=CC -+ -+# The following rules use libtool for compiling and linking in order to -+# provide shared library support. -+ -+LIB_NAME = liblua-$V.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) \ -+ -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) -+ -+$(LIB_NAME:.la=.a): $(LIB_OBJS) -+ $(LIBTOOL) --mode=link $(CC) -static -o $(LIB_NAME:.la=.a) $(LIB_OBJS) -+ -+$(LUA_T): $(LUA_O) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua-$V -+ -+lua_test: $(LUA_O) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS) -+ -+$(LUAC_T): $(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_T) $(LUAC_T) -+ -+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T) diff --git a/dev-lang/lua/lua-5.0.3-r1.ebuild b/dev-lang/lua/lua-5.0.3-r1.ebuild deleted file mode 100644 index db6a9f5a0a4b..000000000000 --- a/dev-lang/lua/lua-5.0.3-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.3-r1.ebuild,v 1.2 2007/01/14 23:14:21 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="1" -KEYWORDS="~ppc ~ppc64 ~x86" -IUSE="readline" - -RDEPEND="readline? ( sys-libs/readline ) - dev-lang/lua-wrapper - !=dev-lang/lua-5.0.3 - !=dev-lang/lua-5.0.2" -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-destdir.patch - epatch "${FILESDIR}"/${P}-dylib.patch - epatch "${FILESDIR}"/${P}-shared.patch - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-asneeded.patch - - sed -i config \ - -e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \ - -e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \ - -e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \ - -e 's:^\(INSTALL_ROOT= \)/usr/local:\1/usr:' \ - -e 's:^\(INSTALL_INC= $(INSTALL_ROOT)/include\):\1/lua-5.0:' \ - -e "s:^\(INSTALL_LIB= \$(INSTALL_ROOT)/\)lib:\1$(get_libdir):" \ - -e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:' - - sed -i -e 's/^\(install: all\) strip/\1/' Makefile - - # Version the lua binarys/lib - sed -i src/lua/Makefile \ - -e 's:^\(T= $(BIN)/lua\):\1-5.0:' \ - -e 's:llua :llua-5.0 :' \ - -e 's:llualib:llualib-5.0:' - sed -i src/luac/Makefile \ - -e 's:^\(T= $(BIN)/luac\):\1-5.0:' \ - -e 's:llua :llua-5.0 :' \ - -e 's:llualib:llualib-5.0:' - sed -i -e 's:^\(T= $(LIB)/liblua\).a:\1-5.0.a:' src/Makefile - sed -i -e 's:^\(T= $(LIB)/liblualib\).a:\1-5.0.a:' src/lib/Makefile - - [[ ${ELIBC} != *BSD ]] && sed -i -e 's:^#\(DLLIB= -ldl\):\1:' config - - use ppc-macos || sed -i -e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' config - - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html - - if use readline ; then - sed -i config \ - -e "s:^#\(USERCONF=-DLUA_USERCONFIG='\"\$(LUA)/etc/saconfig.c\"' -DUSE_READLINE\):\1:" \ - -e 's:^\(EXTRA_LIBS= -lm\)$:\1 -lreadline:' - fi - - cat >etc/lua-5.0.pc < /dev/null || die "test $test failed" - done - - for test in ${negative}; do - test/lua.static test/${test}.lua &> /dev/null && die "test $test failed" - done -} -- 2.26.2