| 1 |
commit: 568445786e491b85e6e1e911670b13b5d2f6d912 |
| 2 |
Author: Rémi Cardona <remi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 30 18:59:43 2014 +0000 |
| 4 |
Commit: Remi Cardona <remi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 30 19:03:26 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=56844578 |
| 7 |
|
| 8 |
dev-libs/libgit2-glib: sync with portage |
| 9 |
|
| 10 |
but drop deprecated py3.2 support. |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/libgit2-glib-0.0.24-automagic-ssh.patch | 75 ++++++++++++++++++++++ |
| 14 |
dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild | 10 ++- |
| 15 |
2 files changed, 82 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..5c3904c |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch |
| 22 |
@@ -0,0 +1,75 @@ |
| 23 |
+diff --git a/configure.ac b/configure.ac |
| 24 |
+index 8c1559c..94175c9 100644 |
| 25 |
+--- a/configure.ac |
| 26 |
++++ b/configure.ac |
| 27 |
+@@ -79,32 +79,44 @@ dnl =========================================================================== |
| 28 |
+ dnl Check for libgit2 ssh support |
| 29 |
+ dnl =========================================================================== |
| 30 |
+ |
| 31 |
+-AC_MSG_CHECKING([for libgit2 ssh support]) |
| 32 |
+- |
| 33 |
+-cflags_save="${CFLAGS}" |
| 34 |
+-libs_save="${LIBS}" |
| 35 |
+- |
| 36 |
+-CFLAGS="${LIBGIT2_GLIB_CFLAGS}" |
| 37 |
+-LIBS="${LIBGIT2_GLIB_LIBS}" |
| 38 |
+- |
| 39 |
+-AC_TRY_RUN([ |
| 40 |
+- #include <git2.h> |
| 41 |
+- int |
| 42 |
+- main(int argc, const char *argv[]) |
| 43 |
+- { |
| 44 |
+- git_threads_init (); |
| 45 |
+- return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1; |
| 46 |
+- } |
| 47 |
+-],[ |
| 48 |
+- AC_MSG_RESULT([yes]) |
| 49 |
+- git_ssh=yes |
| 50 |
+-],[ |
| 51 |
+- AC_MSG_RESULT([no]) |
| 52 |
+- git_ssh=no |
| 53 |
+-]) |
| 54 |
+- |
| 55 |
+-CFLAGS="${cflags_save}" |
| 56 |
+-LIBS="${libs_save}" |
| 57 |
++AC_ARG_ENABLE([ssh], |
| 58 |
++ AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]), |
| 59 |
++ [enable_ssh=$enableval], |
| 60 |
++ [enable_ssh="auto"]) |
| 61 |
++ |
| 62 |
++git_ssh=no |
| 63 |
++ |
| 64 |
++if test "x$enable_ssh" != "xno"; then |
| 65 |
++ AC_MSG_CHECKING([for libgit2 ssh support]) |
| 66 |
++ |
| 67 |
++ cflags_save="${CFLAGS}" |
| 68 |
++ libs_save="${LIBS}" |
| 69 |
++ |
| 70 |
++ CFLAGS="${LIBGIT2_GLIB_CFLAGS}" |
| 71 |
++ LIBS="${LIBGIT2_GLIB_LIBS}" |
| 72 |
++ |
| 73 |
++ AC_TRY_RUN([ |
| 74 |
++ #include <git2.h> |
| 75 |
++ int |
| 76 |
++ main(int argc, const char *argv[]) |
| 77 |
++ { |
| 78 |
++ git_threads_init (); |
| 79 |
++ return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1; |
| 80 |
++ } |
| 81 |
++ ],[ |
| 82 |
++ AC_MSG_RESULT([yes]) |
| 83 |
++ git_ssh=yes |
| 84 |
++ ],[ |
| 85 |
++ AC_MSG_RESULT([no]) |
| 86 |
++ git_ssh=no |
| 87 |
++ if test "x$enable_ssh" = "xyes"; then |
| 88 |
++ AC_MSG_ERROR([libgit2 ssh support was requiested, but not found]) |
| 89 |
++ fi |
| 90 |
++ ]) |
| 91 |
++ |
| 92 |
++ CFLAGS="${cflags_save}" |
| 93 |
++ LIBS="${libs_save}" |
| 94 |
++fi |
| 95 |
+ |
| 96 |
+ if test "x$git_ssh" = "xyes"; then |
| 97 |
+ LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1" |
| 98 |
|
| 99 |
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild |
| 100 |
index ccdc887..14bb4b0 100644 |
| 101 |
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild |
| 102 |
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild |
| 103 |
@@ -5,11 +5,11 @@ |
| 104 |
EAPI=5 |
| 105 |
|
| 106 |
GCONF_DEBUG="no" |
| 107 |
-PYTHON_COMPAT=( python{3_2,3_3,3_4} ) |
| 108 |
+PYTHON_COMPAT=( python{3_3,3_4} ) |
| 109 |
VALA_MIN_API_VERSION="0.22" |
| 110 |
VALA_USE_DEPEND="vapigen" |
| 111 |
|
| 112 |
-inherit gnome2 python-r1 vala |
| 113 |
+inherit autotools eutils gnome2 python-r1 vala |
| 114 |
|
| 115 |
DESCRIPTION="Git library for GLib" |
| 116 |
HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib" |
| 117 |
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib" |
| 118 |
LICENSE="LGPL-2+" |
| 119 |
SLOT="0" |
| 120 |
KEYWORDS="~amd64 ~x86" |
| 121 |
-IUSE="python vala" |
| 122 |
+IUSE="python ssh +vala" |
| 123 |
|
| 124 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 125 |
|
| 126 |
@@ -28,6 +28,7 @@ RDEPEND=" |
| 127 |
python? ( |
| 128 |
${PYTHON_DEPS} |
| 129 |
dev-python/pygobject:3[${PYTHON_USEDEP}] ) |
| 130 |
+ ssh? ( dev-libs/libgit2[ssh] ) |
| 131 |
" |
| 132 |
DEPEND="${RDEPEND} |
| 133 |
>=dev-util/gtk-doc-am-1.11 |
| 134 |
@@ -36,6 +37,8 @@ DEPEND="${RDEPEND} |
| 135 |
" |
| 136 |
|
| 137 |
src_prepare() { |
| 138 |
+ epatch "${FILESDIR}/${PN}-0.0.24-automagic-ssh.patch" # make libgit2[ssh] dep non-magic |
| 139 |
+ eautoreconf |
| 140 |
use vala && vala_src_prepare |
| 141 |
gnome2_src_prepare |
| 142 |
} |
| 143 |
@@ -43,5 +46,6 @@ src_prepare() { |
| 144 |
src_configure() { |
| 145 |
gnome2_src_configure \ |
| 146 |
$(use_enable python) \ |
| 147 |
+ $(use_enable ssh) \ |
| 148 |
$(use_enable vala) |
| 149 |
} |
Archives