From bbb1982ab99ec4f845e40c5542055d7ad19e9234 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 19 Apr 2014 15:36:14 +0200
Subject: [PATCH] Lua: Provide versionned bin and lib names

* Some programs need to rely on a specific version of Lua (5.1 or 5.2).
---
 dev-lang/lua/lua-5.1.4.recipe | 18 +++++++++++++++---
 dev-lang/lua/lua-5.2.1.recipe | 11 +++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/dev-lang/lua/lua-5.1.4.recipe b/dev-lang/lua/lua-5.1.4.recipe
index f41a11c35..026f2865b 100644
--- a/dev-lang/lua/lua-5.1.4.recipe
+++ b/dev-lang/lua/lua-5.1.4.recipe
@@ -2,13 +2,14 @@ SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language."
 HOMEPAGE="http://www.lua.org"
 SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz"
 CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150"
-REVISION="5"
+REVISION="6"
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	lua${secondaryArchSuffix} = $portVersion compat >= 5.1
 	cmd:lua${secondaryArchSuffix} = $portVersion compat >= 5.1
+	cmd:lua5.1${secondaryArchSuffix} = $portVersion compat >= 5.1
 	cmd:luac${secondaryArchSuffix} = $portVersion compat >= 5.1
 	lib:liblua${secondaryArchSuffix} = $portVersion compat >= 5.1
 	"
@@ -31,23 +32,34 @@ BUILD()
 INSTALL()
 {
     make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \
-        INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/5.1" \
+        INSTALL_INC="$includeDir/lua5.1" INSTALL_LMOD="$dataDir/lua/5.1" \
         INSTALL_LIB="$libDir" INSTALL_BIN="$binDir"
 
 	mkdir -p $libDir/pkgconfig
 	cp etc/lua.pc $libDir/pkgconfig/lua.pc
 
-	ln -s $libDir/liblua.so $libDir/liblua.so.5.1
+	ln -s liblua.so $libDir/liblua.so.5.1
+	ln -s liblua.a $libDir/liblua5.1.a
+
+	mv $binDir/lua $binDir/lua5.1
+	ln -s $binDir/lua5.1 $binDir/lua
 
 	prepareInstalledDevelLib liblua
+	prepareInstalledDevelLib liblua5.1
 	fixPkgconfig
 
+	# The includes are in a subdirectory of includeDir, and fixPkgconfig breaks
+	# that.
+	sed -i -e "s,^includedir=.*,includedir=$prefix/$relativeIncludeDir/lua5.1," \
+   		$developLibDir/pkgconfig/lua.pc
+	
 	packageEntries devel $developDir
 }
 
 PROVIDES_devel="
 	lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.1
 	devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.1
+	devel:liblua5.1$secondaryArchSuffix = $portVersion compat >= 5.1
 	"
 
 REQUIRES_devel="
diff --git a/dev-lang/lua/lua-5.2.1.recipe b/dev-lang/lua/lua-5.2.1.recipe
index 39b5bba43..d25f3dfb7 100644
--- a/dev-lang/lua/lua-5.2.1.recipe
+++ b/dev-lang/lua/lua-5.2.1.recipe
@@ -2,12 +2,13 @@ SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language."
 HOMEPAGE="http://www.lua.org"
 SRC_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
 CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3"
-REVISION="6"
+REVISION="7"
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	lua$secondaryArchSuffix = $portVersion compat >= 5.2
 	cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.2
+	cmd:lua5.2$secondaryArchSuffix = $portVersion compat >= 5.2
 	cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.2
 	lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
 	"
@@ -24,6 +25,7 @@ BUILD_PREREQUIRES="
 PROVIDES_devel="
 	lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.2
 	devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
+	devel:liblua52$secondaryArchSuffix = $portVersion compat >= 5.2
 	"
 
 REQUIRES_devel="
@@ -40,12 +42,17 @@ BUILD()
 INSTALL()
 {
 	make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \
-		INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/5.2" \
+		INSTALL_INC="$includeDir/lua52" INSTALL_LMOD="$dataDir/lua/5.2" \
 		INSTALL_LIB="$libDir" INSTALL_BIN="$binDir"
 
 	ln -s liblua.so $libDir/liblua.so.5.2
+	ln -s liblua.a $libDir/liblua52.a
+
+	mv $binDir/lua $binDir/lua5.2
+	ln -s $binDir/lua5.2 $binDir/lua
 
 	prepareInstalledDevelLib liblua
+	prepareInstalledDevelLib liblua52
 	packageEntries devel $developDir
 }
 LICENSE="MIT"