From bffd321e4a18b01af4fb87e5805fe75be9dd5bbb Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 5 Oct 2022 19:59:39 +0100 Subject: mate-base/caja: 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-base/caja/caja-1.24.1-r1.ebuild | 97 ++++++++++++++++++++++++++++++++++++ mate-base/caja/caja-1.24.1.ebuild | 94 ---------------------------------- mate-base/caja/caja-1.26.0-r1.ebuild | 92 ++++++++++++++++++++++++++++++++++ mate-base/caja/caja-1.26.0.ebuild | 89 --------------------------------- 4 files changed, 189 insertions(+), 183 deletions(-) create mode 100644 mate-base/caja/caja-1.24.1-r1.ebuild delete mode 100644 mate-base/caja/caja-1.24.1.ebuild create mode 100644 mate-base/caja/caja-1.26.0-r1.ebuild delete mode 100644 mate-base/caja/caja-1.26.0.ebuild (limited to 'mate-base/caja') diff --git a/mate-base/caja/caja-1.24.1-r1.ebuild b/mate-base/caja/caja-1.24.1-r1.ebuild new file mode 100644 index 000000000000..2bbfb703314b --- /dev/null +++ b/mate-base/caja/caja-1.24.1-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit mate virtualx + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" +fi + +DESCRIPTION="Caja file manager for the MATE desktop" +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" + +IUSE="+introspection +mate packagekit xmp" + +COMMON_DEPEND=" + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/atk + ) + >=dev-libs/glib-2.58.1:2 + >=dev-libs/libxml2-2.4.7:2 + gnome-base/dconf + >=gnome-base/gvfs-1.10.1:0[udisks] + >=mate-base/mate-desktop-1.17.3:0 + >=media-libs/libexif-0.6.14:0 + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.36.5:2 + >=x11-libs/gtk+-3.22:3[introspection?] + >=x11-libs/libnotify-0.7.0:0 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrender + >=x11-libs/pango-1.1.2 + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + packagekit? ( app-admin/packagekit-base ) + xmp? ( >=media-libs/exempi-1.99.5:2 ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl + !!mate-base/mate-file-manager +" + +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5:= + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc + dev-util/gtk-doc-am + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )" + +# TODO: Test fails because Caja is not merged yet: +# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed +RESTRICT="test" + +src_prepare() { + # Remove unnecessary CFLAGS. + sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \ + configure.ac eel/Makefile.am || die + + mate_src_prepare +} + +src_configure() { + mate_src_configure \ + --disable-update-mimedb \ + $(use_enable introspection) \ + $(use_enable packagekit) \ + $(use_enable xmp) +} + +src_test() { + unset SESSION_MANAGER + unset DBUS_SESSION_BUS_ADDRESS + + Xemake check || die "Test phase failed" +} + +pkg_postinst() { + mate_pkg_postinst + + elog "Caja can use gstreamer to preview audio files. Just make sure" + elog "to have the necessary plugins available to play the media type you" + elog "want to preview." +} diff --git a/mate-base/caja/caja-1.24.1.ebuild b/mate-base/caja/caja-1.24.1.ebuild deleted file mode 100644 index 8a2e35819535..000000000000 --- a/mate-base/caja/caja-1.24.1.ebuild +++ /dev/null @@ -1,94 +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 virtualx - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" -fi - -DESCRIPTION="Caja file manager for the MATE desktop" -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" - -IUSE="+introspection +mate packagekit xmp" - -COMMON_DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.58.1:2 - >=dev-libs/libxml2-2.4.7:2 - gnome-base/dconf - >=gnome-base/gvfs-1.10.1:0[udisks] - >=mate-base/mate-desktop-1.17.3:0 - >=media-libs/libexif-0.6.14:0 - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.36.5:2 - >=x11-libs/gtk+-3.22:3[introspection?] - >=x11-libs/libnotify-0.7.0:0 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrender - >=x11-libs/pango-1.1.2 - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - packagekit? ( app-admin/packagekit-base ) - xmp? ( >=media-libs/exempi-1.99.5:2 ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/libintl - !!mate-base/mate-file-manager -" - -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5:= - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )" - -# TODO: Test fails because Caja is not merged yet: -# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed -RESTRICT="test" - -src_prepare() { - # Remove unnecessary CFLAGS. - sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \ - configure.ac eel/Makefile.am || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-update-mimedb \ - $(use_enable introspection) \ - $(use_enable packagekit) \ - $(use_enable xmp) -} - -src_test() { - unset SESSION_MANAGER - unset DBUS_SESSION_BUS_ADDRESS - - Xemake check || die "Test phase failed" -} - -pkg_postinst() { - mate_pkg_postinst - - elog "Caja can use gstreamer to preview audio files. Just make sure" - elog "to have the necessary plugins available to play the media type you" - elog "want to preview." -} diff --git a/mate-base/caja/caja-1.26.0-r1.ebuild b/mate-base/caja/caja-1.26.0-r1.ebuild new file mode 100644 index 000000000000..ef8bdd2aa917 --- /dev/null +++ b/mate-base/caja/caja-1.26.0-r1.ebuild @@ -0,0 +1,92 @@ +# 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="Caja file manager for the MATE desktop" +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" + +IUSE="+introspection +mate nls xmp" + +COMMON_DEPEND=" + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/atk + ) + >=dev-libs/glib-2.58.1:2 + >=dev-libs/libxml2-2.4.7:2 + gnome-base/dconf + >=gnome-base/gvfs-1.10.1:0[udisks] + >=mate-base/mate-desktop-1.17.3:0 + >=media-libs/libexif-0.6.14:0 + virtual/libintl + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.36.5:2 + >=x11-libs/gtk+-3.22:3[introspection?] + >=x11-libs/libnotify-0.7.0:0 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrender + >=x11-libs/pango-1.1.2 + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + xmp? ( >=media-libs/exempi-1.99.5:2 ) +" + +BDEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5:= + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc + dev-util/gtk-doc-am + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )" + +# TODO: Test fails because Caja is not merged yet: +# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed +RESTRICT="test" + +src_prepare() { + # Remove unnecessary CFLAGS. + sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \ + configure.ac eel/Makefile.am || die + + mate_src_prepare +} + +src_configure() { + mate_src_configure \ + --disable-update-mimedb \ + $(use_enable introspection) \ + $(use_enable nls) \ + $(use_enable xmp) +} + +src_test() { + unset SESSION_MANAGER + unset DBUS_SESSION_BUS_ADDRESS + + Xemake check || die "Test phase failed" +} + +pkg_postinst() { + mate_pkg_postinst + + elog "Caja can use gstreamer to preview audio files. Just make sure" + elog "to have the necessary plugins available to play the media type you" + elog "want to preview." +} diff --git a/mate-base/caja/caja-1.26.0.ebuild b/mate-base/caja/caja-1.26.0.ebuild deleted file mode 100644 index e087567496d1..000000000000 --- a/mate-base/caja/caja-1.26.0.ebuild +++ /dev/null @@ -1,89 +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="Caja file manager for the MATE desktop" -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" - -IUSE="+introspection +mate nls xmp" - -COMMON_DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.58.1:2 - >=dev-libs/libxml2-2.4.7:2 - gnome-base/dconf - >=gnome-base/gvfs-1.10.1:0[udisks] - >=mate-base/mate-desktop-1.17.3:0 - >=media-libs/libexif-0.6.14:0 - virtual/libintl - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.36.5:2 - >=x11-libs/gtk+-3.22:3[introspection?] - >=x11-libs/libnotify-0.7.0:0 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrender - >=x11-libs/pango-1.1.2 - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - xmp? ( >=media-libs/exempi-1.99.5:2 ) -" - -BDEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5:= - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )" - -# TODO: Test fails because Caja is not merged yet: -# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed -RESTRICT="test" - -src_prepare() { - # Remove unnecessary CFLAGS. - sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \ - configure.ac eel/Makefile.am || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-update-mimedb \ - $(use_enable introspection) \ - $(use_enable nls) \ - $(use_enable xmp) -} - -src_test() { - unset SESSION_MANAGER - unset DBUS_SESSION_BUS_ADDRESS - - Xemake check || die "Test phase failed" -} - -pkg_postinst() { - mate_pkg_postinst - - elog "Caja can use gstreamer to preview audio files. Just make sure" - elog "to have the necessary plugins available to play the media type you" - elog "want to preview." -} -- cgit v1.2.3-65-gdbad