commit: 568445786e491b85e6e1e911670b13b5d2f6d912
Author: Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 30 18:59:43 2014 +0000
Commit: Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 30 19:03:26 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=56844578
dev-libs/libgit2-glib: sync with portage
but drop deprecated py3.2 support.
---
.../files/libgit2-glib-0.0.24-automagic-ssh.patch | 75 ++++++++++++++++++++++
dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild | 10 ++-
2 files changed, 82 insertions(+), 3 deletions(-)
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 0000000..5c3904c
--- /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
index ccdc887..14bb4b0 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild
@@ -5,11 +5,11 @@
EAPI=5
GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4} )
VALA_MIN_API_VERSION="0.22"
VALA_USE_DEPEND="vapigen"
-inherit gnome2 python-r1 vala
+inherit autotools eutils gnome2 python-r1 vala
DESCRIPTION="Git library for GLib"
HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib";
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib";
LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="python vala"
+IUSE="python ssh +vala"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -28,6 +28,7 @@ RDEPEND="
python? (
${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_USEDEP}] )
+ ssh? ( dev-libs/libgit2[ssh] )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.11
@@ -36,6 +37,8 @@ DEPEND="${RDEPEND}
"
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
}
@@ -43,5 +46,6 @@ src_prepare() {
src_configure() {
gnome2_src_configure \
$(use_enable python) \
+ $(use_enable ssh) \
$(use_enable vala)
}
