diff options
Diffstat (limited to 'dev-libs/libgit2-glib')
| -rw-r--r-- | dev-libs/libgit2-glib/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch | 93 | ||||
| -rw-r--r-- | dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild | 51 |
3 files changed, 152 insertions, 2 deletions
diff --git a/dev-libs/libgit2-glib/ChangeLog b/dev-libs/libgit2-glib/ChangeLog index 3bdd5118cc73..2a532b839638 100644 --- a/dev-libs/libgit2-glib/ChangeLog +++ b/dev-libs/libgit2-glib/ChangeLog @@ -1,6 +1,12 @@ # 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.21 2014/12/22 23:20:54 eva Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/ChangeLog,v 1.22 2015/01/20 07:20:11 remi Exp $ + +*libgit2-glib-0.22.0 (20 Jan 2015) + + 20 Jan 2015; Rémi Cardona <remi@gentoo.org> +libgit2-glib-0.22.0.ebuild, + +files/libgit2-glib-0.22.0-automagic-ssh.patch: + Bump to 0.22.0, refresh automagic ssh patch, see bug #536830. 22 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> libgit2-glib-0.0.24.ebuild: diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch new file mode 100644 index 000000000000..9ec626486f66 --- /dev/null +++ b/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch @@ -0,0 +1,93 @@ +From e67a9ba456bc7f4b6b8c4899179d6b7a2863d592 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> +Date: Tue, 20 Jan 2015 08:12:41 +0100 +Subject: [PATCH] configure: Add flag to force on or off SSH support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Remove an automagic dependency on libgit2's SSH support. + +Signed-off-by: Rémi Cardona <remi@gentoo.org> +--- + configure.ac | 64 ++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 38 insertions(+), 26 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1bd96bc..61744db 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_libgit2_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_libgit2_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" +-- +2.2.1 + diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild new file mode 100644 index 000000000000..a598000250ca --- /dev/null +++ b/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 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.22.0.ebuild,v 1.1 2015/01/20 07:20:11 remi Exp $ + +EAPI=5 + +GCONF_DEBUG="no" +PYTHON_COMPAT=( python{3_3,3_4} ) +VALA_MIN_API_VERSION="0.22" +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.22.0-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) +} |