app-crypt/rhash/rhash-1.3.5.recipe

@@ -15,7 +15,7 @@ CHECKSUM_SHA256="98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2
 SOURCE_DIR="RHash-$portVersion"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rhash$secondaryArchSuffix = $portVersion

dev-cpp/luabind/luabind-0.9.1.recipe

@@ -0,0 +1,76 @@
+SUMMARY="Create bindings between C++ and Lua"
+DESCRIPTION="Luabind is a library that helps you create bindings between C++ \
+and Lua. It has the ability to expose functions and classes, written in C++, \
+to Lua. It will also supply the functionality to define classes in lua and let \
+them derive from other lua classes or C++ classes. Lua classes can override \
+virtual functions from their C++ baseclasses. It is written towards Lua 5.x, \
+and does not work with Lua 4.
+
+It is implemented utilizing template meta programming. That means that you \
+don't need an extra preprocess pass to compile your project (it is done by \
+the compiler). It also means you don't (usually) have to know the exact \
+signature of each function you register, since the library will generate code \
+depending on the compile-time type of the function (which includes the \
+signature). The main drawback of this approach is that the compilation time \
+will increase for the file that does the registration, it is therefore \
+recommended that you register everything in the same cpp-file."
+HOMEPAGE="http://www.rasterbar.com/products/luabind.html"
+COPYRIGHT="2005 Rasterbar software"
+LICENSE="MIT"
+SOURCE_URI="https://github.com/luabind/luabind/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d"
+REVISION="1"
+PATCHES="luabind-$portVersion.patchset"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	luabind$secondaryArchSuffix = $portVersion
+	lib:libluabindd$secondaryArchSuffix = 0.9.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:liblua$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	luabind${secondaryArchSuffix}_devel = $portVersion
+	devel:libluabindd$secondaryArchSuffix = 0.9.0
+	"
+REQUIRES_devel="
+	haiku${secondaryArchSuffix}_devel
+	luabind$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:liblua5.1$secondaryArchSuffix
+	devel:libboost_config$secondaryArchSuffix >= 1.66
+	"
+BUILD_PREREQUIRES="
+	cmd:bjam
+	cmd:gcc$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	bjam $jobArgs
+}
+
+INSTALL()
+{
+	bjam install --prefix=$prefix
+
+	# Fix include dir
+	mkdir -p $includeDir
+	mv $prefix/include/luabind $includeDir
+	rmdir $prefix/include
+
+	# Fix lib dir
+	mkdir -p $libDir
+	mv $prefix/lib/*.so* $libDir
+
+	prepareInstalledDevelLib libluabindd
+	packageEntries devel $developDir
+}

dev-cpp/luabind/patches/luabind-0.9.1.patchset

@@ -0,0 +1,62 @@
+From 8f20d43747b1967317c6beea4a075cc93af93410 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 24 Mar 2018 09:59:56 +0100
+Subject: Hack in Haiku support in Jamfile
+
+
+diff --git a/Jamroot b/Jamroot
+index 94494bf..2a468d1 100755
+--- a/Jamroot
++++ b/Jamroot
+@@ -112,6 +112,13 @@ else if [ os.name ] in LINUX MACOSX FREEBSD
+     }
+     lib lua : m dl : <name>$(lib-name) <search>$(library:D) : : <include>$(includes) ;
+ }
++if [ os.name ] = HAIKU
++{
++	includes = /system/develop/headers/x86/lua5.1 ;
++	library = /system/develop/lib/x86/liblua.so ;
++    lib-name = [ MATCH "lib(.*)" : $(library[1]:B) ] ;
++    lib lua : : <name>$(lib-name) <search>$(library:D) : : <include>$(includes) ;
++}
+
+ rule tag-names ( name : type ? : property-set )
+ {
+-- 
+2.16.1
+
+
+From adccca31f5bb3b37c9e3d23cc006971e181e6f91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <gaetan.lehmann@gmail.com>
+Date: Sun, 4 Jan 2015 14:02:23 +0100
+Subject: fix build with boost 1.57
+
+this is the fix applied in homebrew and in
+
+  https://github.com/luabind/luabind/issues/27
+
+diff --git a/luabind/object.hpp b/luabind/object.hpp
+index f7b7ca5..ff99043 100644
+--- a/luabind/object.hpp
++++ b/luabind/object.hpp
+@@ -536,6 +536,8 @@ namespace detail
+       handle m_key;
+   };
+
++#if BOOST_VERSION < 105700
++
+ // Needed because of some strange ADL issues.
+
+ #define LUABIND_OPERATOR_ADL_WKND(op) \
+@@ -557,6 +559,8 @@ namespace detail
+   LUABIND_OPERATOR_ADL_WKND(!=)
+
+ #undef LUABIND_OPERATOR_ADL_WKND
++
++#endif // BOOST_VERSION < 105700
+
+ } // namespace detail
+
+-- 
+2.16.1
+

dev-libs/boost/boost166-1.66.0.recipe

@@ -8,7 +8,7 @@ testing. It contains over eighty individual libraries.
 HOMEPAGE="http://www.boost.org/"
 SOURCE_URI="https://dl.bintray.com/boostorg/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2"
 CHECKSUM_SHA256="5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
-REVISION="1"
+REVISION="2"
 LICENSE="Boost v1.0"
 COPYRIGHT="1998-2017 Beman Dawes, David Abrahams, Rene Rivera, et al."
 SOURCE_DIR="boost_${portVersion//./_}"
@@ -20,7 +20,7 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="$portVersion compat >= 1.66.0"
 
 PROVIDES="
-	boost165$secondaryArchSuffix = $portVersion
+	boost166$secondaryArchSuffix = $portVersion
 	lib:libboost_atomic$secondaryArchSuffix = $libVersion
 	lib:libboost_chrono$secondaryArchSuffix = $libVersion
 	lib:libboost_container$secondaryArchSuffix = $libVersion
@@ -62,8 +62,9 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
-PROVIDES_devel="
-	boost165${secondaryArchSuffix}_devel = $portVersion
+# List of devel entries matching an actual library (for use in prepareInstalledDevelLibs)
+# Boost also provides header-only libraries (because templates)
+devel_libs="
 	devel:libboost_atomic$secondaryArchSuffix = $portVersion
 	devel:libboost_chrono$secondaryArchSuffix = $portVersion
 	devel:libboost_container$secondaryArchSuffix = $portVersion
@@ -97,11 +98,17 @@ PROVIDES_devel="
 	devel:libboost_unit_test_framework$secondaryArchSuffix = $portVersion
 	devel:libboost_wave$secondaryArchSuffix = $portVersion
 	devel:libboost_wserialization$secondaryArchSuffix = $portVersion
+"
+
+PROVIDES_devel="
+	boost166${secondaryArchSuffix}_devel = $portVersion
+	$devel_libs
+	devel:libboost_config$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_devel="
 	haiku$secondaryArchSuffix >= r1~alpha4_pm_hrev51470
-	boost165$secondaryArchSuffix == $portVersion
+	boost166$secondaryArchSuffix == $portVersion
 	"
 
 BUILD_REQUIRES="
@@ -156,7 +163,7 @@ INSTALL()
 		--without-python \
 		install
 
-	prepareInstalledDevelLibs `echo "$PROVIDES_devel" | sed -n \
+	prepareInstalledDevelLibs `echo "$devel_libs" | sed -n \
 		-e "s/devel:\(.*\)$secondaryArchSuffix =.*/\1/p"`
 
 	packageEntries devel $developDir

dev-util/cmake/cmake-3.9.5.recipe

@@ -7,14 +7,14 @@ of your choice."
 HOMEPAGE="https://cmake.org/"
 COPYRIGHT="2002-2017 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://cmake.org/files/v3.9/cmake-$portVersion.tar.gz"
 CHECKSUM_SHA256="6220c1683b4e6bb8f38688fa3ffb17a7cf39f36317c2ddfdc3f12f09d086c166"
 SOURCE_DIR="cmake-$portVersion"
 PATCHES="cmake-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	cmake$secondaryArchSuffix = $portVersion compat >= 3

dev-util/cmake/patches/cmake-3.9.5.patchset

@@ -1,4 +1,4 @@
-From c1df6ded8f25de8d24b5702de3f06e7c9b46739f Mon Sep 17 00:00:00 2001
+From eb5b1b21f9add5bccec9dd1d0df8db7f01dd7e8f Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 9 Jun 2014 22:30:55 +0200
 Subject: Fix OpenAL search path.
@@ -18,10 +18,10 @@ index c3d202e..734f5f0 100644
    ~/Library/Frameworks
    /Library/Frameworks
 -- 
-2.13.1
+2.16.1
 
 
-From ee4a048bbba1c19493fe62df965be1cf262a0653 Mon Sep 17 00:00:00 2001
+From 4db31de672c0607d1174fad544a8d72beb538e09 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 21 Nov 2015 22:02:38 +0000
 Subject: Haiku provides elf.h now.
@@ -73,5 +73,28 @@ index fc97bf3..5706f31 100644
  #if defined(__sun)
  #include <sys/link.h> // For dynamic section information
 -- 
-2.13.1
+2.16.1
+
+
+From 1fb2f9944d670e829608044f51cf9af6a1ab9b5e Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 24 Mar 2018 14:19:43 +0100
+Subject: Fix search path for Lua headers.
+
+
+diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
+index f2b2322..e127ba7 100644
+--- a/Modules/FindLua51.cmake
++++ b/Modules/FindLua51.cmake
+@@ -36,7 +36,7 @@
+ find_path(LUA_INCLUDE_DIR lua.h
+   HINTS
+     ENV LUA_DIR
+-  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include
++  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include lua5.1
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-- 
+2.16.1