reinit the tree, so we can have metadata

4 files changed, 187 insertions, 0 deletions

diff --git a/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
new file mode 100644
index 000000000000..b83bc93465af
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
@@ -0,0 +1,91 @@
+From 7507c5fcadc53894b128f3b9fc4b073d15564704 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 29 Jun 2017 11:12:44 +0200
+Subject: [PATCH 1/3] cmake: Use GNUInstallDirs to provide configurable &
+ correct install dirs
+
+Use the GNUInstallDirs CMake module to provide a standard set of
+variables to control install paths. Otherwise, the package is
+incorrectly installed into 'lib' (instead of 'lib64') on 64-bit systems.
+While this could be solved via providing custom variables for each
+directory, it is simpler to reuse what's already in CMake.
+---
+ CMakeLists.txt              | 21 +++++++++------------
+ cmake/SnappyConfig.cmake.in |  8 ++++----
+ 2 files changed, 13 insertions(+), 16 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index de52666..1ca77c1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists)
+ INCLUDE(CheckCXXSourceCompiles)
+ INCLUDE(TestBigEndian)
+ INCLUDE(CMakePackageConfigHelpers)
++INCLUDE(GNUInstallDirs)
+ 
+ TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN)
+ IF (WORDS_BIG_ENDIAN)
+@@ -98,33 +99,29 @@ INSTALL(FILES snappy.h
+         snappy-c.h
+         snappy-sinksource.h
+         ${Snappy_BINARY_DIR}/snappy-stubs-public.h
+-        DESTINATION include)
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ INSTALL(TARGETS snappy
+         EXPORT SnappyTargets
+-        RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
+-INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION lib/cmake/Snappy)
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
+ 
+ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
+                       SOVERSION ${PROJECT_VERSION_MAJOR})
+ 
+-SET(INCLUDE_INSTALL_DIR include)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(BINARY_INSTALL_DIR bin)
+-
+ CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
+         ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+-        INSTALL_DESTINATION lib/Snappy/cmake
+-        PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR BINARY_INSTALL_DIR
++        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
++        PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
+         )
+ 
+ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+         COMPATIBILITY SameMajorVersion)
+ INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+         ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+-        DESTINATION lib/cmake)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ 
+ ENABLE_TESTING()
+ 
+diff --git a/cmake/SnappyConfig.cmake.in b/cmake/SnappyConfig.cmake.in
+index 5e604fe..d47656b 100644
+--- a/cmake/SnappyConfig.cmake.in
++++ b/cmake/SnappyConfig.cmake.in
+@@ -2,8 +2,8 @@ set(SNAPPY_VERSION @SNAPPY_MAJOR@.@SNAPPY_MINOR@.@SNAPPY_PATCHLEVEL@)
+ 
+ @PACKAGE_INIT@
+ 
+-set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+-set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@")
+-set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_BINARY_INSTALL_DIR@")
++set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
++set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_CMAKE_INSTALL_BINDIR@")
+ 
+-check_required_components(SNAPPY)
+\ No newline at end of file
++check_required_components(SNAPPY)
+-- 
+2.13.2
+
diff --git a/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
new file mode 100644
index 000000000000..0b7faa08772b
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
@@ -0,0 +1,37 @@
+From e801bd3553dc4e49e19a031ce4007620c35764f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 29 Jun 2017 11:14:37 +0200
+Subject: [PATCH 2/3] cmake: Correct & unify CMake install path
+
+The CMake file is using 'lib/cmake/Snappy', 'lib/Snappy/cmake'
+and 'lib/cmake' inconsistently. Replace all of them with a single
+'lib/cmake/Snappy' that matches most of standard CMake packages.
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ca77c1..3d1a304 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
+ 
+ CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
+         ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+-        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
++        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy
+         PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
+         )
+ 
+@@ -121,7 +121,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+         COMPATIBILITY SameMajorVersion)
+ INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+         ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
+ 
+ ENABLE_TESTING()
+ 
+-- 
+2.13.2
+
diff --git a/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
new file mode 100644
index 000000000000..b1b8a2cd5e97
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -0,0 +1,28 @@
+From 93d30c53e28759c9dbe82535821f3b1df29e5767 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 29 Jun 2017 10:01:37 +0200
+Subject: [PATCH 3/3] cmake: Add missing linking to GTEST_LIBRARIES
+
+Since the snappy_unittest target uses gtest routines (when available),
+it needs to link to gtest explicitly. Otherwise, the build fails due
+to unavailable gtest symbols.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d1a304..9f2cc23 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -144,7 +144,7 @@ ENDIF (HAVE_LIBQUICKLZ)
+ ADD_EXECUTABLE(snappy-unittest snappy_unittest.cc snappy-test.cc)
+ TARGET_COMPILE_DEFINITIONS(snappy-unittest PRIVATE -DHAVE_CONFIG_H)
+ TARGET_LINK_LIBRARIES(snappy-unittest snappy ${COMPRESSION_LIBS}
+-                      ${GFLAGS_LIBRARIES})
++                      ${GFLAGS_LIBRARIES} ${GTEST_LIBRARIES})
+ TARGET_INCLUDE_DIRECTORIES(snappy-unittest BEFORE PRIVATE ${Snappy_SOURCE_DIR}
+                            ${GTEST_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS})
+ 
+-- 
+2.13.2
+
diff --git a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
new file mode 100644
index 000000000000..3327b8bcf0ac
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -0,0 +1,31 @@
+From 1c9f699a6275f085ad710c9ae940e096ce552452 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 31 Jul 2017 20:49:22 +0200
+Subject: [PATCH] cmake: Add missing linking to GTEST_LIBRARIES
+
+Since the snappy_unittest target uses gtest routines (when available),
+it needs to link to gtest explicitly. Otherwise, the build fails due
+to unavailable gtest symbols.
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f534b1..3a44aa9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,10 @@ if(SNAPPY_BUILD_TESTS)
+       "${PROJECT_SOURCE_DIR}/snappy-test.cc"
+   )
+   target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
+-  target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
++  target_link_libraries(snappy_unittest
++    snappy
++    ${GFLAGS_LIBRARIES}
++    ${GTEST_LIBRARIES})
+ 
+   if(HAVE_LIBZ)
+     target_link_libraries(snappy_unittest z)
+-- 
+2.14.1
+