Fix libdir path for CMOD in pkgconfig file (bug #294368).

Package-Manager: portage-2.2_rc51/cvs/Linux i686

3 files changed, 125 insertions, 12 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 0278ecadb82d..a4bcf21b4dae 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/lua
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.135 2009/09/29 08:04:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.136 2009/11/24 17:31:36 jer Exp $
+
+*lua-5.1.4-r3 (24 Nov 2009)
+
+  24 Nov 2009; Jeroen Roovers <jer@gentoo.org> +lua-5.1.4-r3.ebuild:
+  Fix libdir path for CMOD in pkgconfig file (bug #294368).
 
   29 Sep 2009; Ulrich Mueller <ulm@gentoo.org> lua-5.1.4-r2.ebuild:
   Depend on app-emacs/lua-mode with USE=emacs, fixes bug 263249. Explicitly
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 837e7e4d65b0..9c30fdb8dd07 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch 685 RMD160 5e82432ff598210a1c3bbda5d60c46622fe4254c SHA1 7c40bb5f0aa73f93d4e58ec061fd9b41df63b6f9 SHA256 e99f4e7c481d4ab3b6773f7255e55da3fb6e37f0da51f00db93dd0cd8d10e47a
 AUX 5.1.3/02_all_coroutine.resume.upstream.patch 531 RMD160 1acef8e4257bf1cb96844fc210d3cd9ffab03fd6 SHA1 f70429a1b517c3f9b132b428abacf51a2a02d9e4 SHA256 ede1d6684c29b5710881def9c4edb429434321085c0478db7a1e5faaf4054c5c
 AUX 5.1.3/03_all_lua_checkstack.upstream.patch 668 RMD160 b22b556f656cdd20743821d59f73b0e0f2f42167 SHA1 a13e42918f25f3c595a41a1eac6716e943fad00c SHA256 89c8aa6e4e65f1c7dfd2be7992ce9d6df27ead7dc661bddf94d3049b8bf714df
@@ -26,13 +23,7 @@ AUX lua-5.1.4-test.patch 340 RMD160 5ab1fdfaf1c18d26c66096ade8944223c21ce9ca SHA
 DIST lua-5.1.4.tar.gz 216679 RMD160 c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef SHA1 2b11c8e60306efb7f0734b747588f57995493db7 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
 EBUILD lua-5.1.4-r1.ebuild 3012 RMD160 e1c82ed3d00d328d252d69e3f8cd2cf87be4deba SHA1 e7a456257f6d8da43cc9df3add3b7cf43558d9db SHA256 e8459fb17fa2dace1e7e06ee730638615e25f952bb7f106ac9605502df5596d5
 EBUILD lua-5.1.4-r2.ebuild 3075 RMD160 189a712c32fd3b0f69317dc0228ceaa570f48282 SHA1 a2627e7ae9e801940180d462afd4692ae7740c89 SHA256 df3b33b7b787399fcc038e07d5c007720e1c66744f97c3b7a45eec164575f89c
+EBUILD lua-5.1.4-r3.ebuild 3130 RMD160 c666caa144581f6998eb1db440352c655617635a SHA1 8213f0675c61a2feb84e5d27f372cd490c7f945f SHA256 5bc42367d96709851459856f34a4498110bae768ee7572104f98b07f43254152
 EBUILD lua-5.1.4.ebuild 2994 RMD160 637f425e9ec4034ede44dee36061693f006bee48 SHA1 f1406a740a642647a106f77f22ffa5a4aec45b93 SHA256 d44847b8f322ef735ce8786cba2af466110e30154583a5479bd6029cc9b119bd
-MISC ChangeLog 20178 RMD160 0f00af323029176262013c659381a9ecba967138 SHA1 7cee21cb8014303d6bb0832090d48409e65c17fe SHA256 692f85a8a07d688e0a82db37976a282faba21fce02ce6c7a4337a15f7ca51163
+MISC ChangeLog 20337 RMD160 d3dbb88a469619c0949208585993640803aeccb4 SHA1 c25744a9ce1e0e03c1397d10fab148f591ffe632 SHA256 9bdfb444a96a567bdb0f6f92bbb238af837dc972636f5f7715a985f9ae369567
 MISC metadata.xml 339 RMD160 0d536a77658ffb6d8bccff7183a5bf4722d0a82d SHA1 f5bd1085f69b6e9d81e42cd711a7846ccb267e31 SHA256 6b3bedf093395def984b71f7c74ce59742c5df6592ad50f1b96c8a2499f27c8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEARECAAYFAkrBwA4ACgkQOeoy/oIi7uyicQCfXlmKB6Q5R9qIIeqKBu6kInFk
-KA4AoMvWLRJLNFZcZirt90GSyvvepUDp
-=D1sS
------END PGP SIGNATURE-----
diff --git a/dev-lang/lua/lua-5.1.4-r3.ebuild b/dev-lang/lua/lua-5.1.4-r3.ebuild
new file mode 100644
index 000000000000..5f72f0d1aa86
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.4-r3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r3.ebuild,v 1.1 2009/11/24 17:31:36 jer Exp $
+
+EAPI="1"
+
+inherit eutils 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"
+
+DEPEND="readline? ( sys-libs/readline )"
+RDEPEND="${DEPEND}"
+PDEPEND="emacs? ( app-emacs/lua-mode )"
+
+src_unpack() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
+
+	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:4:1/' src/Makefile
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
+
+	if ! use deprecated ; then
+		epatch "${FILESDIR}"/${P}-deprecated.patch
+		epatch "${FILESDIR}"/${P}-test.patch
+	fi
+
+	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
+	# Not 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
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
+	fi
+
+	# We want packages to find our things...
+	sed -i \
+		-e 's:/usr/local:/usr:' \
+		-e "s:lib/lua:$(get_libdir)/lua:" \
+		etc/lua.pc
+}
+
+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
+	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
+			RPATH="${ROOT}/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
+
+	doman doc/lua.1 doc/luac.1
+}
+
+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 || die "test $test failed"
+	done
+
+	for test in ${negative}; do
+		test/lua.static test/${test}.lua && die "test $test failed"
+	done
+}