dev-lang/luajit: Version bump

Package-Manager: portage-2.2.20

4 files changed, 26 insertions, 24 deletions

diff --git a/dev-lang/luajit/ChangeLog b/dev-lang/luajit/ChangeLog
index dcb87ee5..68ed352a 100644
--- a/dev-lang/luajit/ChangeLog
+++ b/dev-lang/luajit/ChangeLog
@@ -1,3 +1,12 @@
+*luajit-2.0.4 (05 Aug 2015)
+
+  05 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  +files/2.0.4-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch,
+  +luajit-2.0.4.ebuild,
+  -files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch,
+  -luajit-2.0.2.ebuild:
+  dev-lang/luajit: Version bump
+
   20 Jun 2014; Bertrand Jacquin <beber@meleeweb.net> luajit-2.0.2.ebuild:
   dev-lang/luajit: Sync with upstream
 
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index bfdfb53b..3950fe57 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,5 +1,5 @@
-AUX 2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch 816 SHA256 7ce2df902be74d8c22552cb2dbb8bd40af5971310b8d56897a1c73050a4df12a WHIRLPOOL f2d68fddd6d68dd33300847800fe68fcbe3b1fd102aa0fa49a3a3456bb2d156c6fc174969539d24f78df58fc2156fa555566b4102c656cb2f01c13062bb6ff2e
-DIST LuaJIT-2.0.2.tar.gz 843031 SHA256 c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38 WHIRLPOOL cb6e8ee6c5ac2293ca5d5452cda34769d3229e2d4681c0ce3c164659c2d2d781f8474e243747b197c10b3abc116e4145df6f5293317f1db871865f38ecd2b6cd
-EBUILD luajit-2.0.2.ebuild 2083 SHA256 fe55a8f4f90557bb24a47a57cc67fe6c225e107d81f0d8ca74aacb33a335088b WHIRLPOOL 5330cbea2cc13d44fa1fe120345a95ce152fa56c6e0afcb04c92b13c8dead9c57ecf3cfe32820fa40785be569dbb18e33bb14344dc1a74a515a652e84b0a938e
-MISC ChangeLog 878 SHA256 efd01fd4e4f3c8f27efec6c684f2bb394b813b747884e13c47bd06e522b633a5 WHIRLPOOL a99f53b4371fb494cbd532ee8ab51036189d6c808c599b0ede09a4ac2a234bb60f81b8c6f254a98d8e5a08f661ff935077cf2a453f0d3925b515bbfddb9ea28f
+AUX 2.0.4-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch 816 SHA256 7ce2df902be74d8c22552cb2dbb8bd40af5971310b8d56897a1c73050a4df12a WHIRLPOOL f2d68fddd6d68dd33300847800fe68fcbe3b1fd102aa0fa49a3a3456bb2d156c6fc174969539d24f78df58fc2156fa555566b4102c656cb2f01c13062bb6ff2e
+DIST LuaJIT-2.0.4.tar.gz 847615 SHA256 620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d WHIRLPOOL 0d2b7d3dbede1e42afd820fb8b327f643282efd1549ae7288da82ed157ef34ac2ec6bee481ae3d02abdebb6528e42c12c4d6fa8e26774f1b59e17d3998e9f4c2
+EBUILD luajit-2.0.4.ebuild 1718 SHA256 70f46e668061ad50c1530a7a2129eb7380b63262f4ff3faa3bd785d35055af38 WHIRLPOOL e599e52cf7200021c689c121af29cf5167f36b387ae2f479c849982cd70d67c14c52e2f6f3ee4a5c121bd41b90c878445fef18ebd26e0e16c558854155cda9cd
+MISC ChangeLog 1171 SHA256 2737e3dff58ea9426e7c12d7d2d6ec62a7e436c914ef749835ce27ac8c86019e WHIRLPOOL 1f1341e39502747a8081800448eadead905ffa8cd8985e826f8ed4ed00ea1001495fdf845eaee0a676b36e9eb17f9613b7b56eaa4664b2450d494a46affc0ab8
 MISC metadata.xml 538 SHA256 badc18b05ed0ff615d7adb47957d3517ffe946e9f8e656396af637690f48e387 WHIRLPOOL edc92b00aac4364c65be053abebf8b96a3242ecede5ba5550feb58b47182dd679b23c82944fc7a441a704adbce8f4f912a10a87345ef17cb213c0ace7d83f9c6
diff --git a/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch b/dev-lang/luajit/files/2.0.4-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch
index bdcbfc11..bdcbfc11 100644
--- a/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch
+++ b/dev-lang/luajit/files/2.0.4-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch
diff --git a/dev-lang/luajit/luajit-2.0.2.ebuild b/dev-lang/luajit/luajit-2.0.4.ebuild
index 45045f31..07dfd3ae 100644
--- a/dev-lang/luajit/luajit-2.0.2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.2.ebuild,v 1.3 2014/06/13 21:36:35 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.4.ebuild,v 1.1 2015/05/21 09:01:30 monsieurp Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit eutils multilib pax-utils versionator toolchain-funcs
 
 MY_PV="$(get_version_component_range 1-3)"
 MY_P="LuaJIT-${MY_PV}"
-if [[ $(get_version_component_range 4) != "" ]]; then
+if [[ -n $(get_version_component_range 4) ]]; then
 	HOTFIX="v${PV}"
 	HOTFIX="${HOTFIX/_p/_hotfix}.patch"
 fi
@@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"
@@ -33,19 +33,17 @@ src_prepare(){
 
 	epatch "${FILESDIR}/${PV}-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch"
 
-	sed -i "s,PREFIX= /usr/local,PREFIX= ${EPREFIX}/usr," Makefile || die 'sed failed.'
-	sed -i "s,/lib,/$(get_libdir)," etc/${PN}.pc || die 'sed2 failed.'
-
 	case "${CHOST}" in
-		*mingw*) TARGET_SYS=Windows ;;
 		*linux*) TARGET_SYS=Linux   ;;
+		*mingw*) TARGET_SYS=Windows ;;
 	esac
 }
 
-src_compile() {
+_emake() {
 	emake \
 		Q= \
 		PREFIX="${EPREFIX}/usr" \
+		MULTILIB="$(get_libdir)" \
 		DESTDIR="${D}" \
 		HOST_CC="$(tc-getBUILD_CC)" \
 		STATIC_CC="$(tc-getCC)" \
@@ -55,20 +53,15 @@ src_compile() {
 		TARGET_AR="$(tc-getAR) rcus" \
 		TARGET_STRIP="true" \
 		INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
-		XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
+		"$@"
+}
+
+src_compile() {
+	_emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
 }
 
 src_install(){
-	emake install \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_SYS="${TARGET_SYS}" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		INSTALL_LIB="${ED%/}/usr/$(get_libdir)"
+	_emake install
 
 	if [[ ${CHOST} != *mingw* ]] ; then
 		pax-mark m "${ED}usr/bin/luajit-${MY_PV}"