gentoo resync : 28.04.2019

3 files changed, 2 insertions, 54 deletions

diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index e70e0f9de0b5..8313194b8539 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,5 +1,3 @@
-DIST mate-user-share-1.18.0.tar.xz 919404 BLAKE2B fc81dbe17a0ed57eb7baaa385fe786d73a5d64171e51735de061c9c7fbe69f0174f984d75ae39e7b0dcd7bf5562655cf599f394ab7ed50bba520b8472da1111f SHA512 581a53efc115b3b2bac455d828bb689c79bc2a0c5bf3fb2a560ae7eb153b6a8c9589695ca540bb759498c0dc21e016f634a0aabf8e9863c42c5ae7712c91d058
 DIST mate-user-share-1.22.0.tar.xz 927068 BLAKE2B a37d3a886ec3cad4427ccff94c00ce2d2412607f16aacf0a8ae4096f0c63c61f07f10cbd902d3a62d74f2a172b3dcbd5575f5c027045a9d31bdf4cffce4a8de2 SHA512 151532ebe031a973e8825d86c9a315697f5930f89d78960946da3ba135238e3130c59018d04cf9dc8d343ff1613e51254701bbf8e23a9881733ecbb7e6fb9f18
-EBUILD mate-user-share-1.18.0.ebuild 1140 BLAKE2B ee04b9b2c5405d9eedea9ee634c73aacf715ac3c0c3b7708d4af6c16d95e4a3d48c86ac0f27eb6077fea2ed0b77ae2d8bb4dd4b201a7dd54b0f8aeb95ddef55e SHA512 f3c17574014123ad34e7f64920a1e120dfde11f6be19c9df648fcd44e27581f5c621bc52c486aeb735bdf29bc56e99cc1d1770134137046a64f4197963053f6f
-EBUILD mate-user-share-1.22.0.ebuild 1108 BLAKE2B 145d227e176ddd5aef577b0e8187e64ee3145fa3b3126337a2f74879ce98db48e28bee95bef9847d011fb92823896aeea7acf33b754cd37fdb413362c8de2310 SHA512 69b8a32580beee3fc87c79158f3f7c3ec34c6d3433f8efbf25a72123c968cd9aa95586cf919c19b89685c569ddb933f13a6d7d5724dbe37e2b27ab95695f1bda
+EBUILD mate-user-share-1.22.0.ebuild 1106 BLAKE2B 396a85cb2d9af0c2b18b42b6eb6fe1b66411d9bb7d5b2a38c9a63dd5ea0c6405d395606b77186165a8a4904514d1bb7f5d9f435f0f6709487e8109ddb74ff34f SHA512 1f0b0e01d58819560ab8fe9efb9132633f164fa0ae61770a22854f59c9cbb2fb6c4746a6b20ed4b149d4f0a30cbd16870317c1dd6688bd38e115e77d4d552225
 MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
diff --git a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
deleted file mode 100644
index 41b9177bfed6..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate multilib
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=mate-base/caja-1.17.1
-	media-libs/libcanberra:0[gtk3]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=www-apache/mod_dnssd-0.6:0
-	>=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]"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		$(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
index 80932af77200..aa87a8dc105f 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
@@ -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"