Attachment #871498 for bug #914749

Lines 23-29 REQUIRED_USE=" Link Here

(-)a/app-editors/gedit-plugins/gedit-plugins-46.0.ebuild (-1 / +1 lines)
23	"	23	"
24		24
25	RDEPEND="	25	RDEPEND="
26	>=dev-libs/libpeas-1.14.1[gtk]	26	>=dev-libs/libpeas-1.14.1[gtk]:0
27	>=app-editors/gedit-46	27	>=app-editors/gedit-46
28	>=dev-libs/glib-2.32:2	28	>=dev-libs/glib-2.32:2
29	>=x11-libs/gtk+-3.9:3	29	>=x11-libs/gtk+-3.9:3

Lines 21-27 DEPEND=" Link Here

(-)a/app-editors/gedit/gedit-46.1.ebuild (-1 / +1 lines)
21	>=x11-libs/gtk+-3.22.0:3[introspection]	21	>=x11-libs/gtk+-3.22.0:3[introspection]
22	>=gui-libs/libgedit-amtk-5.6:=	22	>=gui-libs/libgedit-amtk-5.6:=
23	>=gui-libs/tepl-6.8.0:=	23	>=gui-libs/tepl-6.8.0:=
24	>=dev-libs/libpeas-1.14.1[gtk]	24	>=dev-libs/libpeas-1.14.1[gtk]:0
25	>=dev-libs/gobject-introspection-1.54:=	25	>=dev-libs/gobject-introspection-1.54:=
26	>=app-text/gspell-0.2.5:0=	26	>=app-text/gspell-0.2.5:0=
27	python? (	27	python? (

Lines 28-34 REQUIRED_USE=" Link Here

(-)a/app-editors/pluma-plugins/pluma-plugins-1.26.0.ebuild (-1 / +1 lines)
28	"	28	"
29		29
30	RDEPEND="	30	RDEPEND="
31	>=dev-libs/libpeas-1.14.1[gtk]	31	>=dev-libs/libpeas-1.14.1[gtk]:0
32	>=app-editors/gedit-40.0	32	>=app-editors/gedit-40.0
33		33
34	>=dev-libs/glib-2.32:2	34	>=dev-libs/glib-2.32:2

Lines 19-25 RESTRICT="!test? ( test )" Link Here

(-)a/app-editors/pluma/pluma-1.26.0-r1.ebuild (-1 / +1 lines)
19	COMMON_DEPEND="	19	COMMON_DEPEND="
20	dev-libs/atk	20	dev-libs/atk
21	>=dev-libs/glib-2.50:2	21	>=dev-libs/glib-2.50:2
22	>=dev-libs/libpeas-1.2.0[gtk]	22	>=dev-libs/libpeas-1.2.0[gtk]:0
23	>=dev-libs/libxml2-2.5:2	23	>=dev-libs/libxml2-2.5:2
24	x11-libs/cairo	24	x11-libs/cairo
25	x11-libs/gdk-pixbuf:2	25	x11-libs/gdk-pixbuf:2




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

MATE_LA_PUNT="yes"
PYTHON_COMPAT=( python3_{9..11} )
inherit mate python-single-r1 virtualx

DESCRIPTION="Pluma text editor for the MATE desktop"

LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
IUSE="+introspection spell test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"

COMMON_DEPEND="
	dev-libs/atk
	>=dev-libs/glib-2.50:2
	>=dev-libs/libpeas-1.2.0[gtk]
	>=dev-libs/libxml2-2.5:2
	x11-libs/cairo
	x11-libs/gdk-pixbuf:2
	>=x11-libs/gtk+-3.22:3[introspection?]
	>=x11-libs/gtksourceview-4.0.2:4
	x11-libs/libICE
	x11-libs/libX11
	>=x11-libs/libSM-1.0
	x11-libs/pango
	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
	spell? (
		>=app-text/enchant-1.6:=
		>=app-text/iso-codes-0.35
	)
	!!app-editors/mate-text-editor
"
RDEPEND="${COMMON_DEPEND}
	${PYTHON_DEPS}
	>=mate-base/mate-desktop-1.9[introspection?]
	virtual/libintl
"
DEPEND="${COMMON_DEPEND}
	~app-text/docbook-xml-dtd-4.1.2
	app-text/yelp-tools
	dev-util/glib-utils
	dev-util/gtk-doc
	dev-util/gtk-doc-am
	>=sys-devel/libtool-2.2.6:2
	>=sys-devel/gettext-0.19.8
	virtual/pkgconfig
"

MATE_FORCE_AUTORECONF=true

src_prepare() {
	# Test require gvfs sftp fs mounted and schema's installed. Skip this one.
	# https://github.com/mate-desktop/mate-text-editor/issues/33
	sed -e '/+= document-saver/d' -i tests/Makefile.am || die

	mate_src_prepare
}

src_configure() {
	mate_src_configure \
		$(use_enable introspection) \
		$(use_enable spell) \
		$(use_enable test tests)
}

src_test() {
	# FIXME: This should be handled at eclass level.
	"${EPREFIX}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die

	unset DBUS_SESSION_BUS_ADDRESS
	local -x GSETTINGS_SCHEMA_DIR="${S}/data"
	virtx emake check
}

Lines 27-33 RDEPEND=" Link Here

(-)a/app-office/endeavour/endeavour-43.0.ebuild (-1 / +1 lines)
27	>=gui-libs/gtk-3.92.0:4[introspection?]	27	>=gui-libs/gtk-3.92.0:4[introspection?]
28	>=gui-libs/libadwaita-1.2.0:1	28	>=gui-libs/libadwaita-1.2.0:1
29	>=net-libs/gnome-online-accounts-3.2.0:=	29	>=net-libs/gnome-online-accounts-3.2.0:=
30	>=dev-libs/libpeas-1.17	30	>=dev-libs/libpeas-1.17:0
31	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]	31	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
32	introspection? ( >=dev-libs/gobject-introspection-1.42:= )	32	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
33	"	33	"

Lines 27-33 RDEPEND=" Link Here

(-)a/app-office/endeavour/endeavour-9999.ebuild (-1 / +1 lines)
27	>=gui-libs/gtk-3.92.0:4[introspection?]	27	>=gui-libs/gtk-3.92.0:4[introspection?]
28	>=gui-libs/libadwaita-1.2.0:1	28	>=gui-libs/libadwaita-1.2.0:1
29	>=net-libs/gnome-online-accounts-3.2.0:=	29	>=net-libs/gnome-online-accounts-3.2.0:=
30	>=dev-libs/libpeas-1.17	30	>=dev-libs/libpeas-1.17:0
31	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]	31	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
32	introspection? ( >=dev-libs/gobject-introspection-1.42:= )	32	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
33	"	33	"




diff --git a/meson.build b/meson.build
index 0744ba1..95c09c3 100644
--- a/meson.build
+++ b/meson.build
@@ -138,18 +138,12 @@ if host_machine.system() == 'windows' and not python3_dep.found()
 endif
 
 pygobject_dep = dependency('pygobject-3.0', version: pygobject_req, required: false)
-lua51_dep = dependency('lua51', version: lua_req, required: false)
-if not lua51_dep.found()
-  lua51_dep = dependency('lua-5.1', version: lua_req, required: false)
-endif
-luajit_dep = dependency('luajit', version: luajit_req, required: false)
+lua51_dep = dependency('lua', version: lua_req, required: get_option('lua51'))
+luajit_dep = dependency('luajit', version: luajit_req, required: get_option('luajit'))
 lua_lgi_found = false
 lua_lgi_ver = 'not found'
-lua51_prg = find_program('lua5.1', required: false)
-if not lua51_prg.found()
-  lua51_prg = find_program('lua51', required: false)
-endif
-luajit_prg = find_program('luajit', required: false)
+lua51_prg = find_program('lua', required: get_option('lua51'))
+luajit_prg = find_program('luajit', required: get_option('luajit'))
 xmllint_prg = find_program('xmllint', required: false)
 generate_vapi = get_option('vapi')
 vapigen_prg = find_program('vapigen', required: generate_vapi)
@@ -211,6 +205,8 @@ if lua_found
             lua51_lgi_dep = declare_dependency(version: lua_lgi_ver)
             lua_lgi_found = true
         endif
+    else
+        error('lua support requested but lua-lgi not found')
     endif
     message('lua-lgi version: ' + lua_lgi_ver)
 endif
@@ -394,11 +390,7 @@ endif
 
 build_gjs_loader = get_option('gjs')
 
-build_lua51_loader = get_option('lua51')
-lua51_found = (luajit_dep.found() or lua51_dep.found()) and lua_lgi_found
-if build_lua51_loader and not lua51_found
-  error('Lua51 requested but failed to locate suitable Lua51 and LGI support')
-endif
+build_lua51_loader = (luajit_dep.found() or lua51_dep.found()) and lua_lgi_found
 
 build_python3_loader = get_option('python3')
 python3_found = python3_dep.found() and pygobject_dep.found()
diff --git a/meson_options.txt b/meson_options.txt
index 48a7e8d..891bf2a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,9 +3,13 @@ option('gjs',
        description: 'Enable GJS support (requires gjs-1.0)')
 
 option('lua51',
-       type: 'boolean', value: true,
+       type: 'feature', value: 'enabled',
        description: 'Enable Lua 5.1 support (requires lua-lgi)')
 
+option('luajit',
+       type: 'feature', value: 'disabled',
+       description: 'Use LuaJIT for Lua 5.1 support (requires lua-lgi)')
+
 option('python3',
        type: 'boolean', value: true,
        description: 'Enable Python 3 support (requires pygobject)')




# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

LUA_COMPAT=( lua5-1 luajit )
PYTHON_COMPAT=( python3_{10..12} )

inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg

DESCRIPTION="A GObject plugins library"
HOMEPAGE="https://wiki.gnome.org/Projects/Libpeas https://gitlab.gnome.org/GNOME/libpeas"

LICENSE="LGPL-2.1+"
SLOT="2"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"

IUSE="gtk-doc lua +python vala"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
	python? ( ${PYTHON_REQUIRED_USE} )"

RDEPEND="
	>=dev-libs/glib-2.44:2
	>=dev-libs/gjs-1.77.2
	>=dev-lang/spidermonkey-115
	>=dev-libs/gobject-introspection-1.39:=
	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_USEDEP}]
		')
	)
"
DEPEND="${RDEPEND}"
BDEPEND="
	dev-util/glib-utils
	gtk-doc? (
		>=dev-util/gtk-doc-1.11
		>=dev-util/gi-docgen-2021.7
		app-text/docbook-xml-dtd:4.3
	)
	>=sys-devel/gettext-0.19.8
	virtual/pkgconfig
"

PATCHES=(
	# Gentoo-specific lua tweak hack
	"${FILESDIR}"/2.0.0-lua.patch
)

pkg_setup() {
	use lua && lua-single_pkg_setup
	use python && python-single-r1_pkg_setup
}

src_prepare() {
	default
	use vala && vala_setup
}

src_configure() {
	local emesonargs=(
		$(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51)
		$(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit)
		$(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-doc gtk_doc)
	)
	meson_src_configure
}

src_test() {
	virtx meson_src_test
}

src_install() {
	meson_src_install

	if use gtk-doc; then
		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
		mv "${ED}"/usr/share/doc/libpeas-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
		if use gtk; then
			mv "${ED}"/usr/share/doc/libpeas-gtk-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
		fi
	fi
}

Lines 41-47 RDEPEND=" Link Here

(-)a/dev-util/gnome-builder/gnome-builder-44.2.ebuild (-1 / +1 lines)
41	>=dev-libs/json-glib-1.2.0	41	>=dev-libs/json-glib-1.2.0
42	>=dev-libs/jsonrpc-glib-3.43.0:=	42	>=dev-libs/jsonrpc-glib-3.43.0:=
43	>=dev-libs/libdex-0.1.1:=	43	>=dev-libs/libdex-0.1.1:=
44	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]	44	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]:0
45	dev-libs/libportal:=[gtk,introspection]	45	dev-libs/libportal:=[gtk,introspection]
46	>=dev-libs/template-glib-3.36.1:=[introspection]	46	>=dev-libs/template-glib-3.36.1:=[introspection]
47	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]	47	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]

Lines 27-33 RDEPEND=" Link Here

(-)a/dev-vcs/gitg/gitg-41-r1.ebuild (-1 / +1 lines)
27	dev-libs/libgee:0.8[introspection]	27	dev-libs/libgee:0.8[introspection]
28	dev-libs/libgit2:=[threads]	28	dev-libs/libgit2:=[threads]
29	>=dev-libs/libgit2-glib-1.0.0[ssh]	29	>=dev-libs/libgit2-glib-1.0.0[ssh]
30	>=dev-libs/libpeas-1.5.0[gtk]	30	>=dev-libs/libpeas-1.5.0[gtk]:0
31	>=dev-libs/libxml2-2.9.0:2	31	>=dev-libs/libxml2-2.9.0:2
32	>=gnome-base/gsettings-desktop-schemas-0.1.1	32	>=gnome-base/gsettings-desktop-schemas-0.1.1
33	>=x11-libs/gtk+-3.20.0:3	33	>=x11-libs/gtk+-3.20.0:3

Lines 28-34 RDEPEND=" Link Here

(-)a/dev-vcs/gitg/gitg-44.ebuild (-1 / +1 lines)
28	dev-libs/libgee:0.8[introspection]	28	dev-libs/libgee:0.8[introspection]
29	>=dev-libs/libgit2-glib-1.2.0[ssh]	29	>=dev-libs/libgit2-glib-1.2.0[ssh]
30	dev-libs/libgit2:=[threads]	30	dev-libs/libgit2:=[threads]
31	>=dev-libs/libpeas-1.5.0[gtk]	31	>=dev-libs/libpeas-1.5.0[gtk]:0
32	>=dev-libs/libxml2-2.9.0:2	32	>=dev-libs/libxml2-2.9.0:2
33	>=gnome-base/gsettings-desktop-schemas-0.1.1	33	>=gnome-base/gsettings-desktop-schemas-0.1.1
34	>=gui-libs/libhandy-1.5.0	34	>=gui-libs/libhandy-1.5.0

Lines 34-40 DEPEND=" Link Here

(-)a/mail-client/geary/geary-44.1.ebuild (-1 / +1 lines)
34	app-text/iso-codes	34	app-text/iso-codes
35	>=dev-libs/json-glib-1.0	35	>=dev-libs/json-glib-1.0
36	>=gui-libs/libhandy-1.2.1:1=	36	>=gui-libs/libhandy-1.2.1:1=
37	>=dev-libs/libpeas-1.24.0	37	>=dev-libs/libpeas-1.24.0:0
38	>=app-crypt/libsecret-0.11	38	>=app-crypt/libsecret-0.11
39	net-libs/libsoup:3.0	39	net-libs/libsoup:3.0
40	dev-libs/snowball-stemmer:=	40	dev-libs/snowball-stemmer:=

Lines 35-41 COMMON_DEPEND="dev-cpp/atkmm:0 Link Here

(-)a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220827.ebuild (-1 / +1 lines)
35	)	35	)
36	plugins? (	36	plugins? (
37	dev-libs/gobject-introspection	37	dev-libs/gobject-introspection
38	dev-libs/libpeas	38	dev-libs/libpeas:0
39	)	39	)
40	rar? ( app-arch/unrar:= )	40	rar? ( app-arch/unrar:= )
41	ssl? (	41	ssl? (

Lines 21-27 DEPEND=" Link Here

(-)a/media-gfx/entangle/entangle-3.0-r2.ebuild (-1 / +1 lines)
21	>=dev-libs/glib-2.36:2	21	>=dev-libs/glib-2.36:2
22	>=dev-libs/gobject-introspection-1.54.0	22	>=dev-libs/gobject-introspection-1.54.0
23	dev-libs/libgudev:=	23	dev-libs/libgudev:=
24	>=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]	24	>=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]:0
25	>=media-libs/gexiv2-0.10[introspection]	25	>=media-libs/gexiv2-0.10[introspection]
26	>=media-libs/libgphoto2-2.5.0:=	26	>=media-libs/libgphoto2-2.5.0:=
27	media-libs/gstreamer:1.0	27	media-libs/gstreamer:1.0

Lines 22-28 REQUIRED_USE=" Link Here

(-)a/media-gfx/eog-plugins/eog-plugins-44.0-r1.ebuild (-1 / +1 lines)
22		22
23	RDEPEND="	23	RDEPEND="
24	>=dev-libs/glib-2.53.4:2	24	>=dev-libs/glib-2.53.4:2
25	>=dev-libs/libpeas-1.14.1	25	>=dev-libs/libpeas-1.14.1:0
26	>=media-gfx/eog-41.0:1	26	>=media-gfx/eog-41.0:1
27	exif? ( >=media-libs/libexif-0.6.16 )	27	exif? ( >=media-libs/libexif-0.6.16 )
28	map? (	28	map? (

Lines 21-27 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" Link Here

(-)a/media-gfx/eog/eog-44.3.ebuild (-1 / +1 lines)
21		21
22	RDEPEND="	22	RDEPEND="
23	>=dev-libs/glib-2.73.2:2	23	>=dev-libs/glib-2.73.2:2
24	>=dev-libs/libpeas-0.7.4[gtk]	24	>=dev-libs/libpeas-0.7.4[gtk]:0
25	>=gnome-base/gnome-desktop-2.91.2:3=	25	>=gnome-base/gnome-desktop-2.91.2:3=
26	>=gnome-base/gsettings-desktop-schemas-42_beta	26	>=gnome-base/gsettings-desktop-schemas-42_beta
27	>=x11-misc/shared-mime-info-0.20	27	>=x11-misc/shared-mime-info-0.20

Lines 21-27 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" Link Here

(-)a/media-gfx/eog/eog-45.0.ebuild (-1 / +1 lines)
21		21
22	RDEPEND="	22	RDEPEND="
23	>=dev-libs/glib-2.73.2:2	23	>=dev-libs/glib-2.73.2:2
24	>=dev-libs/libpeas-0.7.4[gtk]	24	>=dev-libs/libpeas-0.7.4[gtk]:0
25	>=gnome-base/gnome-desktop-2.91.2:3=	25	>=gnome-base/gnome-desktop-2.91.2:3=
26	>=gnome-base/gsettings-desktop-schemas-42_beta	26	>=gnome-base/gsettings-desktop-schemas-42_beta
27	>=x11-misc/shared-mime-info-0.20	27	>=x11-misc/shared-mime-info-0.20

Lines 18-24 IUSE="X debug exif imagemagick +introspection nls jpeg lcms svg tiff xmp" Link Here

(-)a/media-gfx/eom/eom-1.26.0-r1.ebuild (-1 / +1 lines)
18	COMMON_DEPEND="	18	COMMON_DEPEND="
19	dev-libs/atk	19	dev-libs/atk
20	>=dev-libs/glib-2.52:2	20	>=dev-libs/glib-2.52:2
21	>=dev-libs/libpeas-1.8.0[gtk]	21	>=dev-libs/libpeas-1.8.0[gtk]:0
22	>=dev-libs/libxml2-2:2	22	>=dev-libs/libxml2-2:2
23	gnome-base/dconf	23	gnome-base/dconf
24	>=mate-base/mate-desktop-1.17.0	24	>=mate-base/mate-desktop-1.17.0

Lines 18-24 IUSE="X debug exif imagemagick +introspection nls jpeg lcms svg tiff xmp" Link Here

(-)a/media-gfx/eom/eom-1.26.1.ebuild (-1 / +1 lines)
18	COMMON_DEPEND="	18	COMMON_DEPEND="
19	>=app-accessibility/at-spi2-core-2.46.0	19	>=app-accessibility/at-spi2-core-2.46.0
20	>=dev-libs/glib-2.52:2	20	>=dev-libs/glib-2.52:2
21	>=dev-libs/libpeas-1.8.0[gtk]	21	>=dev-libs/libpeas-1.8.0[gtk]:0
22	>=dev-libs/libxml2-2:2	22	>=dev-libs/libxml2-2:2
23	gnome-base/dconf	23	gnome-base/dconf
24	>=mate-base/mate-desktop-1.17.0	24	>=mate-base/mate-desktop-1.17.0

Lines 33-39 DEPEND=" Link Here

(-)a/media-sound/rhythmbox/rhythmbox-3.4.7-r2.ebuild (-1 / +1 lines)
33	>=media-libs/gst-plugins-base-1.4.0:1.0[introspection]	33	>=media-libs/gst-plugins-base-1.4.0:1.0[introspection]
34	>=x11-libs/gtk+-3.20.0:3[introspection]	34	>=x11-libs/gtk+-3.20.0:3[introspection]
35	dev-libs/json-glib	35	dev-libs/json-glib
36	>=dev-libs/libpeas-0.7.3[gtk]	36	>=dev-libs/libpeas-0.7.3[gtk]:0
37	>=net-libs/libsoup-3.0.7:3.0	37	>=net-libs/libsoup-3.0.7:3.0
38	>=dev-libs/libxml2-2.7.8:2	38	>=dev-libs/libxml2-2.7.8:2
39	x11-libs/pango	39	x11-libs/pango

Lines 35-41 RDEPEND="${COMMON_DEPEND} Link Here

(-)a/media-video/pitivi/pitivi-2023.03-r1.ebuild (-1 / +1 lines)
35		35
36	>=dev-libs/gobject-introspection-1.34:=	36	>=dev-libs/gobject-introspection-1.34:=
37		37
38	dev-libs/libpeas[${PYTHON_SINGLE_USEDEP}]	38	dev-libs/libpeas[${PYTHON_SINGLE_USEDEP}]:0
39		39
40	$(python_gen_cond_dep '	40	$(python_gen_cond_dep '
41	dev-python/dbus-python[${PYTHON_USEDEP}]	41	dev-python/dbus-python[${PYTHON_USEDEP}]

Lines 29-35 COMMON_DEPEND=" Link Here

(-)a/media-video/totem/totem-43.0.ebuild (-1 / +1 lines)
29	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]	29	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
30	>=media-libs/gst-plugins-good-1.6.0:1.0	30	>=media-libs/gst-plugins-good-1.6.0:1.0
31	>=media-libs/grilo-0.3.0:0.3[playlist]	31	>=media-libs/grilo-0.3.0:0.3[playlist]
32	>=dev-libs/libpeas-1.1.0[gtk]	32	>=dev-libs/libpeas-1.1.0[gtk]:0
33	>=dev-libs/totem-pl-parser-3.26.5:0=[introspection]	33	>=dev-libs/totem-pl-parser-3.26.5:0=[introspection]
34	gnome-base/gnome-desktop:3=	34	gnome-base/gnome-desktop:3=
35	gnome-base/gsettings-desktop-schemas	35	gnome-base/gsettings-desktop-schemas

Lines 23-29 RDEPEND="${PYTHON_DEPS} Link Here

(-)a/net-news/liferea/liferea-1.14.5.ebuild (-1 / +1 lines)
23	dev-libs/glib:2	23	dev-libs/glib:2
24	dev-libs/gobject-introspection	24	dev-libs/gobject-introspection
25	dev-libs/json-glib	25	dev-libs/json-glib
26	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]	26	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]:0
27	dev-libs/libxml2:2	27	dev-libs/libxml2:2
28	dev-libs/libxslt	28	dev-libs/libxslt
29	gnome-base/gsettings-desktop-schemas	29	gnome-base/gsettings-desktop-schemas

Lines 23-29 RDEPEND="${PYTHON_DEPS} Link Here

(-)a/net-news/liferea/liferea-1.15.3.ebuild (-2 / +1 lines)
23	dev-libs/glib:2	23	dev-libs/glib:2
24	dev-libs/gobject-introspection	24	dev-libs/gobject-introspection
25	dev-libs/json-glib	25	dev-libs/json-glib
26	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]	26	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]:0
27	dev-libs/libxml2:2	27	dev-libs/libxml2:2
28	dev-libs/libxslt	28	dev-libs/libxslt
29	gnome-base/gsettings-desktop-schemas	29	gnome-base/gsettings-desktop-schemas
30	-

Return to bug 914749

Lines 1-79 Link Here

(-)a/app-editors/pluma/pluma-1.26.0.ebuild (-79 lines)
1	# Copyright 1999-2023 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2
3
4	EAPI=7
5
6	MATE_LA_PUNT="yes"
7	PYTHON_COMPAT=( python3_{9..11} )
8	inherit mate python-single-r1 virtualx
9
10	DESCRIPTION="Pluma text editor for the MATE desktop"
11
12	LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
13	SLOT="0"
14	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
15	IUSE="+introspection spell test"
16	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
17	RESTRICT="!test? ( test )"
18
19	COMMON_DEPEND="
20	dev-libs/atk
21	>=dev-libs/glib-2.50:2
22	>=dev-libs/libpeas-1.2.0[gtk]
23	>=dev-libs/libxml2-2.5:2
24	x11-libs/cairo
25	x11-libs/gdk-pixbuf:2
26	>=x11-libs/gtk+-3.22:3[introspection?]
27	>=x11-libs/gtksourceview-4.0.2:4
28	x11-libs/libICE
29	x11-libs/libX11
30	>=x11-libs/libSM-1.0
31	x11-libs/pango
32	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
33	spell? (
34	>=app-text/enchant-1.6:=
35	>=app-text/iso-codes-0.35
36	)
37	!!app-editors/mate-text-editor
38	"
39	RDEPEND="${COMMON_DEPEND}
40	${PYTHON_DEPS}
41	>=mate-base/mate-desktop-1.9[introspection?]
42	virtual/libintl
43	"
44	DEPEND="${COMMON_DEPEND}
45	~app-text/docbook-xml-dtd-4.1.2
46	app-text/yelp-tools
47	dev-util/glib-utils
48	dev-util/gtk-doc
49	dev-util/gtk-doc-am
50	>=sys-devel/libtool-2.2.6:2
51	>=sys-devel/gettext-0.19.8
52	virtual/pkgconfig
53	"
54
55	MATE_FORCE_AUTORECONF=true
56
57	src_prepare() {
58	# Test require gvfs sftp fs mounted and schema's installed. Skip this one.
59	# https://github.com/mate-desktop/mate-text-editor/issues/33
60	sed -e '/+= document-saver/d' -i tests/Makefile.am \|\| die
61
62	mate_src_prepare
63	}
64
65	src_configure() {
66	mate_src_configure \
67	$(use_enable introspection) \
68	$(use_enable spell) \
69	$(use_enable test tests)
70	}
71
72	src_test() {
73	# FIXME: This should be handled at eclass level.
74	"${EPREFIX}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" \|\| die
75
76	unset DBUS_SESSION_BUS_ADDRESS
77	local -x GSETTINGS_SCHEMA_DIR="${S}/data"
78	virtx emake check
79	}

Line 0 Link Here

(-)a/dev-libs/libpeas/files/2.0.0-lua.patch (+68 lines)
		1	diff --git a/meson.build b/meson.build
		2	index 0744ba1..95c09c3 100644
		3	--- a/meson.build
		4	+++ b/meson.build
		5	@@ -138,18 +138,12 @@ if host_machine.system() == 'windows' and not python3_dep.found()
		6	endif
		7
		8	pygobject_dep = dependency('pygobject-3.0', version: pygobject_req, required: false)
		9	-lua51_dep = dependency('lua51', version: lua_req, required: false)
		10	-if not lua51_dep.found()
		11	- lua51_dep = dependency('lua-5.1', version: lua_req, required: false)
		12	-endif
		13	-luajit_dep = dependency('luajit', version: luajit_req, required: false)
		14	+lua51_dep = dependency('lua', version: lua_req, required: get_option('lua51'))
		15	+luajit_dep = dependency('luajit', version: luajit_req, required: get_option('luajit'))
		16	lua_lgi_found = false
		17	lua_lgi_ver = 'not found'
		18	-lua51_prg = find_program('lua5.1', required: false)
		19	-if not lua51_prg.found()
		20	- lua51_prg = find_program('lua51', required: false)
		21	-endif
		22	-luajit_prg = find_program('luajit', required: false)
		23	+lua51_prg = find_program('lua', required: get_option('lua51'))
		24	+luajit_prg = find_program('luajit', required: get_option('luajit'))
		25	xmllint_prg = find_program('xmllint', required: false)
		26	generate_vapi = get_option('vapi')
		27	vapigen_prg = find_program('vapigen', required: generate_vapi)
		28	@@ -211,6 +205,8 @@ if lua_found
		29	lua51_lgi_dep = declare_dependency(version: lua_lgi_ver)
		30	lua_lgi_found = true
		31	endif
		32	+ else
		33	+ error('lua support requested but lua-lgi not found')
		34	endif
		35	message('lua-lgi version: ' + lua_lgi_ver)
		36	endif
		37	@@ -394,11 +390,7 @@ endif
		38
		39	build_gjs_loader = get_option('gjs')
		40
		41	-build_lua51_loader = get_option('lua51')
		42	-lua51_found = (luajit_dep.found() or lua51_dep.found()) and lua_lgi_found
		43	-if build_lua51_loader and not lua51_found
		44	- error('Lua51 requested but failed to locate suitable Lua51 and LGI support')
		45	-endif
		46	+build_lua51_loader = (luajit_dep.found() or lua51_dep.found()) and lua_lgi_found
		47
		48	build_python3_loader = get_option('python3')
		49	python3_found = python3_dep.found() and pygobject_dep.found()
		50	diff --git a/meson_options.txt b/meson_options.txt
		51	index 48a7e8d..891bf2a 100644
		52	--- a/meson_options.txt
		53	+++ b/meson_options.txt
		54	@@ -3,9 +3,13 @@ option('gjs',
		55	description: 'Enable GJS support (requires gjs-1.0)')
		56
		57	option('lua51',
		58	- type: 'boolean', value: true,
		59	+ type: 'feature', value: 'enabled',
		60	description: 'Enable Lua 5.1 support (requires lua-lgi)')
		61
		62	+option('luajit',
		63	+ type: 'feature', value: 'disabled',
		64	+ description: 'Use LuaJIT for Lua 5.1 support (requires lua-lgi)')
65	+
66	option('python3',
67	type: 'boolean', value: true,
68	description: 'Enable Python 3 support (requires pygobject)')

Line 0 Link Here

(-)a/dev-libs/libpeas/libpeas-2.0.0.ebuild (+95 lines)
		1	# Copyright 1999-2023 Gentoo Authors
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=8
		5
		6	LUA_COMPAT=( lua5-1 luajit )
		7	PYTHON_COMPAT=( python3_{10..12} )
		8
		9	inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
		10
		11	DESCRIPTION="A GObject plugins library"
		12	HOMEPAGE="https://wiki.gnome.org/Projects/Libpeas https://gitlab.gnome.org/GNOME/libpeas"
		13
		14	LICENSE="LGPL-2.1+"
		15	SLOT="2"
		16	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
		17
		18	IUSE="gtk-doc lua +python vala"
		19	REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
		20	python? ( ${PYTHON_REQUIRED_USE} )"
		21
		22	RDEPEND="
		23	>=dev-libs/glib-2.44:2
		24	>=dev-libs/gjs-1.77.2
		25	>=dev-lang/spidermonkey-115
		26	>=dev-libs/gobject-introspection-1.39:=
		27	lua? (
		28	${LUA_DEPS}
		29	$(lua_gen_cond_dep '
		30	>=dev-lua/lgi-0.9.0[${LUA_USEDEP}]
		31	')
		32	)
		33	python? (
		34	${PYTHON_DEPS}
		35	$(python_gen_cond_dep '
		36	>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]
		37	')
		38	)
		39	"
		40	DEPEND="${RDEPEND}"
		41	BDEPEND="
		42	dev-util/glib-utils
		43	gtk-doc? (
		44	>=dev-util/gtk-doc-1.11
		45	>=dev-util/gi-docgen-2021.7
		46	app-text/docbook-xml-dtd:4.3
		47	)
		48	>=sys-devel/gettext-0.19.8
		49	virtual/pkgconfig
		50	"
		51
		52	PATCHES=(
		53	# Gentoo-specific lua tweak hack
		54	"${FILESDIR}"/2.0.0-lua.patch
		55	)
		56
		57	pkg_setup() {
		58	use lua && lua-single_pkg_setup
		59	use python && python-single-r1_pkg_setup
		60	}
		61
		62	src_prepare() {
		63	default
		64	use vala && vala_setup
65	}
66
67	src_configure() {
68	local emesonargs=(
69	$(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51)
70	$(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit)
71	$(meson_use python python3)
72	# introspection was always enabled in autotools; would need readiness by consumers
73	# to USE flag it, but most need it for python plugins anyways
74	-Dintrospection=true
75	$(meson_use vala vapi)
76	$(meson_use gtk-doc gtk_doc)
77	)
78	meson_src_configure
79	}
80
81	src_test() {
82	virtx meson_src_test
83	}
84
85	src_install() {
86	meson_src_install
87
88	if use gtk-doc; then
89	mkdir -p "${ED}"/usr/share/gtk-doc/html/ \|\| die
90	mv "${ED}"/usr/share/doc/libpeas-1.0 "${ED}"/usr/share/gtk-doc/html/ \|\| die
91	if use gtk; then
92	mv "${ED}"/usr/share/doc/libpeas-gtk-1.0 "${ED}"/usr/share/gtk-doc/html/ \|\| die
93	fi
94	fi
95	}