commit: f6d56e4d2d527713892f8f99aec103cb1343ed5e Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Jan 3 16:35:42 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Jan 5 18:29:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d56e4d
dev-libs/libpeas: Version bump to 1.28 Closes: https://bugs.gentoo.org/759283 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> dev-libs/libpeas/Manifest | 1 + ...-Explicitly-depend-on-the-GIR-and-typelib.patch | 41 +++++++++++ dev-libs/libpeas/libpeas-1.28.0-r100.ebuild | 85 ++++++++++++++++++++++ dev-libs/libpeas/libpeas-1.28.0.ebuild | 79 ++++++++++++++++++++ 4 files changed, 206 insertions(+) diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest index fc2e1ebc5c5..a39d3155163 100644 --- a/dev-libs/libpeas/Manifest +++ b/dev-libs/libpeas/Manifest @@ -1 +1,2 @@ DIST libpeas-1.26.0.tar.xz 191708 BLAKE2B 5845d5cb15724ba933572f48b9056a79cb2c167c7911ff1546c836fe56cd7e49d7461e5a413b79effa64e8e3fb2ed2eb370de665728e476e40ffb4d44c841543 SHA512 86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f +DIST libpeas-1.28.0.tar.xz 191896 BLAKE2B 64fd65228b4ae4be59724a9e4b26133ed025866d0b7bf15377d579c87de1ebdf1225e3a2aeb004ae9733544cc53782c399581b5fb5f1625ef55532600d37afe0 SHA512 43f8bc426238f519d7a3b26409af2f7578e921893c085d00fab74699a45649d8343e5646658003980e6639f51e74f3b25519c3bbc248d5161b11c999f7dd0374 diff --git a/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch b/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch new file mode 100644 index 00000000000..55a425c9d51 --- /dev/null +++ b/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch @@ -0,0 +1,41 @@ +From 6d053ec0a4108be59f5e30a04ab4e6539e694e53 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <[email protected]> +Date: Fri, 18 Sep 2020 11:31:52 +0100 +Subject: [PATCH] tests: Explicitly depend on the GIR and typelib + +In Meson since 0.55.0, having the test executable depend on the GIR +dependency is not enough to ensure that uninstalled GIR and typelib +files are generated: we also need to have the test itself depend on +the GIR build target. + +It is not clear to me whether this is a workaround for a Meson +regression (if what libpeas previously did was meant to work), or a +solution to a libpeas bug (if it was never meant to be guaranteed to +work). For more details see +<https://github.com/mesonbuild/meson/issues/7756>. + +Resolves: https://gitlab.gnome.org/GNOME/libpeas/-/issues/40 +Bug-Debian: https://bugs.debian.org/966951 +--- + tests/libpeas/meson.build | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/libpeas/meson.build b/tests/libpeas/meson.build +index 32cf5e9..c95190a 100644 +--- a/tests/libpeas/meson.build ++++ b/tests/libpeas/meson.build +@@ -53,5 +53,10 @@ foreach test: libpeas_tests_sources + c_args: libpeas_tests_c_args, + ) + +- test('test-@0@'.format(test_name), test_exe, env: test_env) ++ test( ++ 'test-@0@'.format(test_name), ++ test_exe, ++ depends: [libintrospection_gir], ++ env: test_env, ++ ) + endforeach +-- +2.26.2 + diff --git a/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild new file mode 100644 index 00000000000..4fc569ae863 --- /dev/null +++ b/dev-libs/libpeas/libpeas-1.28.0-r100.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{6..9} ) + +inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg + +DESCRIPTION="A GObject plugins library" +HOMEPAGE="https://developer.gnome.org/libpeas/stable/"; + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +IUSE="glade +gtk gtk-doc lua +python vala" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/glib-2.38:2 + >=dev-libs/gobject-introspection-1.39:= + gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) + glade? ( >=dev-util/glade-3.9.1:3.10 ) + lua? ( + ${LUA_DEPS} + $(lua_gen_cond_dep ' + >=dev-lua/lgi-0.9.0[${LUA_USEDEP}] + ') + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.11 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # Gentoo-specific lua tweak hack + "${FILESDIR}"/1.26.0-lua.patch + "${FILESDIR}"/${P}-tests-Explicitly-depend-on-the-GIR-and-typelib.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51) + $(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit) + -Dpython2=false + $(meson_use python python3) + # introspection was always enabled in autotools; would need readiness by consumers + # to USE flag it, but most need it for python plugins anyways + -Dintrospection=true + $(meson_use vala vapi) + $(meson_use gtk widgetry) + $(meson_use glade glade_catalog) + -Ddemos=false + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/libpeas/libpeas-1.28.0.ebuild b/dev-libs/libpeas/libpeas-1.28.0.ebuild new file mode 100644 index 00000000000..1417cb97d08 --- /dev/null +++ b/dev-libs/libpeas/libpeas-1.28.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) + +inherit gnome.org meson python-single-r1 vala virtualx xdg + +DESCRIPTION="A GObject plugins library" +HOMEPAGE="https://developer.gnome.org/libpeas/stable/"; + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +IUSE="glade +gtk gtk-doc lua luajit +python vala" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/glib-2.38:2 + >=dev-libs/gobject-introspection-1.39:= + gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) + glade? ( >=dev-util/glade-3.9.1:3.10 ) + lua? ( + >=dev-lua/lgi-0.9.0 + luajit? ( >=dev-lang/luajit-2:2 ) + !luajit? ( =dev-lang/lua-5.1*:0 ) ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.11 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # Gentoo-specific lua tweak hack + "${FILESDIR}"/1.26.0-lua.patch + "${FILESDIR}"/${P}-tests-Explicitly-depend-on-the-GIR-and-typelib.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_feature $(usex lua !luajit lua) lua51) + $(meson_feature $(usex lua luajit lua) luajit) + -Dpython2=false + $(meson_use python python3) + # introspection was always enabled in autotools; would need readiness by consumers + # to USE flag it, but most need it for python plugins anyways + -Dintrospection=true + $(meson_use vala vapi) + $(meson_use gtk widgetry) + $(meson_use glade glade_catalog) + -Ddemos=false + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +}
