Use external library for http-parser and add ssh use flag to control SSH transport support.

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 89 insertions, 10 deletions

diff --git a/dev-libs/libgit2/ChangeLog b/dev-libs/libgit2/ChangeLog
index 8cca9d671334..267867fe88d2 100644
--- a/dev-libs/libgit2/ChangeLog
+++ b/dev-libs/libgit2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libgit2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/ChangeLog,v 1.14 2013/06/25 18:19:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/ChangeLog,v 1.15 2013/07/16 09:49:54 radhermit Exp $
+
+*libgit2-0.19.0-r1 (16 Jul 2013)
+
+  16 Jul 2013; Tim Harder <radhermit@gentoo.org> +libgit2-0.19.0-r1.ebuild,
+  +files/libgit2-0.19.0-automagic-libssh2.patch, metadata.xml:
+  Use external library for http-parser and add ssh use flag to control SSH
+  transport support.
 
 *libgit2-0.19.0 (25 Jun 2013)
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index c58e5dc965dc..dd1bd1729183 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX libgit2-0.17.0-cflags.patch 658 SHA256 90d0ef9f55bf7652bdb6c1c0268781b24f0c87bdcbe8a984896e51c6f8ba4a15 SHA512 3d71b765a6bf4cf745002264769fb942f0680be31ab75f78c0a16c2c75b72ff61412d088926280aba212c6cffd80e74bef79c4f9816e0cb16db6eaf4a444b708 WHIRLPOOL 8601ae12b753d30ee7358d9abcac8d7e1bd64450f3fbcc00b034de8e3afd213f3e598f03eb044593218b776f8905fef353319d3d9d57cfd39cf02485193029ab
+AUX libgit2-0.19.0-automagic-libssh2.patch 744 SHA256 b4203fdc304faaa5a8351b3fcc6b1d7f922d85c59ae3bc7ef8d10176e894e827 SHA512 e8a23db4a2416f93bcb823e630726fade3e532648743b95a7deffce9ec0a75e612b33a83bfac1dc08e82c4b8b343339a0b12112c1c2aa7bb115e84dafdde9f50 WHIRLPOOL 471f21a37e83728f19d529ae8aab011a8b831efd745b5faf5edae7bc01fd3215ff1e70004018b6585dc7e2af1c0b2555a4c634bafdf2184dd74d68940b0a7a8e
 DIST libgit2-0.16.0.tar.gz 1042613 SHA256 b84e5353ebc41e785f777a4977da9fa3eaf19f71c07eb2a2c23c2ceafb811597 SHA512 cc12ce986ee9d179a7e5b01607d69ee212a4885b0487a06d5cfaba3ecb538932fc9baec86dcb44936e47ab8eb43838b9b4108541c07833d9d688e36cd03ab8c6 WHIRLPOOL 5f557998f3be9e984c78c89fd5a6036f1b44100bcf1c6c12c9dd8a59193dea827498a3ba5e1fc822eb537880607f152ddc9daa1693c972a62098947196d78dd1
 DIST libgit2-0.17.0.tar.gz 2096159 SHA256 068eed0b8fe852a7cc55aae46d2299e9c9e3e00badc1c293d72a9dd122226018 SHA512 a51420ae78be1f81104afdb58fdb9d7681a1a3ec3ee907b04bc2f2c5a8629a331b34d0fc67fa8e98d809a4352971149307553bbfec6799d919e84d292456a764 WHIRLPOOL c37f0301487375b47b77f4f7869830e2dc9d0c4227c36e3a7e8e72b7f27794be321dd047f13394f2828016bcbeb1375784ad873743b2c0e45bfb85b2c8a463cb
 DIST libgit2-0.18.0.tar.gz 2958095 SHA256 88a6ef6f87905e0b574123b85c5746025a408c6169e754906e939acbca75ac5f SHA512 3fc1610667a4a0bb9d7ace11e65d590178bcd8687a2866fa7687123468bad7dcaf6365b3e593b686e727bc62746e655eb4a08d5ddb7d69e65c5bad1b1e6fc2be WHIRLPOOL 9ffa51954b893bb0ef5ac6a1866282e11ffbd6e9277e20222ddb34e45af16df8a0ab1014425ae956baf0ab905cc0875a67ad9c7c86e02ac700b43940a1be301a
@@ -9,17 +10,18 @@ DIST libgit2-0.19.0.tar.gz 3122978 SHA256 f526f8cf5547c70fe00169d587ca18367541a9
 EBUILD libgit2-0.16.0.ebuild 895 SHA256 ecdf998b2a5c407e1053258338e21c8b1fd25445032436ef6dfb5820f955cc22 SHA512 3b750d44c423fbdc31a938078b20fc60e1b48ad8975c791bb69dabf6bf0d3b3c8bc55478149dc6ed36310ccb26737aaae646d1fae52295c5784f0fd2d89f85f0 WHIRLPOOL 12d3ae7c3d7d8f2ede7fdd65969d4b7046d0fe72690c55923c7ffb779d0d7d2f9368ff2243f25cd9039b90e30e232708a9f069a9021ef52aa0f209341d11cb54
 EBUILD libgit2-0.17.0.ebuild 941 SHA256 78e5e0d9e9bb0de5c0e8fc1eb93b69d678e902afe320d79118c465173357ad08 SHA512 9469ae73ce1d964add6aef484951dbbde26dbb92ec43ac380c45fb54f8be80407465db63ae1e556b739207e0fd5e9d5b3bb3a3a403c30e3f20aceea8612e4324 WHIRLPOOL 170c21d8ae79ea9db5e7b8e90f3c2efbc0f0706034b7a2de6d2a081464da42951efd7f5162d86b86311b4189e08a4e317cd6efa319a55c8f65e6dd202e584662
 EBUILD libgit2-0.18.0.ebuild 928 SHA256 d7bd50ed0aa5e0aa59b4020d5dfbf3d65c9ce85cb0a75aaff5a838b5e6987ed9 SHA512 83db45d633001e5c5c8d673967cffdb367e2c789fd31a148e981cf64e9cbed3f0c2de86b50d222c92682f799790401997d59d0b2850e12e92a16afd5a9fbeaab WHIRLPOOL 3aa48db23013c4c5259e3a7f5bd68de1ca9844a9e3067d7841c92b50ef35936a5ee3561cd2104db468372cbe7ee78cf20f64843452dfb87541b65a67fae924f6
+EBUILD libgit2-0.19.0-r1.ebuild 1076 SHA256 fd17cdbaaee59213cffa1db55104c0a9a09f8432d231412ea02e088ab3af0088 SHA512 f166f50271bcc2d501875ef5c23fd8866327421fccc7bc547d2bd713b060d8fc2102c5f9d63b1f89a9591d86785516617459b288aebcf3b87867ae1462fa4305 WHIRLPOOL e90264ff351625e819cbd48cc625ad70f2ec58eb4a3331f355ae2e47d71e6b94be388b73d16d1eb650113699bd3cd484995171e97b90cdea7a71ae477e22c992
 EBUILD libgit2-0.19.0.ebuild 928 SHA256 9ca56d1c87e5f1b1060067c6dd023212dfd258167bf7825c8578a9c206956486 SHA512 67c2ff1a485eae5332da8a779f91750b8b4a425645603c67b410e4ebdb3983e5019229e990de035123b0f79189cb91b91c41635e6928b6969ffd0de5ea8b051f WHIRLPOOL 06fe0a9e695e53af6ba5e53513510f48145291ce2f03d33fbb9834c9c905218e501394f1756575b5408abf2d3be7360c1676450493a94760d33073cbab4e9807
-MISC ChangeLog 1912 SHA256 aed3f318ad321d6ba4b0e0a33d59fe4abb1f636566b89c3f3f2924a79f1c55ec SHA512 601e227814c260a1a979c5ca2572e4391a9fd3e1770c583090601c089c0d81aa3f11d803b59d95f817dc63197b5a6944d322aa5dd8fb4aaa4e0126fd47808d22 WHIRLPOOL fd52294f9db8722d516087e5b25d5ad81d13ccb1261362cc84b414c0efc75c14269e47cae393e281a86d4ad92c9c5cb20c37ce93545de7f0a9c73688d6b2b6b9
-MISC metadata.xml 518 SHA256 0cee5ccd29e738742a9e67c0f56de98559c969f57a27f9a5c449b46e36cb3da4 SHA512 6f832f6a1b6c6068881d482496b5f32078a659dc9718cf66723645c9c70a9167baa761936da884a38455b8ab8d64675b73e65a4c5a9efef9f223d340a10e8815 WHIRLPOOL c17bcff5bb755e35f6b418b4943e92269f06525f4ac148f0ae8e9baedcad70141c15a7b1b9fe886482718173d09d1e50f39ada4079118c2c634b972ce82cc444
+MISC ChangeLog 2182 SHA256 282f19aa4cd775cd3a9bd759d21051aad3306ae27bcc85d438619afefca0e3b2 SHA512 c81b3a06c2cdda3bf37d1dfe5cefba8a75f31b5ec9adc826455c8000172faa36ca556316972dfa8635d114831a7b84c18395ed0742e31ac3d2786ca26ea0cb1c WHIRLPOOL 2b0825100c4d5a90d4400e7b26530b97748df10fea83da1f7d7878d9c78d5815c2fae01406607c6053f05f742a91335607d51609c69cacd3f11c235ef9aa1e43
+MISC metadata.xml 588 SHA256 5eb64eee22a2fea75bafe03b3eca0492cc4eebdd9f1556f9ad5609f85716073f SHA512 d8f607477dd40b0de376a4f6dfc174a5f7672cf9296068e407e2a4d75d6029b36c84c20b79909493f31bc731354324d6d431d3f5784db18299e64cea8fc44f49 WHIRLPOOL 7f14d3b0ade29a9f77ce145b6404e5f1bbc2d94ed6066ee19afa3424b5d36fb19a775f3799a3fea1c46ecf20d527a8ab1b5e4393543ab5cfbec4ae1268fec994
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRyd9QAAoJEEqz6FtPBkyjdy4IALf3LiTPFADQulUEldfRhXEF
-hupFRqI9a/FMe5TQB1arZ+ya/49HU4TqWeasZQhap/qHQtBr3sbxx3//MSQQuVTX
-iegBElX4mVoDz/q7+GHAO3jcMSSNfDcp2eJHH3266wcnK/DYodwBTOYD6LALhest
-IRKIo6KPiWLH45Y6NrE5mu2G39DZqz6QtKfbeDpb3gM5BkXOFMF85mDi3ssp40eN
-OURdE6t/XZQlUMkCtGQswT68xA8QTUVGDdjN54l0ZD5EbX3FXwGpfGP+2cjGl/V/
-0yy1NXei74lakdwp7GfNh6C0TExziBQp6GFD/vyUmEyH6VbZmB9FTTozK7QEo4g=
-=TKmk
+iQEcBAEBCAAGBQJR5RdDAAoJEEqz6FtPBkyjlW0H/iv4KEWPV96XP4xZ7UY3X7kX
+C6FlFMH4lsiDBqBdtEvhhlaPUT3oe4NdBAfvtxC/+VJJgBYruI0rFHdWam3f3GDQ
+oY+dr622/8Zf81p1WWoWjDg5CjoLrWfTMJ870dVefxcRPwNr0ic5uAnnoe3rj8Bb
+asie78wB2klah6mQoHFE6B7waMZm1ZTYF4MGKeYJIex3LRxLEvZ77lHIiBFsYvh6
+MAH6MTSRBjxm9Z2ANz546FTTzj3w2SIxHhYdFX2jNsqVWYKHUI2W2/048HrhyAc9
+uIUM4A4VAfscYy7IBYuGBxj6H9UCfbyd6yqA+WI+yclujpi8+poSoMo2hL/QyAE=
+=uDbW
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgit2/files/libgit2-0.19.0-automagic-libssh2.patch b/dev-libs/libgit2/files/libgit2-0.19.0-automagic-libssh2.patch
new file mode 100644
index 000000000000..afd8935dc893
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-0.19.0-automagic-libssh2.patch
@@ -0,0 +1,23 @@
+--- libgit2-0.19.0/CMakeLists.txt
++++ libgit2-0.19.0/CMakeLists.txt
+@@ -20,6 +20,7 @@
+ # Build options
+ #
+ OPTION( SONAME				"Set the (SO)VERSION of the target"		ON  )
++OPTION( ENABLE_SSH			"Enable SSH transport support"			OFF )
+ OPTION( BUILD_SHARED_LIBS	"Build Shared Library (OFF for Static)"	ON  )
+ OPTION( THREADSAFE			"Build libgit2 as threadsafe"			OFF )
+ OPTION( BUILD_CLAR			"Build Tests using the Clar suite"		ON  )
+@@ -151,10 +152,8 @@
+ 	FILE(GLOB SRC_ZLIB deps/zlib/*.c)
+ ENDIF()
+ 
+-IF(NOT LIBSSH2_LIBRARY)
+-	FIND_PACKAGE(LIBSSH2 QUIET)
+-ENDIF()
+-IF (LIBSSH2_FOUND)
++IF(ENABLE_SSH)
++	FIND_PACKAGE(LIBSSH2 REQUIRED)
+ 	ADD_DEFINITIONS(-DGIT_SSH)
+ 	INCLUDE_DIRECTORIES(${LIBSSH2_INCLUDE_DIR})
+ 	SET(SSH_LIBRARIES ${LIBSSH2_LIBRARIES})
diff --git a/dev-libs/libgit2/libgit2-0.19.0-r1.ebuild b/dev-libs/libgit2/libgit2-0.19.0-r1.ebuild
new file mode 100644
index 000000000000..28deed5201a0
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.19.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/libgit2-0.19.0-r1.ebuild,v 1.1 2013/07/16 09:49:54 radhermit Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="http://libgit2.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
+IUSE="examples ssh test"
+
+RDEPEND="sys-libs/zlib
+	net-libs/http-parser
+	ssh? ( net-libs/libssh2 )"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${P}-automagic-libssh2.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		$(cmake-utils_use_enable ssh SSH)
+		$(cmake-utils_use_build test CLAR)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		find examples -name .gitignore -delete
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml
index bd3bab11eb24..2a4a9abf7a50 100644
--- a/dev-libs/libgit2/metadata.xml
+++ b/dev-libs/libgit2/metadata.xml
@@ -10,4 +10,7 @@
 		as a re-entrant linkable library with a solid API, allowing you to write native
 		speed custom Git applications in any language which supports C bindings.
 	</longdescription>
+	<use>
+		<flag name="ssh">Enable SSH transport support</flag>
+	</use>
 </pkgmetadata>