Use system zlib on all non-Windows systems if available.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

3 files changed, 24 insertions, 34 deletions

diff --git a/dev-libs/libgit2/ChangeLog b/dev-libs/libgit2/ChangeLog
index 2888918f29fd..03b3c558a95d 100644
--- a/dev-libs/libgit2/ChangeLog
+++ b/dev-libs/libgit2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libgit2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/ChangeLog,v 1.1 2011/06/30 21:02:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/ChangeLog,v 1.2 2011/06/30 22:06:33 radhermit Exp $
+
+  30 Jun 2011; Tim Harder <radhermit@gentoo.org>
+  files/libgit2-0.13.0-system-zlib.patch:
+  Use system zlib on all non-Windows systems if available.
 
 *libgit2-0.13.0 (30 Jun 2011)
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 4341c2fd4505..9597ab666a3e 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libgit2-0.13.0-system-zlib.patch 1657 RMD160 6a85b5ea26da4201ee1d45ad478082c6c30772a9 SHA1 e12cc7870a05b282cccf1e6c5ed731fba31ef159 SHA256 cca6928d41d9b4661ef326501749587025f57887594c82defbba5802d3ff3068
+AUX libgit2-0.13.0-system-zlib.patch 865 RMD160 33175df8d8f00c910b39ccadb4be207f357033b3 SHA1 fc67c4428211efdba90cf9a01679d6d3a5cf72e8 SHA256 f9c7baa71d0d2d06ec72df9ab4a5bd763d33ab02a58a123bc6136a48dec32869
 DIST libgit2-0.13.0.tar.gz 885877 RMD160 c1b68809e15fcad0c53c75a0ff8bc770e66bbed2 SHA1 c66525f59f7f7f15b9ac022a89b7bb4e9d53fa2d SHA256 ae9a3666e09695a23e8e73de472f0306ce89a09c7d855afa643c1f28bb9c5725
 EBUILD libgit2-0.13.0.ebuild 867 RMD160 2621709fd6f68b2cb5c394a22e1f62ffb1ac297e SHA1 4e66cac043e78b18751d0dc2bd0a653e59ae8188 SHA256 50a3283eaa26bb382a3e103bedf95c9804839ff355f1d570aa94236d0c569230
-MISC ChangeLog 389 RMD160 f250fb170c22978c51fb0ffc6c30508e5c3cb06f SHA1 ee4631391bf10a9b0c0de12744114bd9d4125111 SHA256 dff6b6a81301d694d7aa8063f18c21892e7ad82aa0a30c0e0d890fe6eff6bbb6
+MISC ChangeLog 540 RMD160 f2948b8db873c68e3b26f4cb24784d2c564b1d43 SHA1 07ccb21a2bee75d1e245172f2eeb09990e84344a SHA256 048d783f3805a634bb940dc5d94d027043262a440377694add74e2775550a3b9
 MISC metadata.xml 540 RMD160 5f6eb9f2ea0364e43fb7958af4474c52c378a014 SHA1 ce319b4230d61b53eca3102d8c9aca926addab13 SHA256 b8037d826224b8a642c198a1a2f35ceda36d6ed8a3bd847be152e5a396c2eaa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJODOR5AAoJEEqz6FtPBkyjB0IH/2nSXVq1Z1JlxoPlFPJUDtSz
-pjTZBEZaYFRr5hHNDiVFRtYI3o/+G2wqR+PzUS1B6vMb0uwMdbcF2en+wYVKql8j
-q0UFpy1dai4FhY+cLw3mUnZazW1NYDOfHqMZpuDPfk6b5eyjogssHqbdPzCbP2j/
-2BDtBHJwOCn1Z1YqYpPFaP133puRJr3w02gmDwaObgdsrZ1Crzlq7RfRkOKA/HoS
-Z8HdzYyGJpW47Ptu+kK7MshyjyDqo7HIvePNFF9U4CSIhCnlFAUhJSWXC7YIE1Ci
-Dc8vsHzZlKzY9guKuzSHJJFI3ZteBHEqMyZaZJ/b+D94e9gZRt6yon2AmTerM4Q=
-=IEBn
+iQEcBAEBAgAGBQJODPNuAAoJEEqz6FtPBkyj1MkH/j/aNixQ6fXvOpCnOn9FAbVm
+JAVR7y9lVF/i4rqgrSiA3ExVo2Sl9fi6pM8D2qehGkfmi8TWiLVbgRDmc5ArgPFI
+2a3ETz3Mv3k2m0MqoH+CGJU6WSvES/+0DYdOV8fmHKDlbo69oPl0X9g+6oxBVXrQ
+i/AVwv0a/yIBhD0IBiGvFFUWRlYaJM/NYXrFMtdLffduI8k1gAF4PsmAiLWWKJSF
+tVIaMTIRFBZ8/OkHXX7E8GvkIYFE8X6snG0KmIWbcxqsp0LOWVeozsNejNqvZ2Bm
+eAUV0X2Zon3Moo6erE7X68W+MYlJj4CtaoyzI56sT9LgrO85BdRGwfZ056rXCqs=
+=9kCC
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch b/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch
index 5353af03c36e..8f6dab51b373 100644
--- a/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch
+++ b/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch
@@ -1,22 +1,26 @@
 --- libgit2-0.13.0/CMakeLists.txt.orig
 +++ libgit2-0.13.0/CMakeLists.txt
-@@ -22,7 +22,14 @@
+@@ -22,7 +22,18 @@
  SET(LIBGIT2_VERSION_STRING "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_REV}")
  
  # Find required dependencies
 -INCLUDE_DIRECTORIES(deps/zlib src include)
 +INCLUDE_DIRECTORIES(src include)
-+IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+	find_package(ZLIB REQUIRED)
-+	INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIRS} )
-+ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++IF (NOT WIN32)
++	find_package(ZLIB)
++ENDIF()
++
++IF (ZLIB_FOUND)
++	INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
++	LINK_LIBRARIES(${ZLIB_LIBRARIES})
++ELSE (ZLIB_FOUND)
 +	INCLUDE_DIRECTORIES(deps/zlib)
 +	FILE(GLOB SRC_ZLIB deps/zlib/*.c)
 +ENDIF()
  
  # Installation paths
  SET(INSTALL_BIN bin CACHE PATH "Where to install binaries to.")
-@@ -57,7 +64,6 @@
+@@ -57,7 +68,6 @@
  
  # Collect sourcefiles
  FILE(GLOB SRC src/*.c src/backends/*.c)
@@ -24,21 +28,3 @@
  FILE(GLOB SRC_SHA1 src/block-sha1/*.c)
  FILE(GLOB SRC_PLAT src/unix/*.c)
  FILE(GLOB SRC_H include/git2/*.h)
-@@ -70,7 +76,7 @@
- 
- # Compile and link libgit2
- ADD_LIBRARY(git2 ${SRC} ${SRC_PLAT} ${SRC_SHA1} ${SRC_ZLIB})
--TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT})
-+TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES})
- SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING})
- SET_TARGET_PROPERTIES(git2 PROPERTIES SOVERSION ${LIBGIT2_VERSION_MAJOR})
- 
-@@ -92,7 +98,7 @@
- 	FILE(GLOB SRC_TEST tests/t??-*.c)
- 
- 	ADD_EXECUTABLE(libgit2_test tests/test_main.c tests/test_lib.c tests/test_helpers.c ${SRC} ${SRC_PLAT} ${SRC_SHA1} ${SRC_TEST} ${SRC_ZLIB})
--	TARGET_LINK_LIBRARIES(libgit2_test ${CMAKE_THREAD_LIBS_INIT})
-+	TARGET_LINK_LIBRARIES(libgit2_test ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES})
- 
- 	ENABLE_TESTING()
- 	ADD_TEST(libgit2_test libgit2_test)