gentoo resync : 25.08.2020

4 files changed, 2 insertions, 93 deletions

diff --git a/mate-extra/caja-admin/Manifest b/mate-extra/caja-admin/Manifest
index 34b602f84f6b..0f8324c21ff1 100644
--- a/mate-extra/caja-admin/Manifest
+++ b/mate-extra/caja-admin/Manifest
@@ -1,8 +1,4 @@
-DIST caja-admin-0.0.1.tar.gz 26920 BLAKE2B 29aa35ef185cd588fd9242ea2b019cb64c4a4965b77523937b8b36c3a3437f7171dac3a000b85d9c4183a962a9dc6be787589408c7804f696aeac3576b7fee50 SHA512 12f54aad32ac11d34ee8344d564d31f29a53324308923e54426ac3837702e71701cf139b150ec3ff210fb0739eb9c46b05c6380d8596031f71b71899800b767d
-DIST caja-admin-0.0.2.tar.gz 27564 BLAKE2B 975bbba48508ed6a997190ea6d5432330710ee312fe6f1e130b47894331a35c32071a40691cf69f617d268ab85dca62bb8bb4577d49bdb3c75c65ce05b4b9220 SHA512 919a92e258585e4b6275d346c82a1f9fc90462aa0cdedafb78867b80496f44bbd3459ce5a67429c5dda499bff2928a014779e81c781278ac0603f6cbebd3ff9e
 DIST caja-admin-0.0.2_p20200328.tar.gz 27087 BLAKE2B 1d8ce82026249cff4dc3360cedffb79079e6608414a7718f265a19fce1a579d7f1fc4dadf3b05dd5ef19dbd12a92a61f90c04736cc9196d2dd5d4230c8c31784 SHA512 6a134e1d53bbdbf1a617582de67f7ddba7c7e0193a714246993092dd1c96c2ccc05afdb2da5cd2dfd974f7ab95e0aeedab244f2fa1335fd157ce45b4404a1f90
-EBUILD caja-admin-0.0.1.ebuild 985 BLAKE2B 19258e5b11024d68e2d2b25381e1693dfd9e3e1d96ec2da99dba83c5fcd689183607235a795b2acbdcc81c22e7ace97be2b945815ba6bd9d4c5bd6c81e7e7c3c SHA512 c49a2e259dfc2ea42334ba35bcabd14a1538a62fc2671ac4e154ec02dde3425593935b2474c9388126930089d4ae2054117bf5309f30a765f3035c1cfb1eb522
-EBUILD caja-admin-0.0.2.ebuild 1134 BLAKE2B cbd965950ae8ee96f4502cf838a8c04ef10e45d0d50ea45d270014d8a172246d437474b5f2bf538271061748a2132921f8eeacae7742f51b291f61f42b85955d SHA512 b68d3e320f62a799ecf76d7462b636ea5eff3742064afa1df07f99ba6573c729aa347a7cc7187948e7edb3771c956dfaf54295f8edf0b44c0baa049a020ccff9
-EBUILD caja-admin-0.0.2_p20200328.ebuild 1098 BLAKE2B 0388354dc0c894077fad7912a3898f2e0279c94b23c6b9f7fe50e2e34d5316b1eab212591cd73efc4eb22bc1baa3c5e9618a75a5f7f4bfa01e6247192709f171 SHA512 afa95da5771408fa307303d0caa6daaad0a85908521a32310db2cd2a858af53a0a4b5b480f60f722febd94e30c8c37907cab358a2b99a126ecd01043bd892ebf
+EBUILD caja-admin-0.0.2_p20200328.ebuild 1096 BLAKE2B 64ef8eabe177823e3985fe487f4f1b70de95ab3f183aa44c9c44f5ccd4a9ddcb889b26264faf597cc74a440570f6c26bbe4b8799d925b8fc549ce89894deb225 SHA512 7446f2fdf74d428ac87e756d4fa4a9275783cea3b830b666b3b51822ac3900176467f08bfb52914a4f4f0d320af24fa6ba60b3044b05a5e7f90aa7128bf0277d
 EBUILD caja-admin-9999.ebuild 1098 BLAKE2B 0388354dc0c894077fad7912a3898f2e0279c94b23c6b9f7fe50e2e34d5316b1eab212591cd73efc4eb22bc1baa3c5e9618a75a5f7f4bfa01e6247192709f171 SHA512 afa95da5771408fa307303d0caa6daaad0a85908521a32310db2cd2a858af53a0a4b5b480f60f722febd94e30c8c37907cab358a2b99a126ecd01043bd892ebf
 MISC metadata.xml 576 BLAKE2B 58ee67d8ab8d6d88fc88c26f67ab9e7df19c560d693de2212389768bfb936717ff979234e420998656c1f66cc09e6c751a5096bb99ef4e3a6ffcfd971d9e52fa SHA512 d620037387d28caeee09881c6335b244d50a778713dacd3598725e14db7bb35b1c5f3e0ac5ed671b2d5d8f6dcc8d37b5fe1bdd355c874d1e62c9e9096c57f426
diff --git a/mate-extra/caja-admin/caja-admin-0.0.1.ebuild b/mate-extra/caja-admin/caja-admin-0.0.1.ebuild
deleted file mode 100644
index 0f9713cd71c1..000000000000
--- a/mate-extra/caja-admin/caja-admin-0.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/infirit/caja-admin"
-elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
-	SHA="0af109ac79df76fbcc406d577d79f1c64d1a1fca"
-	SRC_URI="https://github.com/infirit/${PN}/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${SHA}"
-else
-	SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-CMAKE_MIN_VERSION="2.6"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Caja Admin Extension"
-HOMEPAGE="https://github.com/infirit/caja-admin"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
-	sys-auth/polkit
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-BDEPEND=""
diff --git a/mate-extra/caja-admin/caja-admin-0.0.2.ebuild b/mate-extra/caja-admin/caja-admin-0.0.2.ebuild
deleted file mode 100644
index e8b56019ac8f..000000000000
--- a/mate-extra/caja-admin/caja-admin-0.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/infirit/caja-admin"
-elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
-	SHA="0af109ac79df76fbcc406d577d79f1c64d1a1fca"
-	SRC_URI="https://github.com/infirit/${PN}/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${SHA}"
-else
-	SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-CMAKE_MIN_VERSION="2.6"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Caja Admin Extension"
-HOMEPAGE="https://github.com/infirit/caja-admin"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	app-editors/pluma
-	dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
-	sys-auth/polkit
-	x11-terms/mate-terminal
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-BDEPEND=""
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize "${D}/usr/share/caja-python/extensions"
-}
diff --git a/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
index 23078ea5a48f..bf4dcec2641e 100644
--- a/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
+++ b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
@@ -13,7 +13,7 @@ elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
 	S="${WORKDIR}/${PN}-${SHA}"
 else
 	SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )