gentoo resync : 03.07.2021

3 files changed, 3 insertions, 56 deletions

diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index 5523e0c84b62..12b949e52bb9 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,4 +1,3 @@
 DIST mate-user-share-1.24.0.tar.xz 1008992 BLAKE2B 0fe21e49ff30c88c32b6b88aba84e58b3e6310d3bbd7a4873be460c97366828a7edfd24be37d2c10ea88a51c6990ee482ad595582d288ded2e4f7e0ca6f0b4e0 SHA512 15ede8754bf95ac78844cd9645a43d2deb8419dd550aee5263936d710cd13ce7f4a68cfd53e589c2dd37f87f59c9e8153f8abac711a3a7f88a2e2789dbd4f664
-EBUILD mate-user-share-1.24.0-r1.ebuild 1100 BLAKE2B 2dd083ad60b109c651ad46c2179326286c5d5e4891d0fbbbbf73a6f069826bb28dfa46215d0b350b33e4462cf6126f9733cf442b1ec89c499bb515db6e083f39 SHA512 1dc25f06dda89668b41046e76bc5db7c08ea93bdd26d2528cfbdb6044dc9271263d300475407276769cb3189d3e68457ea8aedf875c469fb270291167960fd10
-EBUILD mate-user-share-1.24.0.ebuild 1102 BLAKE2B 975da5ec09b6f4c1160a742905d10bc4e1c9770be0723dc9ec97e4ce8e59d3f44c2fbfde5bdfa1a8404d3d8d8c5fbc6d7d38e7479561834457f8d024b0f78683 SHA512 9cfecad9df86b00fa698f633602d77de3b554600d40703cc3a2cb26f64ad7eb566653269afda1f764d90a0b8e50c61d3254b87dcdf30e5047f6b620f1258d77b
+EBUILD mate-user-share-1.24.0-r1.ebuild 1098 BLAKE2B 80888945dafd4dfb006cca9c54a2d23723dff013263b13eb81eb3fe5e8acde7d6b294906ebd0fc2bd6c324bee76c93f8a645ce674adfc86a05af5a0bc0bf2274 SHA512 69523f9505bb17d705e6deb196dd9a843bcebb09508cdaec2bcba21304f32a48cf6ed3995dafc4382b4dba4430a0f54c5a4480bddef26b0c87f379ee210f95f3
 MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
diff --git a/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
index 5b09cfcba02b..ad03ba381bf4 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Personal file sharing for the MATE desktop"
diff --git a/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
deleted file mode 100644
index ec2217c7e294..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 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 x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+"
-SLOT="0"
-
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70
-	>=dev-libs/glib-2.50:2
-	>=mate-base/caja-1.17.1
-	media-libs/libcanberra[gtk3]
-	>=sys-apps/dbus-1.1.1
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/pango
-	>=x11-libs/libnotify-0.7
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=www-apache/mod_dnssd-0.6
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		$(use_with X x)
-}