From: Remi Cardona Date: Tue, 20 Jan 2015 07:20:12 +0000 (+0000) Subject: dev-libs/libgit2-glib: bump to 0.22.0 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ce029060d3a229d519224703c2ac4b9392a6ab45;p=gentoo.git dev-libs/libgit2-glib: bump to 0.22.0 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x901AB08A --- 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 +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 libgit2-glib-0.0.24.ebuild: diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest index 2004bcac1775..9ea6c210474b 100644 --- a/dev-libs/libgit2-glib/Manifest +++ b/dev-libs/libgit2-glib/Manifest @@ -2,18 +2,21 @@ Hash: SHA256 AUX libgit2-glib-0.0.24-automagic-ssh.patch 1999 SHA256 c08b105465ddaad2a5b5c613810fe786bdf5f0a585304030b4d1ea90629ab4b6 SHA512 eb9249f71c9027a24a5a85d8bdc85201210965ebb5fad3ce962d17bc0b6e2c3b81b946a87d7849666631c8ab4384befa12ccee3f1a2f4b1f9f2e6ef189b14579 WHIRLPOOL 2699ae19276423a53b42b04d804aa53c22c2ad02067cdc5603bac5130b221234e28e03e12b49a3ff2c603439f0cd2a5bf2f9a1808721814e4461d84ce7141054 +AUX libgit2-glib-0.22.0-automagic-ssh.patch 2575 SHA256 5343e83278d2e7c95b46860d25bcb8aca9696748bb6d57f4a8d3238d8fe719ef SHA512 3af7b309befc4a7bbac06f001ddebf92d151b30697975052f5979a2aba967de4f7eb2da3b920738c49ef7706bb32a56e3ded526ae10214fd6999c8a0bbd3eeb2 WHIRLPOOL c7aa4680166fd917ae89fbe7fbf82d6e56be0d1eec7a2cd7c8adfdcf9d0460f50b7ddf08acb545d13f80e4e9503ed0f09687040ea2c59022fe8a16ec44640313 DIST libgit2-glib-0.0.12.tar.xz 396768 SHA256 193125b314f588894b769058be28101fb0b2bec345520ca6398ee4e8b7319762 SHA512 b3299a20a1a24243604f33dff1e9df0ac0c244049d99e6ec29e9ae405e4370ff229b4b8186593347515930fd483a2b78dcb041d33749076f9dc9778d3674da06 WHIRLPOOL 41adce53f6b08172bcb9940f21141665fbcde04962ede9f68f1797cceeca8c68f156c5668d5a84f392a92ef57f2bc45a9e8b706cd2df98ec0e352ec66463b9cd DIST libgit2-glib-0.0.16.tar.xz 396212 SHA256 36fa374e2c01b42aab885c91f9a0da184a21fa06c9e3a273a3d4f593c083627e SHA512 1fcdec0dea0a5ba580e49ebc9805765adbeb827292f9a2686f8289dc98604a332bb4e553f4c74927020352f15eb3e0589c211c4b96d524167dc447268a382194 WHIRLPOOL 236286633c9aec5bcaeaa762e07ea4615081fb610dcf712bea48943aa34cd17ba371c5ec77cf3906ca16c83efe1d710feec486c7fc7c4743a82d1128fd21437e DIST libgit2-glib-0.0.24.tar.xz 422768 SHA256 8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8 SHA512 4500abd0e478293a86db1cd82536c6cc818b500b4784b03c168a2827509586d1f3670767e6e410e7e52e827e4e3c6086a538398287cbf1a274dce45edb72874d WHIRLPOOL dbecc4d146ab6f7c4f6bcb919ccda1e1cb5acca5b580cf6dd86c9a989b5a35e56222eab7d70832957a1c87a43e032f2a295869cf01264a10cf5459682e05baad +DIST libgit2-glib-0.22.0.tar.xz 428776 SHA256 8ae19e1dd2a6b37dd81843182d96dc5f8d439013c26658670a08287abfedaee2 SHA512 8c1d76e93eb21fab823fcaf1067c703d05bf844d16653769c6c58c8b890e1439c8f9fe49bd4035a116785030ffc8d2c3927e42f8c69306233c9990c47621179a WHIRLPOOL 514a47886649e352a9e9589dc0a793ce01dae850ad2e1115761bfe1db4fd10d240dcdf6916c37bd1268e5e252f5dfa2af71aed4d7edcbc9eaaa3588aa6dd0dfe EBUILD libgit2-glib-0.0.12.ebuild 863 SHA256 35143d3e6719eed86636684716f70007d27a4eaf2797ad74da79423a09036394 SHA512 5c2be2b60e88faf91511b0d2933a237a04eb09654e0885fb6e538ed58edf217ce62e696524a3ac0eaeb574e4e39906a7e576b1eb6fa7cfe84729567690810bf5 WHIRLPOOL 4887eb0dc7a45cb90548a55bc1e4c02569046577ca35667fcea3f67b1ed11974f1f365b4ea565f2d40c5dcf979aa07b7c788768c6144e19495d293d7f3fde8ba EBUILD libgit2-glib-0.0.16.ebuild 845 SHA256 e673c1e2d9013430235942d416a1a298dd2d047f5f6c964597a1ee4bcd44805a SHA512 72f87baa163a8bac7c14d2bb90ce99b287ee639d4ba89af1b8dcd8683b9186999fef644350ac6f7c43d411d1a67aefabbd5e3c295073215917015f05105734ac WHIRLPOOL aa19c863f873919d0a0d2f1cfa5d34ac5b538259458f3dd14406a5918d27825d091c0a40b6176bbdcda9295c14844bbbd5c5c36ba48f8c3e8ac0ede9865a7571 EBUILD libgit2-glib-0.0.24.ebuild 1199 SHA256 a57f0b03ae7eed6f39d70df1f075febf1081514f0154f2459f8f7cadba35fe9d SHA512 db357739d04f6f59b1d4e870a861c9cbbdfb394ee2d2e652cf2342046be662a230f0bc03026872c5b3ddf02b98a89ff3482e25466e30710a51849f521a2dae88 WHIRLPOOL bad9ef103a419ff1b27101e8d688f85ba82f72ac66b583d9a1e4dfdb030c8e7726d04ea3c8fdbdb1a4c3317dfc7f59ae7ac4b94221f8e43325bcedb2c4d859a4 -MISC ChangeLog 3148 SHA256 9e9ae9cc88df697aa2b4692e9823f606982f2ba7c97c85b980788b03a2b423d4 SHA512 9f0cc37960a85428a06024cc7ac4a198dc7c9e5b0a7f4d0e9eeadf351052ea4c5dcd9eadb6db28c17418f85e638c61dc57b6017394a619c5819438e538e62527 WHIRLPOOL ec4aa342357337808e7ac281da111355c43859bde6a0573463a94d4db17481f23713cdfe2bf59c6b49b6e2dafcd1451427c026cd4d0c12b861152194dff23c3e +EBUILD libgit2-glib-0.22.0.ebuild 1200 SHA256 ff48280d40570a761bf3dfa4a2fff6f21632ac786c956869755f0c04905131f0 SHA512 381e00732b1c068f52eac300ef7f0212d03c60b7a85fd8922a4e5b0330cb5df39d2d34bd694f6ab1e413c157b28fad2314fb1e359a106fb5e4de5242c511aa9a WHIRLPOOL 732c0e9ab8def3f5c4b453d546ef025f9ff641451829ae4b2e5db031d4e99145036ef68ef2d026922db834aaac17367c368e7715e7eaff08baad68e0e8d911f4 +MISC ChangeLog 3376 SHA256 a2cc15e7075e853d4c4e5c0080bbece8dc178098e3e23fa6a476450b356159be SHA512 1038ed8e81e5db45b695e08ad5655b00d393659b789d11d2274f19a0edc2e8007f66a5be630aa0f0c0956cc7738d58eb2989abf47466914513a90c269c81b860 WHIRLPOOL da7acff96d77814e6a9946be43ab521f1f42d5f33a771bcfdeae374172514f7f385b24367335e0995c10e9bb7b5fda923937a4916e50f3f17f6b9b300564b5db MISC metadata.xml 233 SHA256 9cd390d31bafc4976c3603f926988217f9b9d75562f01bea1c1321a08b09c05d SHA512 df7232bcbde57fd53c606236c09613c9154e06b5041766d15bca45a890a70c3f8b4f57ab2996942316c8ff45f72911acfa80f3d1247c379aa3dfbf6c8621d9b3 WHIRLPOOL f8d988c162159e4337e1bfc417213668952305a47e4ceb2c87b0d7de4d8076144307548007e540ea77b7caceb6ea8307c237d3f584d64d40724cae3de6016489 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSYp1YACgkQ1fmVwcYIWAbY8gCgtHSO0uqI2nCVQ6ohlBTtktUM -XDUAn3E1+U4XpGRjVO72NlPC0T0x1g5U -=JWE8 +iEYEAREIAAYFAlS+AawACgkQfUU/I5AasIqY5wCgt3G+MJJnz60jmtMTY0GyoG/K +MCMAniXvhWzxIAJWrMDPFyuqsb3WK5kh +=SF9D -----END PGP SIGNATURE----- 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?= +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 +--- + 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 +- 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 ++ 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) +}