add cxx use flag

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.23-gentoo-r3-20080120 ppc

3 files changed, 128 insertions, 5 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 27cbb3dafb2f..cd197886b0b7 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.119 2008/10/01 15:31:38 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.120 2008/10/10 08:26:34 mabi Exp $
+
+*lua-5.1.4-r1 (09 Oct 2008)
+
+  09 Oct 2008; Matti Bickel <mabi@gentoo.org> +lua-5.1.4-r1.ebuild:
+  add cxx use flag for compilation with g++ (fixes bug #234622)
 
   01 Oct 2008; Matti Bickel <mabi@gentoo.org>
   +files/lua-5.1.4-deprecated.patch, +files/lua-5.1.4-test.patch:
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 613bd63b7c27..becd7b349e2a 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -27,13 +27,14 @@ DIST lua-5.1.4.tar.gz 216679 RMD160 c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef SHA
 EBUILD lua-5.1.1-r2.ebuild 2710 RMD160 7bbb61441726d96daef4137a756c9b03464a16ae SHA1 47c1f20bad74033c278e1e7573354fe0940526e4 SHA256 9aa83b2dc6c1c7e881868820496deeef4e130190c23a61479d26e38e85ffdb39
 EBUILD lua-5.1.3-r3.ebuild 2967 RMD160 95ab467a4d7d2b1f62e7d38692c8f7458531c3af SHA1 9d642b6f8dc06eca11394ba6b93301e46bee9538 SHA256 c65f906c5055f9ab5808f849ab7a296174fd493908356e7544d262b3707372ec
 EBUILD lua-5.1.3-r4.ebuild 3041 RMD160 6081734baf13ff575aa5fa9cabf8ecf98968938b SHA1 449192cef6d30eaf81b4a1e007d7da03a362f14b SHA256 da399b248158b060e937e48b32e1bd63404ad765dc2173fde87e133b5b98f768
+EBUILD lua-5.1.4-r1.ebuild 3087 RMD160 1deb7e70b86f10f625d49b9b54cff00cc8e9d461 SHA1 4db7c19be47d29fb097760b5c92fb2fc75824108 SHA256 8a612c5b85eb25f7917d55437287a74e350ae0a50bf342e912df99df33c920c1
 EBUILD lua-5.1.4.ebuild 3039 RMD160 fdd4af40ae9254c9cb2c14c11eb3542d2fb52701 SHA1 48f745d33d1906b709e64499d1f750fbf8b560d9 SHA256 60590e52bdb00047a56b551367844fa9c9ddbb5a1e4283b9d490afdb2fcdc932
-MISC ChangeLog 17712 RMD160 f2e5f6837765931f8bcca5950c549f9cea225f66 SHA1 603517a5d24dbada2b4ceb1a4b91f86d645785ab SHA256 871319db0b26774ef17ab33cd8459b7098212ec4399933275bcdc60b63f6dec5
+MISC ChangeLog 17874 RMD160 a3cb448691914fc0e21e17a2274c00619ff37ab3 SHA1 37356b22636985568ef6cf5ada4f2bb996e19693 SHA256 dae50e2e49c585eead98f993d45a7e445d648ca43978b20c04a5ddfacca51bd6
 MISC metadata.xml 339 RMD160 0d536a77658ffb6d8bccff7183a5bf4722d0a82d SHA1 f5bd1085f69b6e9d81e42cd711a7846ccb267e31 SHA256 6b3bedf093395def984b71f7c74ce59742c5df6592ad50f1b96c8a2499f27c8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjjmOoACgkQfNMcoUhJ7GzaHgCfZQWIlhbDBk4BM0zPzHGIjz7d
-QAcAnj9clzgY0qGT8oTvOqYciEzvFQxz
-=T8wq
+iEYEARECAAYFAkjvEcYACgkQfNMcoUhJ7Gw/YgCgh/uYtl9zv9cHfHAJrigYDngG
+qOwAn3BgdfnZKtaNzRRfYidmIRPKYzlk
+=PYdB
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/lua-5.1.4-r1.ebuild b/dev-lang/lua/lua-5.1.4-r1.ebuild
new file mode 100644
index 000000000000..ee544a3475fe
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.4-r1.ebuild
@@ -0,0 +1,117 @@
+# 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.4-r1.ebuild,v 1.1 2008/10/10 08:26:34 mabi Exp $
+
+EAPI="1"
+
+inherit eutils portability versionator toolchain-funcs
+
+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="cxx +deprecated 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
+
+	# 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.patch
+	fi
+
+	# We want packages to find our things...
+	sed -i -e 's:/usr/local:/usr:' etc/lua.pc
+}
+
+src_compile() {
+	tc-export CC
+	if use cxx; then
+		CC=$(tc-getCXX)
+	fi
+
+	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 CC="${CC}" CFLAGS="${mycflags} ${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
+}