reinit the tree, so we can have metadata

2 files changed, 159 insertions, 0 deletions

diff --git a/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch b/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch
new file mode 100644
index 000000000000..9124baac64d1
--- /dev/null
+++ b/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch
@@ -0,0 +1,95 @@
+https://bugs.gentoo.org/show_bug.cgi?id=596434
+Author: Peter Levine
+
+--- Stage-4.1.1/libstage/stage.hh.old	2016-10-12 01:12:18.828436085 -0400
++++ Stage-4.1.1/libstage/stage.hh	2016-10-12 01:12:36.675465633 -0400
+@@ -622,46 +622,46 @@
+   { cont.erase( std::remove( cont.begin(), cont.end(), thing ), cont.end() ); }
+   
+   // Error macros - output goes to stderr
+-#define PRINT_ERR(m) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", __FILE__, __FUNCTION__)
+-#define PRINT_ERR1(m,a) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, __FILE__, __FUNCTION__)    
+-#define PRINT_ERR2(m,a,b) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
+-#define PRINT_ERR3(m,a,b,c) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
+-#define PRINT_ERR4(m,a,b,c,d) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
+-#define PRINT_ERR5(m,a,b,c,d,e) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__)
++#define PRINT_ERR(m) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", __FILE__, __FUNCTION__)
++#define PRINT_ERR1(m,a) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, __FILE__, __FUNCTION__)    
++#define PRINT_ERR2(m,a,b) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
++#define PRINT_ERR3(m,a,b,c) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
++#define PRINT_ERR4(m,a,b,c,d) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
++#define PRINT_ERR5(m,a,b,c,d,e) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__)
+ 
+   // Warning macros
+-#define PRINT_WARN(m) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", __FILE__, __FUNCTION__)
+-#define PRINT_WARN1(m,a) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, __FILE__, __FUNCTION__)    
+-#define PRINT_WARN2(m,a,b) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
+-#define PRINT_WARN3(m,a,b,c) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
+-#define PRINT_WARN4(m,a,b,c,d) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
+-#define PRINT_WARN5(m,a,b,c,d,e) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__)
++#define PRINT_WARN(m) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", __FILE__, __FUNCTION__)
++#define PRINT_WARN1(m,a) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, __FILE__, __FUNCTION__)    
++#define PRINT_WARN2(m,a,b) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
++#define PRINT_WARN3(m,a,b,c) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
++#define PRINT_WARN4(m,a,b,c,d) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
++#define PRINT_WARN5(m,a,b,c,d,e) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__)
+ 
+   // Message macros
+ #ifdef DEBUG
+-#define PRINT_MSG(m) printf( "Stage: "m" (%s %s)\n", __FILE__, __FUNCTION__)
+-#define PRINT_MSG1(m,a) printf( "Stage: "m" (%s %s)\n", a, __FILE__, __FUNCTION__)    
+-#define PRINT_MSG2(m,a,b) printf( "Stage: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
+-#define PRINT_MSG3(m,a,b,c) printf( "Stage: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
+-#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
+-#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: "m" (%s %s)\n", a, b, c, d, e,__FILE__, __FUNCTION__)
++#define PRINT_MSG(m) printf( "Stage: " m " (%s %s)\n", __FILE__, __FUNCTION__)
++#define PRINT_MSG1(m,a) printf( "Stage: " m " (%s %s)\n", a, __FILE__, __FUNCTION__)    
++#define PRINT_MSG2(m,a,b) printf( "Stage: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
++#define PRINT_MSG3(m,a,b,c) printf( "Stage: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
++#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
++#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: " m " (%s %s)\n", a, b, c, d, e,__FILE__, __FUNCTION__)
+ #else
+-#define PRINT_MSG(m) printf( "Stage: "m"\n" )
+-#define PRINT_MSG1(m,a) printf( "Stage: "m"\n", a)
+-#define PRINT_MSG2(m,a,b) printf( "Stage: "m"\n,", a, b )
+-#define PRINT_MSG3(m,a,b,c) printf( "Stage: "m"\n", a, b, c )
+-#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: "m"\n", a, b, c, d )
+-#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: "m"\n", a, b, c, d, e )
++#define PRINT_MSG(m) printf( "Stage: " m "\n" )
++#define PRINT_MSG1(m,a) printf( "Stage: " m "\n", a)
++#define PRINT_MSG2(m,a,b) printf( "Stage: " m "\n,", a, b )
++#define PRINT_MSG3(m,a,b,c) printf( "Stage: " m "\n", a, b, c )
++#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: " m "\n", a, b, c, d )
++#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: " m "\n", a, b, c, d, e )
+ #endif
+ 
+   // DEBUG macros
+ #ifdef DEBUG
+-#define PRINT_DEBUG(m) printf( "debug: "m" (%s %s)\n", __FILE__, __FUNCTION__)
+-#define PRINT_DEBUG1(m,a) printf( "debug: "m" (%s %s)\n", a, __FILE__, __FUNCTION__)    
+-#define PRINT_DEBUG2(m,a,b) printf( "debug: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
+-#define PRINT_DEBUG3(m,a,b,c) printf( "debug: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
+-#define PRINT_DEBUG4(m,a,b,c,d) printf( "debug: "m" (%s %s)\n", a, b, c ,d, __FILE__, __FUNCTION__)
+-#define PRINT_DEBUG5(m,a,b,c,d,e) printf( "debug: "m" (%s %s)\n", a, b, c ,d, e, __FILE__, __FUNCTION__)
++#define PRINT_DEBUG(m) printf( "debug: " m " (%s %s)\n", __FILE__, __FUNCTION__)
++#define PRINT_DEBUG1(m,a) printf( "debug: " m " (%s %s)\n", a, __FILE__, __FUNCTION__)    
++#define PRINT_DEBUG2(m,a,b) printf( "debug: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
++#define PRINT_DEBUG3(m,a,b,c) printf( "debug: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
++#define PRINT_DEBUG4(m,a,b,c,d) printf( "debug: " m " (%s %s)\n", a, b, c ,d, __FILE__, __FUNCTION__)
++#define PRINT_DEBUG5(m,a,b,c,d,e) printf( "debug: " m " (%s %s)\n", a, b, c ,d, e, __FILE__, __FUNCTION__)
+ #else
+ #define PRINT_DEBUG(m)
+ #define PRINT_DEBUG1(m,a)
+--- Stage-4.1.1/libstage/world.cc.old	2016-10-12 01:17:16.689055842 -0400
++++ Stage-4.1.1/libstage/world.cc	2016-10-12 01:17:22.039117546 -0400
+@@ -803,8 +803,8 @@
+   // Graphics Gems IV  
+   const int32_t sx(sgn(dx));  
+   const int32_t sy(sgn(dy));  
+-  const int32_t ax(abs(dx)); 
+-  const int32_t ay(abs(dy));  
++  const int32_t ax(std::abs(dx)); 
++  const int32_t ay(std::abs(dy));  
+   const int32_t bx(2*ax);	
+   const int32_t by(2*ay);	
+   int32_t exy(ay-ax); // difference between x and y distances
diff --git a/sci-electronics/Stage/files/libdir.patch b/sci-electronics/Stage/files/libdir.patch
new file mode 100644
index 000000000000..c083a837b8b7
--- /dev/null
+++ b/sci-electronics/Stage/files/libdir.patch
@@ -0,0 +1,64 @@
+From 777430f083c4190fbc1beecfd4b619e63cf08dfb Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Tue, 2 May 2017 11:47:13 +0200
+Subject: [PATCH] Revert "Do not install to lib64, even on x86_64 machines"
+
+This reverts commit 9f6e9bae3c51480d7f4c1b329493bbe30bc21839.
+---
+ cmake/internal/FindOS.cmake | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/cmake/internal/FindOS.cmake b/cmake/internal/FindOS.cmake
+index 5666bbce..cec44912 100644
+--- a/cmake/internal/FindOS.cmake
++++ b/cmake/internal/FindOS.cmake
+@@ -45,28 +45,28 @@ ELSE (PROJECT_OS_LINUX)
+ ENDIF (PROJECT_OS_LINUX)
+ 
+ # 32 or 64 bit Linux
+-# IF (PROJECT_OS_LINUX)
+-#     # Set the library directory suffix accordingly
+-#     IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-#         SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+-#         MESSAGE (STATUS "Linux x86_64 Detected")
+-#     ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+-#         MESSAGE (STATUS "Linux ppc64 Detected")
+-#         SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+-#     ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
+-# 	MESSAGE (STATEUS "Linux s390x Detected")
+-# 	SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+-#     ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-# ENDIF (PROJECT_OS_LINUX)
++IF (PROJECT_OS_LINUX)
++    # Set the library directory suffix accordingly
++    IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
++        SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
++        MESSAGE (STATUS "Linux x86_64 Detected")
++    ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
++        MESSAGE (STATUS "Linux ppc64 Detected")
++        SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
++    ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
++	MESSAGE (STATEUS "Linux s390x Detected")
++	SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
++    ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
++ENDIF (PROJECT_OS_LINUX)
+ 
+-# IF(PROJECT_PROC_64BIT)
++IF(PROJECT_PROC_64BIT)
+     # Set the install path to lib64
+-    # SET(PROJECT_LIB_DIR "lib64")
+-    # SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}")
+-# ELSE (PROJECT_PROC_64BIT)
++    SET(PROJECT_LIB_DIR "lib64")
++    SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}")
++ELSE (PROJECT_PROC_64BIT)
+     SET(PROJECT_LIB_DIR "lib")
+     SET(PROJECT_PLUGIN_DIR "lib/${PROJECT_NAME}-${APIVERSION}")
+-# ENDIF (PROJECT_PROC_64BIT)
++ENDIF (PROJECT_PROC_64BIT)
+ 
+ MESSAGE(STATUS "Installing Libraries to ${CMAKE_INSTALL_PREFIX}/${PROJECT_LIB_DIR}")
+ MESSAGE(STATUS "Installing Plugins to ${CMAKE_INSTALL_PREFIX}/${PROJECT_PLUGIN_DIR}")
+-- 
+2.12.2
+