app-arch/snappy: Bump to 1.1.6 that includes SONAME fix

5 files changed, 17 insertions, 17 deletions

diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 23b469f7acc9..9f20015b4971 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,3 +1,3 @@
 DIST snappy-1.1.2.tar.gz 1485435 SHA256 f9d8fe1c85494f62dbfa3efe8e73bc23d8dec7a254ff7fe09ec4b0ebfc586af4 SHA512 da0e80528dfc815d765347c60dc5f14bc7fb882cc6894b87d3a43dec1a127cf8bcfe46e6cb93e130790c0ebd67368a1042500d9080f844441803c1b69c3cc07e WHIRLPOOL a9cf520cc578a0a63ebb7fb127428b50d282cdf2448938ad88349f775e21b3dd27f2c6843f86dd749d66e9df5e29094bc5c67032f0219932fec69f882ec91246
 DIST snappy-1.1.3.tar.gz 1509026 SHA256 2f1e82adf0868c9e26a5a7a3115111b6da7e432ddbac268a7ca2fae2a247eef3 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf WHIRLPOOL 97f82d1439973582f0ba3fde43ba2ee2c23b2512e0ee426b9e372fbfbba87921355c1f6bf0bf80671d7c4da26a23d480508cb7a188e414b9cb5d95996bfabe39
-DIST snappy-1.1.5.tar.gz 1128197 SHA256 c67d8d23387b1902ceff134af26e401d5412c510adeeabe6bb6b47c106b08e45 SHA512 99f29f3b4ada0b25692f594a17c0c4b2625fb6c6ffbc875b8dd940fd8080f1e9afdb000c866380f2375246e7b3fbab8521e1bb4d226789798459c628318d571b WHIRLPOOL f0947129ab01bf9545bc5138a5382c555ff1f1b032fe9d53f045ef07ddc79ad0bc2a7fbdd6d058e126b07942c43fa155de2af5070d1df8edbaa677184d63f684
+DIST snappy-1.1.6.tar.gz 1128388 SHA256 6fa92cde5b2caefd0d9a60336991ba42e5a7ddc3bdc36c5610451373751d0495 SHA512 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf WHIRLPOOL 87ee2fd77e4c68911d5bd5c5a278460b8e4200a2b4c96a454b2af0b61444588dfad68015effd22bebfb2bf8f9d3e0c6b8f8cc3e89614626f0bc1f91b18402eec
diff --git a/app-arch/snappy/files/snappy-1.1.5-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
index 468a11618c38..b83bc93465af 100644
--- a/app-arch/snappy/files/snappy-1.1.5-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
@@ -1,4 +1,4 @@
-From a35f15515db7cdfdee2b7fd04624d1b6c9a8a6bc Mon Sep 17 00:00:00 2001
+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 &
@@ -15,7 +15,7 @@ directory, it is simpler to reuse what's already in CMake.
  2 files changed, 13 insertions(+), 16 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c79e46..adda7fa 100644
+index de52666..1ca77c1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists)
@@ -26,7 +26,7 @@ index 2c79e46..adda7fa 100644
  
  TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN)
  IF (WORDS_BIG_ENDIAN)
-@@ -98,32 +99,28 @@ INSTALL(FILES snappy.h
+@@ -98,33 +99,29 @@ INSTALL(FILES snappy.h
          snappy-c.h
          snappy-sinksource.h
          ${Snappy_BINARY_DIR}/snappy-stubs-public.h
@@ -44,7 +44,8 @@ index 2c79e46..adda7fa 100644
 +        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
  
- SET_TARGET_PROPERTIES(snappy PROPERTIES SOVERSION ${PROJECT_VERSION})
+ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
+                       SOVERSION ${PROJECT_VERSION_MAJOR})
  
 -SET(INCLUDE_INSTALL_DIR include)
 -SET(LIBRARY_INSTALL_DIR lib)
diff --git a/app-arch/snappy/files/snappy-1.1.5-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
index ab2412757913..0b7faa08772b 100644
--- a/app-arch/snappy/files/snappy-1.1.5-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
@@ -1,4 +1,4 @@
-From 0f0ff7be9bd4d2ad2cd7e5c6092b1d0261c09335 Mon Sep 17 00:00:00 2001
+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
@@ -11,10 +11,10 @@ and 'lib/cmake' inconsistently. Replace all of them with a single
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index adda7fa..b88cb20 100644
+index 1ca77c1..3d1a304 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -112,7 +112,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES SOVERSION ${PROJECT_VERSION})
+@@ -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
@@ -23,7 +23,7 @@ index adda7fa..b88cb20 100644
          PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
          )
  
-@@ -120,7 +120,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+@@ -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
diff --git a/app-arch/snappy/files/snappy-1.1.5-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
index 3d7d8fcb59d3..b1b8a2cd5e97 100644
--- a/app-arch/snappy/files/snappy-1.1.5-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
@@ -1,4 +1,4 @@
-From 57b13b68466e2ac81d8faa2c92f55e629a3184f8 Mon Sep 17 00:00:00 2001
+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
@@ -11,10 +11,10 @@ to unavailable gtest symbols.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b88cb20..bbe4d38 100644
+index 3d1a304..9f2cc23 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -143,7 +143,7 @@ ENDIF (HAVE_LIBQUICKLZ)
+@@ -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}
diff --git a/app-arch/snappy/snappy-1.1.5.ebuild b/app-arch/snappy/snappy-1.1.6.ebuild
index d1daec39ebb8..bd50aa801442 100644
--- a/app-arch/snappy/snappy-1.1.5.ebuild
+++ b/app-arch/snappy/snappy-1.1.6.ebuild
@@ -9,8 +9,7 @@ HOMEPAGE="https://github.com/google/snappy"
 SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-# matches SONAME...
-SLOT="0/${PV}"
+SLOT="0/${PV%%.*}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 # upstream killed static lib support with build system update
@@ -29,9 +28,9 @@ DOCS=( format_description.txt framing_format.txt NEWS README.md )
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}"/snappy-1.1.5-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
-		"${FILESDIR}"/snappy-1.1.5-0002-cmake-Correct-unify-CMake-install-path.patch
-		"${FILESDIR}"/snappy-1.1.5-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+		"${FILESDIR}"/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
+		"${FILESDIR}"/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
+		"${FILESDIR}"/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
 	)
 
 	# command-line option parsing does not work at all, so just force