commit:     b163719269589625f68b26810652c4f82ac2087a
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 18:42:03 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 22:49:22 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=b1637192

mate-extra/caja-extensions: Drop old, sync with Gentoo

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 mate-extra/caja-extensions/Manifest                |  7 +--
 .../caja-extensions-1.12.0-r1.ebuild               | 72 ----------------------
 ...1.14.1.ebuild => caja-extensions-1.22.0.ebuild} | 39 ++++++------
 ...1.18.2.ebuild => caja-extensions-1.22.1.ebuild} | 29 +++++----
 ...1.16.0.ebuild => caja-extensions-1.24.0.ebuild} | 42 ++++++-------
 .../caja-extensions/caja-extensions-9999.ebuild    | 34 +++++-----
 mate-extra/caja-extensions/metadata.xml            |  2 -
 7 files changed, 72 insertions(+), 153 deletions(-)

diff --git a/mate-extra/caja-extensions/Manifest 
b/mate-extra/caja-extensions/Manifest
index 10986ac..29431e7 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,4 +1,3 @@
-DIST caja-extensions-1.12.0.tar.xz 370600 BLAKE2B 
5a243eac18112158585c2c856a1e7664e15c5a140cf6e1c414e8b230fd266d1e8487126615bab52a18d7b00814ca09638702bb6831e0a7fd09f1d2d578106827
 SHA512 
b36f759f21a206d76dada61f9410135c393fea77eaaf387a81788c6c2757aed5536b8129add2b4469b8d18f17de115369d70ec9278e8a4b9b9a3cfbb24ac38fb
-DIST caja-extensions-1.14.1.tar.xz 400108 BLAKE2B 
323ae913969b6e11361511633076adcfa172b1f15077e70c799de921eb2ea862afa39e7497bbb309a9ca4dfca28bff0e470f19efd9ea09b0c1bf8f88add2de5d
 SHA512 
622ab7a2175c2eb4ea5153887fb500f7c63e7aea8bcea19d43e891013bceab5bb5e8f1d83eedf7ff167737185a22327e6a085e3c84bce40955d97938fff73527
-DIST caja-extensions-1.16.0.tar.xz 402208 BLAKE2B 
47b20289d61e596e17d4d17a80535cd50778749c17fb46dfd59ab250186515866e456feb005dc0a7b4ded37ac0f11a0ec2f04d40f6b55e813afe015d3ecc09a9
 SHA512 
7f856ec1b087b605b7cb455a7ed5742d44eb79cc6dcd869a680d4a4e2466c795dbb96f556476959d12bea7670e63a2b460d35a6e19f197ef2350c59e157c475c
-DIST caja-extensions-1.18.2.tar.xz 410704 BLAKE2B 
e13dde75bf616463f34d41df0b3be28d283383bd3ef56e24ce6cc0f319f0a7fea1b8dd75076582a78157c076de26f72235fe7b6f445f150547944a072b62038e
 SHA512 
cbc3e6c02cdf93aa98e17232b9cdc9579355e2a31ea9421e6829eb2ba6fe50c7d6ba33b737f1286c9b0730a8781e8c060140ea47b216ef60b0bbaafabc9d836d
+DIST caja-extensions-1.22.0.tar.xz 444704 BLAKE2B 
d14f14e2ab18e9e6ea9c039d675e2948c309d470b1532e0585915f324bcf52a8e8425fdf0b6e725014e8813eefad77300172843c2118d098811b2b349d218fd1
 SHA512 
19fd287123b8d2ba67b636066e9f8910aadd47d375eb1d52136d9b808b48abacade81dde490ce3edb6fc4a9d2ddfd39d9abf294a58aed8bcaf620c1eff03e761
+DIST caja-extensions-1.22.1.tar.xz 439516 BLAKE2B 
2135e5a30c86b6f83396b9f80ff474355fe02c652cd898728431eddef22a6804e7a4ea15579b03c0984417e81f8ba89ff856aa384e94d5168b6a883e678b683a
 SHA512 
4c0fb47a251d4118c83a985732d8a549355907519b746a68eb8843c84328d868eec1535b68484c46e3d0bf4b42f0e0340fe178714f50b5f7cc8434c0e1883906
+DIST caja-extensions-1.24.0.tar.xz 548828 BLAKE2B 
0492e1f0ca7277737102f71fd195dd585614010b80c2aafd730aacd1d817b03fe0377c430615a3e4bd4a643558c02c9c4fdb2d451079a3b213fe0e6b9d4e02de
 SHA512 
f05a7d83f16aebacb04f75b76ca86e44c1a01d9ad6c2aefeac19398c4d9da8385e6852fa0118c763aee630e7eb6c7c81d77e0c9452200aee9cf4f058487c4dbf

diff --git a/mate-extra/caja-extensions/caja-extensions-1.12.0-r1.ebuild 
b/mate-extra/caja-extensions/caja-extensions-1.12.0-r1.ebuild
deleted file mode 100644
index 35de811..0000000
--- a/mate-extra/caja-extensions/caja-extensions-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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 x86"
-fi
-
-DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-       >=mate-base/caja-1.7[gtk3(-)=]
-       virtual/libintl:0
-       x11-libs/gdk-pixbuf:2
-       cdr? ( >=app-cdr/brasero-2.32.1:0= )
-       gajim? (
-               net-im/gajim:0
-               >=dev-libs/dbus-glib-0.60:0
-               >=sys-apps/dbus-1:0
-       )
-       gksu? ( x11-libs/gksu )
-       !gtk3? ( >=x11-libs/gtk+-2.24:2 )
-       gtk3? ( >=x11-libs/gtk+-3.0:3 )
-       image-converter? (
-               || (
-                       media-gfx/imagemagick
-                       media-gfx/graphicsmagick[imagemagick]
-               )
-       )
-       open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-       pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-       upnp? ( >=net-libs/gupnp-0.13:0= )"
-
-DEPEND="${RDEPEND}
-       dev-util/gtk-doc
-       dev-util/gtk-doc-am
-       >=dev-util/intltool-0.18:*
-       sys-devel/gettext:*
-       virtual/pkgconfig:*
-       !!mate-extra/mate-file-manager-open-terminal
-       !!mate-extra/mate-file-manager-sendto
-       !!mate-extra/mate-file-manager-image-converter
-       !!mate-extra/mate-file-manager-share"
-
-src_configure() {
-       local sendto_plugins="removable-devices"
-       use cdr && sendto_plugins+=",caja-burn"
-       use mail && sendto_plugins+=",emailclient"
-       use pidgin && sendto_plugins+=",pidgin"
-       use gajim && sendto_plugins+=",gajim"
-       use upnp && sendto_plugins+=",upnp"
-
-       mate_src_configure \
-               --enable-sendto \
-               --with-sendto-plugins=${sendto_plugins}\
-               --with-gtk=$(usex gtk3 3.0 2.0) \
-               $(use_enable gksu) \
-               $(use_enable image-converter) \
-               $(use_enable open-terminal) \
-               $(use_enable share) \
-               $(use_enable wallpaper)
-}

diff --git a/mate-extra/caja-extensions/caja-extensions-1.14.1.ebuild 
b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
similarity index 63%
rename from mate-extra/caja-extensions/caja-extensions-1.14.1.ebuild
rename to mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
index 4cd25ff..3f9edda 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.14.1.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,34 +8,33 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-       KEYWORDS="~amd64 ~arm ~x86"
+       KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
+IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
 
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-       >=mate-base/caja-1.7[gtk3(-)=]
-       virtual/libintl:0
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+       >=mate-base/caja-1.21.3
+       virtual/libintl
        x11-libs/gdk-pixbuf:2
+       >=x11-libs/gtk+-3.22:3
        gajim? (
-               >=dev-libs/dbus-glib-0.60:0
-               >=sys-apps/dbus-1:0
+               >=dev-libs/dbus-glib-0.60
+               >=sys-apps/dbus-1
        )
-       !gtk3? ( >=x11-libs/gtk+-2.24:2 )
-       gtk3? ( >=x11-libs/gtk+-3.0:3 )
-       open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-       pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-       upnp? ( >=net-libs/gupnp-0.13:0= )"
+       open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
+       pidgin? ( >=dev-libs/dbus-glib-0.60 )
+       upnp? ( >=net-libs/gupnp-0.13:0/4 )
+       xattr? ( sys-apps/attr )"
 
 RDEPEND="${COMMON_DEPEND}
-       cdr? ( >=app-cdr/brasero-2.32.1:0= )
-       gajim? ( net-im/gajim:0 )
-       gksu? ( x11-libs/gksu )
+       cdr? ( >=app-cdr/brasero-2.32.1:= )
+       gajim? ( net-im/gajim )
        image-converter? (
                || (
                        media-gfx/imagemagick
@@ -66,10 +65,10 @@ src_configure() {
        mate_src_configure \
                --enable-sendto \
                --with-sendto-plugins=${sendto_plugins}\
-               --with-gtk=$(usex gtk3 3.0 2.0) \
-               $(use_enable gksu) \
+               --disable-gksu \
                $(use_enable image-converter) \
                $(use_enable open-terminal) \
                $(use_enable share) \
-               $(use_enable wallpaper)
+               $(use_enable wallpaper) \
+               $(use_enable xattr xattr-tags)
 }

diff --git a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild 
b/mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild
similarity index 73%
rename from mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
rename to mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild
index 9eaec9b..da783c5 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,30 +12,29 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
+IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
 
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-       >=mate-base/caja-1.17.1
-       virtual/libintl:0
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+       >=mate-base/caja-1.21.3
+       virtual/libintl
        x11-libs/gdk-pixbuf:2
-       >=x11-libs/gtk+-3.14:3
+       >=x11-libs/gtk+-3.22:3
        gajim? (
-               >=dev-libs/dbus-glib-0.60:0
-               >=sys-apps/dbus-1:0
+               >=dev-libs/dbus-glib-0.60
+               >=sys-apps/dbus-1
        )
        open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
-       pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-       upnp? ( >=net-libs/gupnp-0.13:0= )
+       pidgin? ( >=dev-libs/dbus-glib-0.60 )
+       upnp? ( >=net-libs/gupnp-0.13:0/4 )
        xattr? ( sys-apps/attr )"
 
 RDEPEND="${COMMON_DEPEND}
-       cdr? ( >=app-cdr/brasero-2.32.1:0= )
-       gajim? ( net-im/gajim:0 )
-       gksu? ( x11-libs/gksu )
+       cdr? ( >=app-cdr/brasero-2.32.1:= )
+       gajim? ( net-im/gajim )
        image-converter? (
                || (
                        media-gfx/imagemagick
@@ -66,7 +65,7 @@ src_configure() {
        mate_src_configure \
                --enable-sendto \
                --with-sendto-plugins=${sendto_plugins}\
-               $(use_enable gksu) \
+               --disable-gksu \
                $(use_enable image-converter) \
                $(use_enable open-terminal) \
                $(use_enable share) \

diff --git a/mate-extra/caja-extensions/caja-extensions-1.16.0.ebuild 
b/mate-extra/caja-extensions/caja-extensions-1.24.0.ebuild
similarity index 60%
rename from mate-extra/caja-extensions/caja-extensions-1.16.0.ebuild
rename to mate-extra/caja-extensions/caja-extensions-1.24.0.ebuild
index 4cd25ff..53f34f0 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.16.0.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,34 +8,32 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-       KEYWORDS="~amd64 ~arm ~x86"
+       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
+IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
 
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-       >=mate-base/caja-1.7[gtk3(-)=]
-       virtual/libintl:0
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+       >=mate-base/caja-1.21.3
        x11-libs/gdk-pixbuf:2
+       >=x11-libs/gtk+-3.22:3
        gajim? (
-               >=dev-libs/dbus-glib-0.60:0
-               >=sys-apps/dbus-1:0
+               >=dev-libs/dbus-glib-0.60
+               >=sys-apps/dbus-1
        )
-       !gtk3? ( >=x11-libs/gtk+-2.24:2 )
-       gtk3? ( >=x11-libs/gtk+-3.0:3 )
-       open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-       pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-       upnp? ( >=net-libs/gupnp-0.13:0= )"
+       open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
+       pidgin? ( >=dev-libs/dbus-glib-0.60 )
+       upnp? ( >=net-libs/gupnp-0.13:0/4 )
+       xattr? ( sys-apps/attr )"
 
 RDEPEND="${COMMON_DEPEND}
-       cdr? ( >=app-cdr/brasero-2.32.1:0= )
-       gajim? ( net-im/gajim:0 )
-       gksu? ( x11-libs/gksu )
+       cdr? ( >=app-cdr/brasero-2.32.1:= )
+       gajim? ( net-im/gajim )
        image-converter? (
                || (
                        media-gfx/imagemagick
@@ -45,10 +43,10 @@ RDEPEND="${COMMON_DEPEND}
        pidgin? ( net-im/pidgin )"
 
 DEPEND="${COMMON_DEPEND}
+       dev-libs/libxml2
        dev-util/gtk-doc
        dev-util/gtk-doc-am
-       >=dev-util/intltool-0.18:*
-       sys-devel/gettext:*
+       >=sys-devel/gettext-0.19.8:*
        virtual/pkgconfig:*
        !!mate-extra/mate-file-manager-open-terminal
        !!mate-extra/mate-file-manager-sendto
@@ -66,10 +64,10 @@ src_configure() {
        mate_src_configure \
                --enable-sendto \
                --with-sendto-plugins=${sendto_plugins}\
-               --with-gtk=$(usex gtk3 3.0 2.0) \
-               $(use_enable gksu) \
+               --disable-gksu \
                $(use_enable image-converter) \
                $(use_enable open-terminal) \
                $(use_enable share) \
-               $(use_enable wallpaper)
+               $(use_enable wallpaper) \
+               $(use_enable xattr xattr-tags)
 }

diff --git a/mate-extra/caja-extensions/caja-extensions-9999.ebuild 
b/mate-extra/caja-extensions/caja-extensions-9999.ebuild
index e589dd0..53f34f0 100644
--- a/mate-extra/caja-extensions/caja-extensions-9999.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,34 +8,32 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-       KEYWORDS="~amd64 ~arm ~x86"
+       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
+IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
 
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-       >=mate-base/caja-1.17.1
-       virtual/libintl:0
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+       >=mate-base/caja-1.21.3
        x11-libs/gdk-pixbuf:2
-       >=x11-libs/gtk+-3.14:3
+       >=x11-libs/gtk+-3.22:3
        gajim? (
-               >=dev-libs/dbus-glib-0.60:0
-               >=sys-apps/dbus-1:0
+               >=dev-libs/dbus-glib-0.60
+               >=sys-apps/dbus-1
        )
        open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
-       pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-       upnp? ( >=net-libs/gupnp-0.13:0= )
+       pidgin? ( >=dev-libs/dbus-glib-0.60 )
+       upnp? ( >=net-libs/gupnp-0.13:0/4 )
        xattr? ( sys-apps/attr )"
 
 RDEPEND="${COMMON_DEPEND}
-       cdr? ( >=app-cdr/brasero-2.32.1:0= )
-       gajim? ( net-im/gajim:0 )
-       gksu? ( x11-libs/gksu )
+       cdr? ( >=app-cdr/brasero-2.32.1:= )
+       gajim? ( net-im/gajim )
        image-converter? (
                || (
                        media-gfx/imagemagick
@@ -45,10 +43,10 @@ RDEPEND="${COMMON_DEPEND}
        pidgin? ( net-im/pidgin )"
 
 DEPEND="${COMMON_DEPEND}
+       dev-libs/libxml2
        dev-util/gtk-doc
        dev-util/gtk-doc-am
-       >=dev-util/intltool-0.18:*
-       sys-devel/gettext:*
+       >=sys-devel/gettext-0.19.8:*
        virtual/pkgconfig:*
        !!mate-extra/mate-file-manager-open-terminal
        !!mate-extra/mate-file-manager-sendto
@@ -66,7 +64,7 @@ src_configure() {
        mate_src_configure \
                --enable-sendto \
                --with-sendto-plugins=${sendto_plugins}\
-               $(use_enable gksu) \
+               --disable-gksu \
                $(use_enable image-converter) \
                $(use_enable open-terminal) \
                $(use_enable share) \

diff --git a/mate-extra/caja-extensions/metadata.xml 
b/mate-extra/caja-extensions/metadata.xml
index 0852c69..5a572b7 100644
--- a/mate-extra/caja-extensions/metadata.xml
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -8,8 +8,6 @@
        <use>
                <flag name="cdr">Add an extension to burn files to cds using 
<pkg>app-cdr/brasero</pkg>.</flag>
                <flag name="gajim">Add an extension to support 
<pkg>net-im/gajim</pkg>.</flag>
-               <flag name="gksu">Add an extension to support opening files as 
root with <pkg>x11-libs/gksu</pkg>.</flag>
-               <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
                <flag name="image-converter">Add image conversion 
support.</flag>
                <flag name="mail">Add an extension to support e-mail 
functionality.</flag>
                <flag name="open-terminal">Add an extension to support an open 
terminal.</flag>

Reply via email to