diff options
author | Ettore Di Giacinto <mudler@gentoo.org> | 2017-03-14 17:31:28 +0100 |
---|---|---|
committer | Ettore Di Giacinto <mudler@gentoo.org> | 2017-03-14 17:32:12 +0100 |
commit | 66d0ca60ff7998df10de1fa45eeb058928bf436c (patch) | |
tree | b8e15e7a9aae2e9178b462b63cefc9ea9d77aa26 | |
parent | dev-libs/libmateweather: sync live ebuild (diff) | |
download | gentoo-mate-66d0ca60ff7998df10de1fa45eeb058928bf436c.tar.gz gentoo-mate-66d0ca60ff7998df10de1fa45eeb058928bf436c.tar.bz2 gentoo-mate-66d0ca60ff7998df10de1fa45eeb058928bf436c.zip |
mate-base/caja: sync live ebuild
* Drop gtk3 and unique useflags
* Now requires >=mate-base/mate-desktop-1.17.0 which is gtk3 only
Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r-- | mate-base/caja/caja-9999.ebuild | 25 | ||||
-rw-r--r-- | mate-base/caja/metadata.xml | 1 |
2 files changed, 6 insertions, 20 deletions
diff --git a/mate-base/caja/caja-9999.ebuild b/mate-base/caja/caja-9999.ebuild index 86b15ee..49801be 100644 --- a/mate-base/caja/caja-9999.ebuild +++ b/mate-base/caja/caja-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,17 +15,19 @@ DESCRIPTION="Caja file manager for the MATE desktop" LICENSE="GPL-2 LGPL-2 FDL-1.1" SLOT="0" -IUSE="gtk3 +introspection +mate packagekit xmp unique" +IUSE="+introspection +mate packagekit xmp" COMMON_DEPEND="dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] - >=mate-base/mate-desktop-1.15.1:0[gtk3(-)=] + >=mate-base/mate-desktop-1.17.0:0 >=media-libs/libexif-0.6.14:0 + virtual/libintl:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libnotify-0.7.0:0 x11-libs/libICE:0 x11-libs/libSM:0 @@ -34,15 +36,6 @@ COMMON_DEPEND="dev-libs/atk:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 - virtual/libintl:0 - !gtk3? ( - >=dev-libs/libunique-1:1 - >=x11-libs/gtk+-2.24:2[introspection?] - ) - gtk3? ( - unique? ( >=dev-libs/libunique-3:3 ) - >=x11-libs/gtk+-3.0:3[introspection?] - ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) @@ -74,17 +67,11 @@ src_prepare() { } src_configure() { - local myconf - if use gtk3; then - myconf="$(usex unique '' '--disable-libunique')" - fi mate_src_configure \ --disable-update-mimedb \ - --with-gtk=$(usex gtk3 3.0 2.0) \ $(use_enable introspection) \ $(use_enable packagekit) \ - $(use_enable xmp) \ - ${myconf} + $(use_enable xmp) } src_test() { diff --git a/mate-base/caja/metadata.xml b/mate-base/caja/metadata.xml index 393cb41..bcfdd1b 100644 --- a/mate-base/caja/metadata.xml +++ b/mate-base/caja/metadata.xml @@ -12,7 +12,6 @@ environment.</flag> <flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg> based on mimetype</flag> - <flag name="unique">Enable single instance support using <pkg>dev-libs/libunique</pkg>.</flag> </use> <upstream> <remote-id type="github">mate-desktop/caja</remote-id> |