Fix multilib handling #533686 by Thomas Sachau.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 90 insertions, 2 deletions

diff --git a/dev-lang/luajit/ChangeLog b/dev-lang/luajit/ChangeLog
index 193551790c69..2a1d0d37daaf 100644
--- a/dev-lang/luajit/ChangeLog
+++ b/dev-lang/luajit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/luajit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.23 2015/02/16 16:56:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.24 2015/03/17 01:06:33 vapier Exp $
+
+*luajit-2.0.3-r1 (17 Mar 2015)
+
+  17 Mar 2015; Mike Frysinger <vapier@gentoo.org> +luajit-2.0.3-r1.ebuild:
+  Fix multilib handling #533686 by Thomas Sachau.
 
   16 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -files/LuaJIT-2.0.0-beta10-gentoo.patch,
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index d94b844462c2..67061b2d3a54 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST LuaJIT-1.1.6.tar.gz 364447 SHA256 c3dee987635540f64ebe834aa6c8ef17e0c0b8248324ee20953f50c98be2dd8a SHA512 5b08d0409bed23b3efd05d50007819c0023323fb0f921256fd33902b434221ebaa5ff4568813863ba3220271f7fd54720479ab8161b09d26ef5873030431592a WHIRLPOOL 6fa2504ccbeeb07434bf251b609df4a2834924da97c8efd5b5ca23a1d7215ca469b22fdd0aa166612606bc791a55b3ce150c6c1f2c3fae3598b0d1f4a75b2955
 DIST LuaJIT-2.0.2.tar.gz 843031 SHA256 c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38 SHA512 c1afea13ec61a59f37d1f61fc50bcac47208d9d4f0a80689b74e901ad2b34294b6c89a0b4eef54b43f3d2db411660da61b191b0bbfba4ba2f97743a9ee4484e3 WHIRLPOOL cb6e8ee6c5ac2293ca5d5452cda34769d3229e2d4681c0ce3c164659c2d2d781f8474e243747b197c10b3abc116e4145df6f5293317f1db871865f38ecd2b6cd
 DIST LuaJIT-2.0.3.tar.gz 844927 SHA256 55be6cb2d101ed38acca32c5b1f99ae345904b365b642203194c585d27bebd79 SHA512 7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0 WHIRLPOOL 1ba759b85048cfd57ebc02cfce477e9ddb327e7d27acd78f93fb2debfbf010a96e7b127324ebf6b81b1f35132f5a0a3a56ffca64fe0e66cba80c28b1cb49b433
 EBUILD luajit-1.1.6.ebuild 1405 SHA256 bd84e6a904d8cbbc9860ce23c1ff373fcc5ba07422b698e517cb8a556d53d527 SHA512 028bb7cd203a1323b287b5093b845c8b0879ea6762c27696b7e19d015800e68ef7ca9c05026dfff12ea4fa65bb90be28f47d998fcff9f480dc54e3c43e5a3fa6 WHIRLPOOL 74a749cb20cda6112062e69ce5a64f28288716ee9ebf4b093d3279f701c59f9d80c2f35bdb3940be39abd64f5cd2ba5fc6b1be93a161ac2dda228d19755049ea
 EBUILD luajit-2.0.2.ebuild 1809 SHA256 1528d96592f365737670744b2e6d2e3bac720c6b7653a82e0e3da26dd7cdb18d SHA512 80ebf5de576f4a15efc5727cec9ee3adb188b86cf126aeba9e0948331c605146b842b26f2290a7b74694d3a869acae4b48b5ee072d033fb1273550cbbda2b5f7 WHIRLPOOL 00af639365c73afcfbc2d9ed359e0d13c7f869cd9c800c2d92a0573d082df093a4e3501e30ff26ef55121e7363213a0452391d536874ec4df2b16f48d2da4fd0
+EBUILD luajit-2.0.3-r1.ebuild 1475 SHA256 a72c6833684af95bc681cded6023ae8b585ad264a928556b03ce18641f1ca476 SHA512 845a3a032a0a47d8da0ba60e0c7461f859300b16243613c76c206d7c97918fce758e4748d3e3f42eb75a4906259ce092dd7b684619a737f180b3da7b5e1dba5f WHIRLPOOL 330e6280a1a9c8934a4fa65da6f55df88e6fad72468f71fcabdf6d88eb4acd7068b2461a662bc7cb868073bc3d11a77aa0d5f96751b4266e4c317707743a0ac6
 EBUILD luajit-2.0.3.ebuild 1815 SHA256 a2b73d34ea8d752474290be962a4e0f86c48cc17992b5a05738b2e46c940e8ad SHA512 4d3d3c68e2ef8030d90ce28fd7dc0d49ba50c23a7ab02f02a05dc0ebab4c42d09db5fcdb1902297514bebc1ef9f5fef1dec09e5a6622996d7258006ae1d03c55 WHIRLPOOL 55e09c3a2c01f64c422e24a9314f14b4dbb6322a200a4408974ae2a9a6fa225a3e9b4c7e3aae4822f6763fcb3c7460b3559ee04cc342c5e0d104be4febf9f490
-MISC ChangeLog 3994 SHA256 21d4cbd45148e29e5b98a3e78454f5a852a663c670fb0df51f971bd18a4eb283 SHA512 7c9ea6d8fc4be87012ab9ddbab916450c5461fb004583f0995744a5388f61e44529191c2ff1fd36794e181d4aa48bcf37ec15e5d4109d1df7f45ddaf3759cad8 WHIRLPOOL de2a99472dae8a81d9abfae9ea06e2aaa3c3055c2bbdf06df2963a69f499ce75e9c2709aca360693c2159db8daa27747cec4237e0f6e31acd2b269dfb28beeff
+MISC ChangeLog 4149 SHA256 618192ed4394adfe840759336ef13a8f521bcc0f0e1678d09788ba48ca9926e7 SHA512 4e19d1667496e30efcf9dde7f8b9c439190cfd1fbdf993bab258f0fbe961583713b5ad1e4d31bbafd5aa2d8b0ca02ac825006ede6ceb1fef4fb787b66550f083 WHIRLPOOL 1edbd34a0bb3479b59e99658ed93856190cf50759f2732f5e30372575f789504af2a2885a9ae3254ea6d44ee13e591e2fe92f0fb7380f0567dc390b84db35443
 MISC metadata.xml 539 SHA256 5b7142766e9999f667d724167a03bce92c66e79dd736cb44dd7f29ad5fa20490 SHA512 416aeea20238f27b94d8ce76b4f4b35a65972a970c14fe08675f22f52cb923f3a9a32bfc533df72400ff15900de2727170b096ad85be141bdd0f54f4d1293f76 WHIRLPOOL 5383c0894b0fe455a6c1d8eb821936fb8d66205f5796ef365ab6c181c16027ea868e4e3c358c4f8310860a16f4624648a78f7ae7b4e10ab4840d140350fc17c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVB34aAAoJEPGu1DbS6WIAuooP/22G2xOxYQ5cotUGkEmW/Dmp
+YrZtg0bxA7M2lCE5ZRWaOS38zjUsyMwo9LF6GhZx2tnPDdOUs6Tan9fzwTGt5yVL
+IuL0n6lhBENvP/gRfOZ7BfOQ6JActpfFFrSOPynSp7L+iOu2Rsi1G7yLTQoCj6bU
+2WXIVFKHFmCgpgii5NUCvLh2qlljhU9ySs1Qg5iOv9bGU7aVaFtABMnL2lPSz33z
+CJPEutOXgy24EWjl9W00KP8guJKUwQT9pPxHXMUo6hmLapvA7QVxxYYf11Sykgld
+M50V3qw6xrmhmsepGvEr4W7Qc96jNav2bSEZuMwdKHC+CgY9wZZc6w8NBY2WxF3y
+TalPAKkOCNXPb52AqP0LPHqwKnvPN9kj69sDwoXMHkWsU5nObl1LGE7uDwZix7Ot
+SQLjx6vSYkiVY0t9en3mb4AABZWUq2OBEuY3WoBzXcNPMTSyk4MwB+nKxMRZh/gn
+vO+e1ovu8sSsKg+EDbJvwbUVx4HdIK2d08aEfmfvRigha7SsB2kspFA5Q7F8mPvL
+Zru/vD10pQ21OX4HF7E4WHe72QYOdJS2iGnEyJbIceHzv4E9494QxBv7jtz/btdo
+CZvtrPw2DDvmcTwV43cC9bCNaWOcXHv91imkR3mrWMQoOLYIOMV6jBKDl4ryzHmf
++3qe1MfZvMWkLb1cg/FW
+=pKHu
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/luajit/luajit-2.0.3-r1.ebuild b/dev-lang/luajit/luajit-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..61416d834ac8
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.0.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.3-r1.ebuild,v 1.1 2015/03/17 01:06:33 vapier Exp $
+
+EAPI=5
+
+inherit eutils multilib pax-utils versionator toolchain-funcs
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_P="LuaJIT-${MY_PV}"
+if [[ -n $(get_version_component_range 4) ]]; then
+	HOTFIX="v${PV}"
+	HOTFIX="${HOTFIX/_p/_hotfix}.patch"
+fi
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="http://luajit.org/"
+SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
+	${HOTFIX:+http://luajit.org/download/${HOTFIX}}"
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="lua52compat"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare(){
+	if [[ -n ${HOTFIX} ]]; then
+		epatch "${DISTDIR}/${HOTFIX}"
+	fi
+}
+
+_emake() {
+	emake \
+		Q= \
+		PREFIX="${EPREFIX}/usr" \
+		MULTILIB="$(get_libdir)" \
+		DESTDIR="${D}" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		STATIC_CC="$(tc-getCC)" \
+		DYNAMIC_CC="$(tc-getCC) -fPIC" \
+		TARGET_LD="$(tc-getCC)" \
+		TARGET_AR="$(tc-getAR) rcus" \
+		TARGET_STRIP="true" \
+		INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+		"$@"
+}
+
+src_compile() {
+	_emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
+}
+
+src_install(){
+	_emake install
+
+	pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+
+	cd "${S}"/doc
+	dohtml -r *
+}