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

(Portage version: 2.2_rc51/cvs/Linux i686)

2 files changed, 123 insertions, 1 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/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
+}