From 2fcd6bf3be4497dac7f532d274298e62818f80ea Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 5 Oct 2022 19:59:39 +0100 Subject: mate-base/mate-control-center: use || ( ... ) dep for dev-libs/atk Forcing migration to at-spi2-atk right now leads to nasty conflicts for stable users. Signed-off-by: Sam James --- .../mate-control-center-1.24.2-r1.ebuild | 77 ++++++++++++++++++++++ .../mate-control-center-1.24.2.ebuild | 74 --------------------- .../mate-control-center-1.26.0-r1.ebuild | 73 ++++++++++++++++++++ .../mate-control-center-1.26.0.ebuild | 70 -------------------- 4 files changed, 150 insertions(+), 144 deletions(-) create mode 100644 mate-base/mate-control-center/mate-control-center-1.24.2-r1.ebuild delete mode 100644 mate-base/mate-control-center/mate-control-center-1.24.2.ebuild create mode 100644 mate-base/mate-control-center/mate-control-center-1.26.0-r1.ebuild delete mode 100644 mate-base/mate-control-center/mate-control-center-1.26.0.ebuild (limited to 'mate-base/mate-control-center') diff --git a/mate-base/mate-control-center/mate-control-center-1.24.2-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.24.2-r1.ebuild new file mode 100644 index 000000000000..b731b26c03e4 --- /dev/null +++ b/mate-base/mate-control-center/mate-control-center-1.24.2-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" +fi + +DESCRIPTION="The MATE Desktop configuration tool" +LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND" +SLOT="0" + +IUSE="accountsservice appindicator debug" + +COMMON_DEPEND=" + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/atk + ) + >=dev-libs/dbus-glib-0.73 + >=dev-libs/glib-2.50:2 + dev-libs/libxml2:2 + >=gnome-base/dconf-0.13.4 + >=gnome-base/librsvg-2.0:2 + >=mate-base/libmatekbd-1.17.0 + >=mate-base/mate-desktop-1.23.2 + >=mate-base/caja-1.20.0 + >=mate-base/mate-menus-1.21.0 + >=mate-base/mate-settings-daemon-1.23.1 + >=media-libs/fontconfig-1:1.0 + media-libs/freetype:2 + media-libs/libcanberra:0[gtk3] + >=sys-apps/dbus-1 + sys-auth/polkit[introspection] + x11-apps/xmodmap + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcursor + x11-libs/libXext + >=x11-libs/libXi-1.5 + x11-libs/libXrandr + x11-libs/libXrender + >=x11-libs/libxklavier-4 + x11-libs/pango + >=x11-wm/marco-1.17.0:= + accountsservice? ( sys-apps/accountsservice ) + appindicator? ( dev-libs/libappindicator:3 ) +" + +RDEPEND="${COMMON_DEPEND}" + +DEPEND="${COMMON_DEPEND} + app-text/rarian + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools + dev-libs/libxml2 + dev-util/desktop-file-utils + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + x11-base/xorg-proto + virtual/pkgconfig +" + +src_configure() { + mate_src_configure \ + --disable-update-mimedb \ + $(use_enable appindicator) \ + $(use_enable debug) +} diff --git a/mate-base/mate-control-center/mate-control-center-1.24.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.24.2.ebuild deleted file mode 100644 index b62c67f9fb85..000000000000 --- a/mate-base/mate-control-center/mate-control-center-1.24.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" -fi - -DESCRIPTION="The MATE Desktop configuration tool" -LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND" -SLOT="0" - -IUSE="accountsservice appindicator debug" - -COMMON_DEPEND=" - dev-libs/atk - >=dev-libs/dbus-glib-0.73 - >=dev-libs/glib-2.50:2 - dev-libs/libxml2:2 - >=gnome-base/dconf-0.13.4 - >=gnome-base/librsvg-2.0:2 - >=mate-base/libmatekbd-1.17.0 - >=mate-base/mate-desktop-1.23.2 - >=mate-base/caja-1.20.0 - >=mate-base/mate-menus-1.21.0 - >=mate-base/mate-settings-daemon-1.23.1 - >=media-libs/fontconfig-1:1.0 - media-libs/freetype:2 - media-libs/libcanberra:0[gtk3] - >=sys-apps/dbus-1 - sys-auth/polkit[introspection] - x11-apps/xmodmap - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcursor - x11-libs/libXext - >=x11-libs/libXi-1.5 - x11-libs/libXrandr - x11-libs/libXrender - >=x11-libs/libxklavier-4 - x11-libs/pango - >=x11-wm/marco-1.17.0:= - accountsservice? ( sys-apps/accountsservice ) - appindicator? ( dev-libs/libappindicator:3 ) -" - -RDEPEND="${COMMON_DEPEND}" - -DEPEND="${COMMON_DEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-libs/libxml2 - dev-util/desktop-file-utils - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - x11-base/xorg-proto - virtual/pkgconfig -" - -src_configure() { - mate_src_configure \ - --disable-update-mimedb \ - $(use_enable appindicator) \ - $(use_enable debug) -} diff --git a/mate-base/mate-control-center/mate-control-center-1.26.0-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.26.0-r1.ebuild new file mode 100644 index 000000000000..f7fd98fd2f0c --- /dev/null +++ b/mate-base/mate-control-center/mate-control-center-1.26.0-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MATE_LA_PUNT="yes" + +inherit mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +DESCRIPTION="The MATE Desktop configuration tool" +LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND" +SLOT="0" + +IUSE="accountsservice appindicator debug nls" + +COMMON_DEPEND=" + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/atk + ) + >=dev-libs/glib-2.50:2 + dev-libs/libxml2:2 + >=gnome-base/dconf-0.13.4 + >=gnome-base/librsvg-2.0:2 + >=mate-base/libmatekbd-1.17.0 + >=mate-base/mate-desktop-1.25.0 + >=mate-base/caja-1.20.0 + >=mate-base/mate-menus-1.21.0 + >=media-libs/fontconfig-1:1.0 + media-libs/freetype:2 + media-libs/libcanberra:0[gtk3] + sys-auth/polkit[introspection] + x11-apps/xmodmap + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcursor + x11-libs/libXext + >=x11-libs/libXi-1.5 + x11-libs/libXrandr + x11-libs/libXrender + >=x11-libs/libxklavier-4 + x11-libs/pango + >=x11-wm/marco-1.17.0:= + accountsservice? ( sys-apps/accountsservice ) + appindicator? ( dev-libs/libappindicator:3 ) +" + +RDEPEND="${COMMON_DEPEND}" + +BDEPEND="${COMMON_DEPEND} + app-text/yelp-tools + dev-libs/libxml2 + dev-util/desktop-file-utils + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + x11-base/xorg-proto + virtual/pkgconfig +" + +src_configure() { + mate_src_configure \ + --disable-update-mimedb \ + $(use_enable appindicator) \ + $(use_enable nls) \ + $(use_enable debug) +} diff --git a/mate-base/mate-control-center/mate-control-center-1.26.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.26.0.ebuild deleted file mode 100644 index c05b199d782a..000000000000 --- a/mate-base/mate-control-center/mate-control-center-1.26.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" -fi - -DESCRIPTION="The MATE Desktop configuration tool" -LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND" -SLOT="0" - -IUSE="accountsservice appindicator debug nls" - -COMMON_DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - dev-libs/libxml2:2 - >=gnome-base/dconf-0.13.4 - >=gnome-base/librsvg-2.0:2 - >=mate-base/libmatekbd-1.17.0 - >=mate-base/mate-desktop-1.25.0 - >=mate-base/caja-1.20.0 - >=mate-base/mate-menus-1.21.0 - >=media-libs/fontconfig-1:1.0 - media-libs/freetype:2 - media-libs/libcanberra:0[gtk3] - sys-auth/polkit[introspection] - x11-apps/xmodmap - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcursor - x11-libs/libXext - >=x11-libs/libXi-1.5 - x11-libs/libXrandr - x11-libs/libXrender - >=x11-libs/libxklavier-4 - x11-libs/pango - >=x11-wm/marco-1.17.0:= - accountsservice? ( sys-apps/accountsservice ) - appindicator? ( dev-libs/libappindicator:3 ) -" - -RDEPEND="${COMMON_DEPEND}" - -BDEPEND="${COMMON_DEPEND} - app-text/yelp-tools - dev-libs/libxml2 - dev-util/desktop-file-utils - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - x11-base/xorg-proto - virtual/pkgconfig -" - -src_configure() { - mate_src_configure \ - --disable-update-mimedb \ - $(use_enable appindicator) \ - $(use_enable nls) \ - $(use_enable debug) -} -- cgit v1.2.3-65-gdbad