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

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 78 insertions, 1 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/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>