From ba016bbf77f262ef218d0b41a36eb97fa1ad2d14 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <beber@meleeweb.net>
Date: Sat, 14 Jun 2014 01:29:02 +0200
Subject: dev-lang/luajit: Avoid ld SEGV when libluajit-5.1.dll is only present
 in bin/, symlink it to lib/ also

Package-Manager: portage-2.2.10
---
 dev-lang/luajit/ChangeLog                                  |  5 +++++
 dev-lang/luajit/Manifest                                   |  4 ++--
 .../2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch  | 14 +++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dev-lang/luajit/ChangeLog b/dev-lang/luajit/ChangeLog
index 2a4ec7fb..d820b3f0 100644
--- a/dev-lang/luajit/ChangeLog
+++ b/dev-lang/luajit/ChangeLog
@@ -1,3 +1,8 @@
+  13 Jun 2014; Bertrand Jacquin <beber@meleeweb.net>
+  files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch:
+  dev-lang/luajit: Avoid ld SEGV when libluajit-5.1.dll is only present in bin/,
+  symlink it to lib/ also
+
   11 Jun 2014; Bertrand Jacquin <beber@meleeweb.net>
   files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch,
   luajit-2.0.2.ebuild:
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index fba6c1c3..ab3134cd 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 977 SHA256 1b25df8b4bc45ff4412c5ae966c8a222b5cff84c32f7bfd5b6e8b2ba3ceae2ae WHIRLPOOL e8b68a3050a105d3e8a44d9077f72da7ce2b222ef43b2cefee7e216a73bccd3032ad5d025baa5c406db2229491720e2cd2611a453bf1005acde916c793554ca7
+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 2084 SHA256 fec4fd68099c95eb4d4821d23b010a5266d07eabf26c7fbba105ed7872b0f6a4 WHIRLPOOL 011b8b899ebf1a92eaa8fb0efcece74949ec584163f7479be6fa2cdf7ea0e15d631df83dd8d1bc0566d888a4ce3f37b213bbc25f6ea005a42764ddc0c463e97d
-MISC ChangeLog 541 SHA256 e381a514b7b1eb5f578178b5d770c4f351afd2115109ce6921a8c73a8ae5052f WHIRLPOOL 96b6d98705abf9cceeddbc0b73e630e6a6b80c3c16b43e7f71c7b8fd0922a916704e243d79cb355301e7fd8e1c4a93e7b501a20072f19d4e72980db312ca7a3d
+MISC ChangeLog 765 SHA256 d899c207ffffeb6c78b3af6c62512e41c2e8a8b957d61a173d9d4c12172e8ed6 WHIRLPOOL eb11969f605c574a4371ac2047ba721e61f13fab465a2120bf87ac54cf3b952dd00b79d0aa739b7db8ed22f8b4d9a1c968c3d1c4b2a08b0505501397e741478e
 MISC metadata.xml 539 SHA256 5b7142766e9999f667d724167a03bce92c66e79dd736cb44dd7f29ad5fa20490 WHIRLPOOL 5383c0894b0fe455a6c1d8eb821936fb8d66205f5796ef365ab6c181c16027ea868e4e3c358c4f8310860a16f4624648a78f7ae7b4e10ab4840d140350fc17c4
diff --git a/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch b/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch
index 43b990f6..bdcbfc11 100644
--- a/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch
+++ b/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch
@@ -1,17 +1,17 @@
-From 89f55bc6de00bc3fa53ab3b300416b7d0f61c101 Mon Sep 17 00:00:00 2001
+From 893aaee064768992327f8488c6f21b90a7d5a6ef Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Wed, 11 Jun 2014 22:18:52 +0200
 Subject: [PATCH] MEDIUM: Makefile: Handle TARGET_SYS=Windows
 
 ---
- Makefile | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ Makefile | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index b23b648..63e0099 100644
+index b23b648..785496d 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -95,6 +95,20 @@ ifeq (,$(findstring Windows,$(OS)))
+@@ -95,6 +95,16 @@ ifeq (,$(findstring Windows,$(OS)))
    endif
  endif
  
@@ -22,11 +22,7 @@ index b23b648..63e0099 100644
 +
 +  FILE_SO= lua$(subst .,,$(ABIVER)).dll
 +  INSTALL_SONAME= $(FILE_SO)
-+  INSTALL_DYN= $(INSTALL_BIN)/$(INSTALL_SONAME)
-+
 +  INSTALL_SOSHORT= libluajit-$(ABIVER).dll
-+  INSTALL_SHORT1= $(INSTALL_BIN)/$(INSTALL_SOSHORT)
-+  INSTALL_SHORT2= $(INSTALL_BIN)/$(INSTALL_SOSHORT)
 +endif
 +
  ##############################################################################
-- 
cgit v1.2.3