gentoo Easter resync : 12.04.2020

4 files changed, 60 insertions, 6 deletions

diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index 9b8d31e5b2fe..9e22b97daac7 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,5 +1,7 @@
 DIST mate-user-share-1.22.0.tar.xz 927068 BLAKE2B a37d3a886ec3cad4427ccff94c00ce2d2412607f16aacf0a8ae4096f0c63c61f07f10cbd902d3a62d74f2a172b3dcbd5575f5c027045a9d31bdf4cffce4a8de2 SHA512 151532ebe031a973e8825d86c9a315697f5930f89d78960946da3ba135238e3130c59018d04cf9dc8d343ff1613e51254701bbf8e23a9881733ecbb7e6fb9f18
 DIST mate-user-share-1.22.1.tar.xz 921944 BLAKE2B dfa3b304bc81c82abf9a2354ede94b08672f2e8cd28b4def0f0dad0f6389c762d68ddb1924918c89eee40374eedfff312ffc4a9c65d3766be240ede182072837 SHA512 afd2c2f8484124e26ac9ced23abd89c1b553adb4df6ca8bd49159e3ec5d76f2b16f6576b7f5608488e5290cddef733e27c653433ee9f57a09a6b76b774555894
-EBUILD mate-user-share-1.22.0.ebuild 1106 BLAKE2B 396a85cb2d9af0c2b18b42b6eb6fe1b66411d9bb7d5b2a38c9a63dd5ea0c6405d395606b77186165a8a4904514d1bb7f5d9f435f0f6709487e8109ddb74ff34f SHA512 1f0b0e01d58819560ab8fe9efb9132633f164fa0ae61770a22854f59c9cbb2fb6c4746a6b20ed4b149d4f0a30cbd16870317c1dd6688bd38e115e77d4d552225
-EBUILD mate-user-share-1.22.1.ebuild 1108 BLAKE2B 145d227e176ddd5aef577b0e8187e64ee3145fa3b3126337a2f74879ce98db48e28bee95bef9847d011fb92823896aeea7acf33b754cd37fdb413362c8de2310 SHA512 69b8a32580beee3fc87c79158f3f7c3ec34c6d3433f8efbf25a72123c968cd9aa95586cf919c19b89685c569ddb933f13a6d7d5724dbe37e2b27ab95695f1bda
+DIST mate-user-share-1.24.0.tar.xz 1008992 BLAKE2B 0fe21e49ff30c88c32b6b88aba84e58b3e6310d3bbd7a4873be460c97366828a7edfd24be37d2c10ea88a51c6990ee482ad595582d288ded2e4f7e0ca6f0b4e0 SHA512 15ede8754bf95ac78844cd9645a43d2deb8419dd550aee5263936d710cd13ce7f4a68cfd53e589c2dd37f87f59c9e8153f8abac711a3a7f88a2e2789dbd4f664
+EBUILD mate-user-share-1.22.0.ebuild 1116 BLAKE2B 8316d50ca80bfd877de0b539c624fce4ecf661441bf04dff9d5aa9ea335ec0fb4d35ddd225e2637b30b7f2737c74a27ca6ba3ee46b04f8f2c38c5d2dd7ff46c8 SHA512 204c1173bd54a10500f202b10c4bf131fd8088aceb7579b66c00b0e108af9c2d61914079c7c3ab5014def87645f99ba87326bfe46eb6c6ab7ab8b4975711781f
+EBUILD mate-user-share-1.22.1.ebuild 1118 BLAKE2B 10aff3e7b65a56e5b739b3fc609e44a06176d05fb3d85732dad6bbe440d748f0ef740475707e2fd16925637a121b57fcd2aaec61a96efd99cfe960b143b0f58f SHA512 cfc360cfe803624ddee61896c95f13b27b2899c2ab97de155bdeef0332b64604409c8d4b2e88e0cb48ac3e694e6efe47ad53c797a237b720d61186444abc2a6d
+EBUILD mate-user-share-1.24.0.ebuild 1104 BLAKE2B 0fa36f0282b1c5e1281c2fe8c5e1d4dc86c2747673bcdd341d0803fecbda5ace69f2266967bb5817061ce36d84054dc0ef5c53b34d26be9d05931eca5aa8c93b SHA512 e868504a488e2d5ed2e2abaad3939fcce81d92606b24c2f98198f100469619b3234464776a898fdbaaea16cb260657e3e644d67ac299c1a532f323b4ff705fef
 MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
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 aa87a8dc105f..3373fa4c5436 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
 SLOT="0"
 
 IUSE="X"
diff --git a/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild
index 80932af77200..4d22498948df 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
 SLOT="0"
 
 IUSE="X"
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
new file mode 100644
index 000000000000..dbfca4d5174f
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
@@ -0,0 +1,52 @@
+# 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)
+}