From e3bf7abe8d985ac47508c3c62276959b8ab5cb67 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 17 Sep 2024 21:52:02 +0200 Subject: x11-wm/marco: Depend on libcanberra-gtk3 Signed-off-by: Andreas Sturmlechner --- x11-wm/marco/marco-1.28.1-r1.ebuild | 84 ----------------------------------- x11-wm/marco/marco-1.28.1-r2.ebuild | 87 +++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 84 deletions(-) delete mode 100644 x11-wm/marco/marco-1.28.1-r1.ebuild create mode 100644 x11-wm/marco/marco-1.28.1-r2.ebuild (limited to 'x11-wm') diff --git a/x11-wm/marco/marco-1.28.1-r1.ebuild b/x11-wm/marco/marco-1.28.1-r1.ebuild deleted file mode 100644 index 71e4d7061996..000000000000 --- a/x11-wm/marco/marco-1.28.1-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MATE2_LA_PUNT="yes" -# For script meson_post_install.py -# Bug 906826, tracker bug 762406 -PYTHON_COMPAT=( python3_{10..13} ) - -inherit mate meson python-any-r1 - -MINOR=$(($(ver_cut 2) % 2)) -if [[ ${MINOR} -eq 0 ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" -fi - -DESCRIPTION="MATE default window manager" -LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT" -SLOT="0/2" - -IUSE="startup-notification test xinerama" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - >=dev-libs/glib-2.58:2 - >=gnome-base/libgtop-2:2= - >=mate-base/mate-desktop-$(ver_cut 1-2) - media-libs/libcanberra[gtk3] - x11-libs/cairo - >=x11-libs/pango-1.2[X] - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libXcomposite-0.3 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXpresent - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXres - >=x11-libs/startup-notification-0.7 - xinerama? ( x11-libs/libXinerama ) -" - -DEPEND="${PYTHON_DEPS}" - -RDEPEND="${COMMON_DEPEND} - gnome-extra/zenity - virtual/libintl -" - -BDEPEND="${COMMON_DEPEND} - app-text/yelp-tools - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto - test? ( app-text/docbook-xml-dtd:4.5 ) - xinerama? ( x11-base/xorg-proto ) -" - -src_configure() { - local emesonargs=( - -Dcompositor=true - -Drender=true - -Dshape=true - -Dsm=true - -Dxsync=true - $(meson_use startup-notification) - $(meson_use xinerama) - ) - meson_src_configure -} - -src_install() { - meson_src_install - dodoc doc/*.txt -} diff --git a/x11-wm/marco/marco-1.28.1-r2.ebuild b/x11-wm/marco/marco-1.28.1-r2.ebuild new file mode 100644 index 000000000000..b4b18d3de582 --- /dev/null +++ b/x11-wm/marco/marco-1.28.1-r2.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MATE2_LA_PUNT="yes" +# For script meson_post_install.py +# Bug 906826, tracker bug 762406 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit mate meson python-any-r1 + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" +fi + +DESCRIPTION="MATE default window manager" +LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT" +SLOT="0/2" + +IUSE="startup-notification test xinerama" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + >=dev-libs/glib-2.58:2 + >=gnome-base/libgtop-2:2= + >=mate-base/mate-desktop-$(ver_cut 1-2) + || ( + media-libs/libcanberra-gtk3 + media-libs/libcanberra[gtk3(-)] + ) + x11-libs/cairo + >=x11-libs/pango-1.2[X] + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=x11-libs/libXcomposite-0.3 + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXpresent + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXres + >=x11-libs/startup-notification-0.7 + xinerama? ( x11-libs/libXinerama ) +" + +DEPEND="${PYTHON_DEPS}" + +RDEPEND="${COMMON_DEPEND} + gnome-extra/zenity + virtual/libintl +" + +BDEPEND="${COMMON_DEPEND} + app-text/yelp-tools + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto + test? ( app-text/docbook-xml-dtd:4.5 ) + xinerama? ( x11-base/xorg-proto ) +" + +src_configure() { + local emesonargs=( + -Dcompositor=true + -Drender=true + -Dshape=true + -Dsm=true + -Dxsync=true + $(meson_use startup-notification) + $(meson_use xinerama) + ) + meson_src_configure +} + +src_install() { + meson_src_install + dodoc doc/*.txt +} -- cgit v1.2.3-65-gdbad