revbump, remove older versions

Package-Manager: portage-2.1.4.1

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index e55dc3a8f41f11e7a449249864422cabbf77bdfb..948197e3a8ec57bc4989ccd1b15656582e2b6dba 100644 (file)
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/lua
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.85 2007/09/18 08:14:28 mabi Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.86 2008/02/12 21:21:25 mabi Exp $
+
+*lua-5.1.3 (11 Feb 2008)
+
+  11 Feb 2008; Matti Bickel <mabi@gentoo.org> files/lua-5.1-make.patch,
+  lua-5.1.1-r2.ebuild, -lua-5.1.2.ebuild, -lua-5.1.2-r1.ebuild,
+  lua-5.1.2-r2.ebuild, +lua-5.1.3.ebuild:
+  version bump, reduced make patch due to upstream now shipping a more
+  friendly Makefile
 
 *lua-5.1.2-r2 (18 Sep 2007)
 

diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 5b1d4ac5b57325adc8408835a00194faaccf8726..4784974db06f82a3578de06a346d1355977eff46 100644 (file)
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lua-5.0.2-LDFLAGS_and_as-needed.patch 1837 RMD160 2dd54660c8646e9eaf206c96bad9adee326fb567 SHA1 f9f50ab6df8cd946daa8c108a3a48168b2c75f65 SHA256 3bf1a4ef14e02ca8203b3d4eaeab44e2455ec8f186f58f1e5674ab5d9a28689c
 AUX lua-5.0.2-pic.patch 1243 RMD160 f1629c59e406eab1552dbd0de40cc31da0e0ee11 SHA1 a06f73ef06b214eee46326dd7144040d3401c682 SHA256 fd4a528d3fd03a22b7c4108bb3fc7fa916810cad381c2e30e67e14348fe6ee55
 AUX lua-5.0.3-asneeded.patch 594 RMD160 4cfd0913ed09ebde7356433cf306eac22a577c54 SHA1 610772adc425aeb7d2dbc87dcce5dab2c577118d SHA256 afcbdca2d5f21388a1749c6d516dcd2c3143ddc653e63d7942246ed33d115e1d
@@ -5,7 +8,7 @@ AUX lua-5.0.3-destdir.patch 1144 RMD160 0a2a0364759adfc62e17531fb93ecb96461b7c50
 AUX lua-5.0.3-dylib.patch 1490 RMD160 11dfa7c178b42c37e02e99b4000ed85a4a3e7399 SHA1 301189886af03b8a5a8947da3888f0fbc379845c SHA256 55be4c1e58d0a64ef726079a48d5a954ff460c775fff0726c862a23709c86ad9
 AUX lua-5.0.3-ldflags.patch 1523 RMD160 4b037fc07f3fc27f732c5cb794a3aef43272e503 SHA1 cb97fb75f3542eb9effaf7ee88ae5b0f4f39238f SHA256 92a820bf4e7a81400d633239a8d7a6e01ae94fb3772e4dd2b8efe015e4a4a7ee
 AUX lua-5.0.3-shared.patch 1360 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987 SHA1 5f69753849acac4df7839ff6efb68002c0a8ef84 SHA256 c9ba1d3258ded3da1ca48210faf67b699ee80b115fec5fb4e9319cf7755dfc55
-AUX lua-5.1-make.patch 2596 RMD160 2d905d74c96f83acd5c27e884942a5068ff1b655 SHA1 ac2ad37086676a0dee9d231dfe1af6787973b3ed SHA256 5413decb6d74e5803c2e9b80c32b8add5559d05ba4da9b0d60f1a6e221df3125
+AUX lua-5.1-make.patch 2169 RMD160 9a374e7640e100ce9270d33e9a73a9af3cfb354a SHA1 a2912a2937e5cc61d33838fff4535e11571d88eb SHA256 887e57904d3e73064f791a19cfbc0e40a4e17dcb440d2dc3fba2ad9b65c6589b
 AUX lua-5.1-make_static.patch 552 RMD160 1ca1c74daee2845369f13a80773755301b1d5184 SHA1 2d49989dbfd730edafac1444fd09a824a8f649b5 SHA256 dac0400c15e5ad9b77ade7e981acde3c111b51e834427280e9fdcdbbcef05812
 AUX lua-5.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e SHA1 50cb1438b7c50536ebf712d16d153eac40599562 SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7
 AUX lua-5.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 SHA1 25baabcb1d3449c3c38726fc7de6c4abb34667a6 SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2
@@ -14,11 +17,18 @@ DIST lua-5.0.2.tar.gz 190442 RMD160 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30 SHA
 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
 DIST lua-5.1.2.tar.gz 214134 RMD160 01350549b3a05838925dae1a666700bb9f1bc01a SHA1 8a460d2d7e70e93cb72bf3d584405464763cb5f0 SHA256 5cf098c6fe68d3d2d9221904f1017ff0286e4a9cc166a1452a456df9b88b3d9e
+DIST lua-5.1.3.tar.gz 215817 RMD160 1c5979dd4986057fef325aa2af0c872bbecab92e SHA1 89bc9f5a351402565b8077e8123327e7cd15f004 SHA256 6b5df2edaa5e02bf1a2d85e1442b2e329493b30b0c0780f77199d24f087d296d
 EBUILD lua-5.0.2.ebuild 2151 RMD160 e3bd69434ca49168d0fd965aac2437d183a9296e SHA1 5cff7b1d83eb760761148d0f807ba1263d6f563c SHA256 3198ed57c4bf12d6ba2ddabd90ed6723b4b74c7605cab42e75eb91717c003f1e
 EBUILD lua-5.0.3.ebuild 2816 RMD160 2cd7daac5e5d380cff959aeec45b72cea7f3026a SHA1 9a5a7f9365ee917ac8138f9625405537219f816b SHA256 c6fe66bf83134c5ac1b135f400ab473f6194d79cfa52b64a3bcdec1d3b598f3a
-EBUILD lua-5.1.1-r2.ebuild 2555 RMD160 fd26722662a77161d66674fe286a085564aafd11 SHA1 2150aa5b6ed72812b6461fe4f15390ba495a7edc SHA256 6b6d03f58f0c06762511b847fa5732c1fcde8a712c2c4890822e36727a002180
-EBUILD lua-5.1.2-r1.ebuild 2661 RMD160 a3aedd3da10bf038e1c82ce6dcaf0bcf4f27443c SHA1 870e98c314723b1ae3358ec2c66eb280b1959691 SHA256 0508b7c466a5f672ff49db39eebb2207fb1b4362a596b6676098bc4214d3232a
-EBUILD lua-5.1.2-r2.ebuild 2690 RMD160 81193a5409de815f29a4d79f3359c89f9c365b04 SHA1 cb9bcd3e024f2563051c8af844a56b4dbed55e58 SHA256 a1662c629f4e03754b3deb49a6383ae722e28592468923cd90bf7577291e8bd8
-EBUILD lua-5.1.2.ebuild 2556 RMD160 29856104af14178802696b2346e6c9c605b5c0d8 SHA1 057a56edd32b530e9be70b9ecb35e315d02b1376 SHA256 1cec7fb52c9c85c9200ad2bf85048f5b2dc71539b4bac24787f97f19fe3d7795
-MISC ChangeLog 11831 RMD160 6ae5daea912685f54ff466c93c483bf758263c23 SHA1 405d4b62d5a5c01bdd01d59509fc4c7fff11f2cb SHA256 63b0adf4ec5aeef5b3b34df5c12eb644dd1d4cdd2867fd5c6b5fcde6ee4e9a68
+EBUILD lua-5.1.1-r2.ebuild 2710 RMD160 7bbb61441726d96daef4137a756c9b03464a16ae SHA1 47c1f20bad74033c278e1e7573354fe0940526e4 SHA256 9aa83b2dc6c1c7e881868820496deeef4e130190c23a61479d26e38e85ffdb39
+EBUILD lua-5.1.2-r2.ebuild 2845 RMD160 5e1a7c38b5b6670a07599294f100663c5dd21f95 SHA1 2807efa26d9e9b00e8b7ae142609d9fd4b16d804 SHA256 3e064c58dfe2b6f64d9e0f0d8ba1df7c06e41a39a8161db60fbe0e801f26c25a
+EBUILD lua-5.1.3.ebuild 2806 RMD160 2efedb2501ac25a9ba78b8f50e62d2e1ab5f762f SHA1 bee0ad17792e3ffcecec5f97582cf0077ae175be SHA256 876602209866c5ce1d5c6355c202be5a23e85e502a32ec6644a7f2cc8e3120e0
+MISC ChangeLog 12127 RMD160 86c4dee7a644ea3d08f006fb217313aeddf5b368 SHA1 2d87988dc0e4da694b52e3fc29d82d48ba685466 SHA256 da9d3639a83bd6151249c006a5a3787cb265f942cd82bf08854d69c7592b8f4f
 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsg3lfNMcoUhJ7GwRAtb0AJwIJ2r+E3I/wPjds4VUM9Dch8yfQwCgoRYv
+V1YSRJZ26eV69fSBfX2+oi8=
+=Vvbg
+-----END PGP SIGNATURE-----

diff --git a/dev-lang/lua/files/lua-5.1-make.patch b/dev-lang/lua/files/lua-5.1-make.patch
index fb95d253422d3e7884306ae63e7b0de3cd7b4370..654d593d634eab942b1329c7fb6956bc8576059e 100644 (file)
--- a/dev-lang/lua/files/lua-5.1-make.patch
+++ b/dev-lang/lua/files/lua-5.1-make.patch
@@ -1,20 +1,5 @@
 --- 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
-@@ -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,22 @@
  .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho newer
  

diff --git a/dev-lang/lua/lua-5.1.1-r2.ebuild b/dev-lang/lua/lua-5.1.1-r2.ebuild
index fe461ba1e876abf858f23f2f19dca1e153d5b076..b2864b5821ec94b5020409303fd975f0862ba2e9 100644 (file)
--- a/dev-lang/lua/lua-5.1.1-r2.ebuild
+++ b/dev-lang/lua/lua-5.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r2.ebuild,v 1.16 2008/01/29 21:24:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1-r2.ebuild,v 1.17 2008/02/12 21:21:25 mabi Exp $
 
 inherit eutils portability versionator
 
@@ -23,6 +23,10 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
        epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
 
+       # extra patching not required in lua-5.1.3
+       sed -i -e 's:\(INSTALL_.*\= \$(CP)\):#\1:g' Makefile
+       sed -i -e 's:#\(INSTALL_.*\= \$(INSTALL)\):\1:g' Makefile
+
        sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
 
        if ! use readline ; then

diff --git a/dev-lang/lua/lua-5.1.2-r2.ebuild b/dev-lang/lua/lua-5.1.2-r2.ebuild
index 006b81713c02564a98586f506d76db598b1db68c..70e5923eb9c9a5270c38eea5e18558e017245593 100644 (file)
--- a/dev-lang/lua/lua-5.1.2-r2.ebuild
+++ b/dev-lang/lua/lua-5.1.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2-r2.ebuild,v 1.2 2008/01/29 21:24:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2-r2.ebuild,v 1.3 2008/02/12 21:21:25 mabi Exp $
 
 inherit eutils portability versionator
 
@@ -23,6 +23,10 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
        epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
 
+       # extra patching not required in lua-5.1.3
+       sed -i -e 's:\(INSTALL_.*\= \$(CP)\):#\1:g' Makefile
+       sed -i -e 's:#\(INSTALL_.*\= \$(INSTALL)\):\1:g' Makefile
+
        # correct lua versioning (bug #173611)
        sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:2:1/' src/Makefile
 

diff --git a/dev-lang/lua/lua-5.1.2.ebuild b/dev-lang/lua/lua-5.1.2.ebuild
deleted file mode 100644 (file)
index d444564..0000000
--- a/dev-lang/lua/lua-5.1.2.ebuild
+++ /dev/null
@@ -1,96 +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.1.2.ebuild,v 1.3 2008/01/29 21:24:44 grobian Exp $
-
-inherit eutils portability 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="readline static"
-
-DEPEND="readline? ( sys-libs/readline )"
-
-src_unpack() {
-       local PATCH_PV=$(get_version_component_range 1-2)
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
-       epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
-
-       sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
-       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
-       # Note that the lua compiler is build statically anyway
-       if use static ; then
-               epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static.patch
-       fi
-
-       # We want packages to find our things...
-       sed -i -e 's:/usr/local:/usr:' etc/lua.pc
-}
-
-src_compile() {
-       myflags=
-       # what to link to liblua
-       liblibs="-lm"
-       mycflags="${mycflags} -DLUA_USE_LINUX"
-       liblibs="${liblibs} $(dlopen_lib)"
-
-       # 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"
-
-       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
-
-       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
-               test/lua.static test/${test}.lua &> /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
-}

diff --git a/dev-lang/lua/lua-5.1.2-r1.ebuild b/dev-lang/lua/lua-5.1.3.ebuild
similarity index 86%
rename from dev-lang/lua/lua-5.1.2-r1.ebuild
rename to dev-lang/lua/lua-5.1.3.ebuild
index 6247177105caf3a889afec4fa719654e0d8a12d6..0eb73a9c5be7049bee9779ac8b50be751fa22697 100644 (file)
--- a/dev-lang/lua/lua-5.1.2-r1.ebuild
+++ b/dev-lang/lua/lua-5.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2-r1.ebuild,v 1.3 2008/01/29 21:24:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.3.ebuild,v 1.1 2008/02/12 21:21:25 mabi Exp $
 
 inherit eutils portability versionator
 
@@ -48,8 +48,12 @@ src_compile() {
        myflags=
        # what to link to liblua
        liblibs="-lm"
-       mycflags="${mycflags} -DLUA_USE_LINUX"
-       liblibs="${liblibs} $(dlopen_lib)"
+       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} $(dlopen_lib)"
+       fi
 
        # what to link to the executables
        mylibs=
@@ -80,6 +84,8 @@ src_install() {
        doins etc/lua.ico
        insinto /usr/$(get_libdir)/pkgconfig
        doins etc/lua.pc
+
+       doman doc/lua.1 doc/luac.1
 }
 
 src_test() {