diff options
Diffstat (limited to 'dev-libs/libgit2-glib')
| -rw-r--r-- | dev-libs/libgit2-glib/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch | 26 | ||||
| -rw-r--r-- | dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild (renamed from dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild) | 28 | ||||
| -rw-r--r-- | dev-libs/libgit2-glib/metadata.xml | 27 |
4 files changed, 30 insertions, 53 deletions
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest index d50b3fb0e67c..7e08a7a2c53d 100644 --- a/dev-libs/libgit2-glib/Manifest +++ b/dev-libs/libgit2-glib/Manifest @@ -1 +1 @@ -DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25 +DIST libgit2-glib-1.2.0.tar.xz 140576 BLAKE2B f49f808e7f97c45d7df49d780fdf036422b794e551f2e42d934b015fb227b1cb80d5067198a5ef7ac0539460bf6c0eab74025bcf367a0aebb43518448015e22e SHA512 37004e86c663ce5fe1bd54878b908575eb9195c1012e88e39c2efdb0b6cfa1de3d2ed9754cecc1b942d001698870025c87d95856f2a0a9f2d0dba1979b07b1f8 diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch deleted file mode 100644 index a1838b403ab8..000000000000 --- a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7f63349fd0405439532f2ff0896a3697c73ccaaf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Thu, 27 Feb 2020 15:20:20 +0100 -Subject: [PATCH] Fix meson_vapi_link.py to respect DESTDIR - -Fixes #5 ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6d314b5..3a423b3 100644 ---- a/meson.build -+++ b/meson.build -@@ -135,7 +135,7 @@ if enable_vapi - assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.') - assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.') - -- meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir) -+ meson.add_install_script('meson_vapi_link.py', get_option('datadir')) - endif - - # Check for libgit2 ssh support --- -2.25.1 - diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild index bd885efc1975..ecf161614762 100644 --- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild +++ b/dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -VALA_USE_DEPEND="vapigen" +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) inherit gnome.org meson python-r1 vala xdg @@ -12,34 +12,33 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" IUSE="gtk-doc python +ssh +vala" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# see bug #927383 wrt libgit2 upper bound RDEPEND=" >=dev-libs/gobject-introspection-1.54:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0=[ssh?] + <dev-libs/libgit2-1.8.0 python? ( ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] ) + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) " DEPEND="${RDEPEND}" BDEPEND=" dev-util/glib-utils virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.1.2 ) + gtk-doc? ( dev-util/gi-docgen ) vala? ( $(vala_depend) ) " -PATCHES=( - "${FILESDIR}"/libgit2-glib-0.99.0.1-vapilink.patch -) - src_prepare() { - xdg_src_prepare - use vala && vala_src_prepare + default + + sed -i -e '/meson_python_compile.py/d' meson.build || die } src_configure() { @@ -51,6 +50,7 @@ src_configure() { $(meson_use vala vapi) ) + use vala && vala_setup meson_src_configure } diff --git a/dev-libs/libgit2-glib/metadata.xml b/dev-libs/libgit2-glib/metadata.xml index c188b2555dc8..d755c18f7e38 100644 --- a/dev-libs/libgit2-glib/metadata.xml +++ b/dev-libs/libgit2-glib/metadata.xml @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="ssh">Enable SSH transport support</flag> - </use> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="ssh">Enable SSH transport support</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libgit2-glib</remote-id> + </upstream> </pkgmetadata> |