Version bump, now covers more of libgit2's API

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

4 files changed, 136 insertions, 1 deletions

diff --git a/dev-libs/libgit2-glib/ChangeLog b/dev-libs/libgit2-glib/ChangeLog
index 898e682973ae..cfe132111ac9 100644
--- a/dev-libs/libgit2-glib/ChangeLog
+++ b/dev-libs/libgit2-glib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libgit2-glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/ChangeLog,v 1.18 2014/06/24 00:58:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/ChangeLog,v 1.19 2014/11/24 04:59:06 tetromino Exp $
+
+*libgit2-glib-0.0.24 (24 Nov 2014)
+
+  24 Nov 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgit2-glib-0.0.24.ebuild, +files/libgit2-glib-0.0.24-automagic-ssh.patch,
+  metadata.xml:
+  Version bump, now covers more of libgit2's API
 
 *libgit2-glib-0.0.16 (24 Jun 2014)
 
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch
new file mode 100644
index 000000000000..5c3904cc0062
--- /dev/null
+++ b/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch
@@ -0,0 +1,75 @@
+diff --git a/configure.ac b/configure.ac
+index 8c1559c..94175c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,32 +79,44 @@ dnl ===========================================================================
+ dnl Check for libgit2 ssh support
+ dnl ===========================================================================
+ 
+-AC_MSG_CHECKING([for libgit2 ssh support])
+-
+-cflags_save="${CFLAGS}"
+-libs_save="${LIBS}"
+-
+-CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
+-LIBS="${LIBGIT2_GLIB_LIBS}"
+-
+-AC_TRY_RUN([
+-        #include <git2.h>
+-        int
+-        main(int argc, const char *argv[])
+-        {
+-                git_threads_init ();
+-                return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
+-        }
+-],[
+-    AC_MSG_RESULT([yes])
+-    git_ssh=yes
+-],[
+-    AC_MSG_RESULT([no])
+-    git_ssh=no
+-])
+-
+-CFLAGS="${cflags_save}"
+-LIBS="${libs_save}"
++AC_ARG_ENABLE([ssh],
++              AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
++              [enable_ssh=$enableval],
++              [enable_ssh="auto"])
++
++git_ssh=no
++
++if test "x$enable_ssh" != "xno"; then
++    AC_MSG_CHECKING([for libgit2 ssh support])
++
++    cflags_save="${CFLAGS}"
++    libs_save="${LIBS}"
++
++    CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
++    LIBS="${LIBGIT2_GLIB_LIBS}"
++
++    AC_TRY_RUN([
++            #include <git2.h>
++            int
++            main(int argc, const char *argv[])
++            {
++                    git_threads_init ();
++                    return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
++            }
++    ],[
++        AC_MSG_RESULT([yes])
++        git_ssh=yes
++    ],[
++        AC_MSG_RESULT([no])
++        git_ssh=no
++        if test "x$enable_ssh" = "xyes"; then
++            AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
++        fi
++    ])
++
++    CFLAGS="${cflags_save}"
++    LIBS="${libs_save}"
++fi
+ 
+ if test "x$git_ssh" = "xyes"; then
+ 	LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild
new file mode 100644
index 000000000000..20496cb69258
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild,v 1.1 2014/11/24 04:59:06 tetromino Exp $
+
+EAPI=5
+
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils gnome2 python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python ssh vala"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/libgit2-0.21.0:=
+	>=dev-libs/glib-2.28.0:2
+	>=dev-libs/gobject-introspection-0.10.1
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+	ssh? ( dev-libs/libgit2[ssh] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.0.24-automagic-ssh.patch" # make libgit2[ssh] dep non-magic
+	eautoreconf
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable vala)
+}
diff --git a/dev-libs/libgit2-glib/metadata.xml b/dev-libs/libgit2-glib/metadata.xml
index 6e0e2ecb48ca..a0afca69a125 100644
--- a/dev-libs/libgit2-glib/metadata.xml
+++ b/dev-libs/libgit2-glib/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome</herd>
+  <use>
+  	<flag name="ssh">Enable SSH transport support</flag>
+  </use>
 </pkgmetadata>