Fix bug #173611

Package-Manager: portage-2.1.2.3

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 8a6782dc52c3db8f1e35b1ef9c18017ca1617d97..2c76cffe38d3a0d45bc2ab62dd04785295c081aa 100644 (file)
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,11 @@
 # 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.79 2007/04/05 10:17:20 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.80 2007/04/07 11:40:35 mabi Exp $
+
+*lua-5.1.2-r1 (07 Apr 2007)
+
+  07 Apr 2007; Matti Bickel <mabi@gentoo.org> +lua-5.1.2-r1.ebuild:
+  Fix liblua.so naming (bug #173611)
 
 *lua-5.1.2 (05 Apr 2007)
 

diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 41d667c6e0976730cb441ac4c29e91f8e10a73c5..aeaad61cd1a5068559d8686733fa6f094c41d18d 100644 (file)
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -65,14 +65,18 @@ EBUILD lua-5.1.1-r2.ebuild 2646 RMD160 bdc2ed3150727b488a54fdaac7e963da55fc759c
 MD5 b3250b82dcc5cf8963bcc8a10e75cd5c lua-5.1.1-r2.ebuild 2646
 RMD160 bdc2ed3150727b488a54fdaac7e963da55fc759c lua-5.1.1-r2.ebuild 2646
 SHA256 2b1172de1c37ea7206cadf6bb78baebc4e5b293caff439ffeefe568dce20d044 lua-5.1.1-r2.ebuild 2646
+EBUILD lua-5.1.2-r1.ebuild 2765 RMD160 d3a03a655d627dc7b2912d9cfea050f33792194a SHA1 08695e60cab7f599cabeb5d0b365053018ac7d1b SHA256 aab4b7a51021e0b8b5c97c2fef719c01c5aed6c87d8f985c34b152092ddd0327
+MD5 3adc21763f3d4e436a95a2d304f99526 lua-5.1.2-r1.ebuild 2765
+RMD160 d3a03a655d627dc7b2912d9cfea050f33792194a lua-5.1.2-r1.ebuild 2765
+SHA256 aab4b7a51021e0b8b5c97c2fef719c01c5aed6c87d8f985c34b152092ddd0327 lua-5.1.2-r1.ebuild 2765
 EBUILD lua-5.1.2.ebuild 2660 RMD160 ab82b85a2cb81c7839f6dddeb329dafa1d574ae0 SHA1 e13706a741e42099018909f94766d9deb2d89baa SHA256 d2552d7ebde034b1632d2729b74e40a02a359f40205352105d1741609576a75a
 MD5 cb0e79d9191035489ca5385edb98b547 lua-5.1.2.ebuild 2660
 RMD160 ab82b85a2cb81c7839f6dddeb329dafa1d574ae0 lua-5.1.2.ebuild 2660
 SHA256 d2552d7ebde034b1632d2729b74e40a02a359f40205352105d1741609576a75a lua-5.1.2.ebuild 2660
-MISC ChangeLog 11203 RMD160 6e1eb83e2fe84c68a0984d114c8a58baa4b4e10a SHA1 9a520712008c5bdb26a794cc12d0489161729e02 SHA256 53e05758efafc578ba3c4587106a2e49e9cf7843da81113cea4f2bcee2c516cf
-MD5 955c2ce7517707b42fccd1c0139d9e97 ChangeLog 11203
-RMD160 6e1eb83e2fe84c68a0984d114c8a58baa4b4e10a ChangeLog 11203
-SHA256 53e05758efafc578ba3c4587106a2e49e9cf7843da81113cea4f2bcee2c516cf ChangeLog 11203
+MISC ChangeLog 11338 RMD160 89df79fc5cfc6b9ef3d4c145c8e0e2bcd8317f34 SHA1 27ded3077e664bbf76dc6e736f56d6b031fcb0b7 SHA256 e6e9700a0f3b3a036331ec8f2b2e67264ca6639d3d1d3192f01c9bf85aedd9d7
+MD5 606333da1b756117eb70af7b212c2855 ChangeLog 11338
+RMD160 89df79fc5cfc6b9ef3d4c145c8e0e2bcd8317f34 ChangeLog 11338
+SHA256 e6e9700a0f3b3a036331ec8f2b2e67264ca6639d3d1d3192f01c9bf85aedd9d7 ChangeLog 11338
 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531
 MD5 ae5edc540c3c3ae7307d2ac4c0e16773 metadata.xml 246
 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 metadata.xml 246
@@ -89,10 +93,13 @@ SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/di
 MD5 411ef3a8eed2840f03241c25edbc471f files/digest-lua-5.1.2 229
 RMD160 c622458ea1263dc0c6158b7701668fa6bd71ebcf files/digest-lua-5.1.2 229
 SHA256 9c320952dfd8e2f85aad70564711e3dba88b05d32b6f983b5bc14ae05d026ad0 files/digest-lua-5.1.2 229
+MD5 411ef3a8eed2840f03241c25edbc471f files/digest-lua-5.1.2-r1 229
+RMD160 c622458ea1263dc0c6158b7701668fa6bd71ebcf files/digest-lua-5.1.2-r1 229
+SHA256 9c320952dfd8e2f85aad70564711e3dba88b05d32b6f983b5bc14ae05d026ad0 files/digest-lua-5.1.2-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGFMxbfNMcoUhJ7GwRApxvAJ95eoqTud188BUIHhHvNNmxb0sbsQCfaSOd
-aNg51FfGPW3y7VYTmc3WdZ0=
-=+4x4
+iD8DBQFGF4LcfNMcoUhJ7GwRAh2cAJ45mOrXCN4P0RXJuDbzWwDZ/qQs+wCglOcC
+zAF6nn2kd2l0SkOAH34ufvI=
+=/SHB
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/lua/files/digest-lua-5.1.2-r1 b/dev-lang/lua/files/digest-lua-5.1.2-r1
new file mode 100644 (file)
index 0000000..0847c24
--- /dev/null
+++ b/dev-lang/lua/files/digest-lua-5.1.2-r1
@@ -0,0 +1,3 @@
+MD5 687ce4c2a1ddff18f1008490fdc4e5e0 lua-5.1.2.tar.gz 214134
+RMD160 01350549b3a05838925dae1a666700bb9f1bc01a lua-5.1.2.tar.gz 214134
+SHA256 5cf098c6fe68d3d2d9221904f1017ff0286e4a9cc166a1452a456df9b88b3d9e lua-5.1.2.tar.gz 214134

diff --git a/dev-lang/lua/lua-5.1.2-r1.ebuild b/dev-lang/lua/lua-5.1.2-r1.ebuild
new file mode 100644 (file)
index 0000000..515f42d
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.2-r1.ebuild
@@ -0,0 +1,103 @@
+# 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-r1.ebuild,v 1.1 2007/04/07 11:40:35 mabi 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 ~hppa ~ia64 ~ppc ~ppc64 ~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
+
+       # correct lua versioning (bug #173611)
+       sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:2:1/' src/Makefile
+
+       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"
+       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=
+       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
+}