commit: a102c199d898e142c48059a8a5c6d5f4f6c458f6
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 21:01:10 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 22:49:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=a102c199
mate-extra/mate-user-share: 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/mate-user-share/Manifest | 7 ++-
.../mate-user-share/mate-user-share-1.12.0.ebuild | 57 ---------------------
.../mate-user-share/mate-user-share-1.14.0.ebuild | 59 ----------------------
...1.16.0.ebuild => mate-user-share-1.22.0.ebuild} | 44 +++++++---------
...1.18.0.ebuild => mate-user-share-1.22.1.ebuild} | 30 +++++------
...1.18.0.ebuild => mate-user-share-1.24.0.ebuild} | 38 +++++++-------
.../mate-user-share/mate-user-share-9999.ebuild | 38 +++++++-------
mate-extra/mate-user-share/metadata.xml | 3 --
8 files changed, 76 insertions(+), 200 deletions(-)
diff --git a/mate-extra/mate-user-share/Manifest
b/mate-extra/mate-user-share/Manifest
index f6b1ecd..499d1c9 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,4 +1,3 @@
-DIST mate-user-share-1.12.0.tar.xz 931776 BLAKE2B
810441690c333b5fcc77904bd39f4bbc3548fccb99852aa6a05a0c6021fec470c636fe34f1c2ecef020ed1499c55648463a40fce23a14168315838849719fdf2
SHA512
928bcfa594ba56b84bde249b71fb6315d7dd20fc46c1300edb4f9ab3296a468f1105934ba8cb351e47cef52dac5ca70bdc2f3f7d2166219ded7b7016bea23c24
-DIST mate-user-share-1.14.0.tar.xz 902728 BLAKE2B
12ca9cf01b7f91bb3e67fdcfd259dc31a4712524404507302f49a88bb2dc9ce1bb8cda480ec6172ecbc4cbe55e6111dae90298bc61a0a9bf4cd6776380b1a1e6
SHA512
a9ad934b0681d1168d7ea3b7d3120cb39f230b7267cd71a91f511f03f132a8e8022bb339fcd017c243988214a82dd337cacb65875d9e35e4c10f014f39eefbe1
-DIST mate-user-share-1.16.0.tar.xz 918148 BLAKE2B
1cb1be82876eb383eb6642ef1f562c0c7d770391524ae15529a1b06f0fa3e48c9b9b1babb7e75c4543f35798b666d8ffefee40c6a4d5ceff86486e610557841b
SHA512
fe8994f288360bbecfc7055a0222f18be81b5cd74d620948c7e60365f56869c9dd25efb3262224a3b5d1071ec36419c3fde925c31038d04e60026c63d132252c
-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
+DIST mate-user-share-1.22.1.tar.xz 921944 BLAKE2B
dfa3b304bc81c82abf9a2354ede94b08672f2e8cd28b4def0f0dad0f6389c762d68ddb1924918c89eee40374eedfff312ffc4a9c65d3766be240ede182072837
SHA512
afd2c2f8484124e26ac9ced23abd89c1b553adb4df6ca8bd49159e3ec5d76f2b16f6576b7f5608488e5290cddef733e27c653433ee9f57a09a6b76b774555894
+DIST mate-user-share-1.24.0.tar.xz 1008992 BLAKE2B
0fe21e49ff30c88c32b6b88aba84e58b3e6310d3bbd7a4873be460c97366828a7edfd24be37d2c10ea88a51c6990ee482ad595582d288ded2e4f7e0ca6f0b4e0
SHA512
15ede8754bf95ac78844cd9645a43d2deb8419dd550aee5263936d710cd13ce7f4a68cfd53e589c2dd37f87f59c9e8153f8abac711a3a7f88a2e2789dbd4f664
diff --git a/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
b/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
deleted file mode 100644
index 477b173..0000000
--- a/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
+++ /dev/null
@@ -1,57 +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 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 gtk3"
-
-RDEPEND="
- >=dev-libs/dbus-glib-0.70:0
- >=dev-libs/glib-2.15.2:2
- >=mate-base/caja-1.6[gtk3(-)=]
- >=sys-apps/dbus-1.1.1:0
- >=x11-libs/gdk-pixbuf-2:2
- x11-libs/libX11:0
- x11-libs/pango:0
- >=x11-libs/libnotify-0.7:0
- >=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]
- virtual/libintl:0
- !gtk3? (
- >=dev-libs/libunique-1:1
- media-libs/libcanberra:0[gtk]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- >=dev-libs/libunique-3:3
- media-libs/libcanberra:0[gtk3]
- >=x11-libs/gtk+-3.0:3
- )"
-
-DEPEND="${RDEPEND}
- 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 \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
b/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
deleted file mode 100644
index 88e86f0..0000000
--- a/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
+++ /dev/null
@@ -1,59 +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 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 gtk3"
-
-COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.70:0
- >=dev-libs/glib-2.15.2:2
- >=mate-base/caja-1.6[gtk3(-)=]
- >=sys-apps/dbus-1.1.1:0
- >=x11-libs/gdk-pixbuf-2:2
- x11-libs/libX11:0
- x11-libs/pango:0
- >=x11-libs/libnotify-0.7:0
- virtual/libintl:0
- !gtk3? (
- >=dev-libs/libunique-1:1
- media-libs/libcanberra:0[gtk]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- >=dev-libs/libunique-3:3
- media-libs/libcanberra:0[gtk3]
- >=x11-libs/gtk+-3.0:3
- )"
-
-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 \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
similarity index 53%
rename from mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
rename to mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
index 11f1d7f..3373fa4 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
@@ -1,50 +1,43 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MATE_LA_PUNT="yes"
-inherit mate multilib
+inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
SLOT="0"
-IUSE="X gtk3"
+IUSE="X"
COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.70:0
- >=dev-libs/glib-2.15.2:2
- >=mate-base/caja-1.6[gtk3(-)=]
- >=sys-apps/dbus-1.1.1:0
+ >=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/libX11:0
- x11-libs/pango:0
- >=x11-libs/libnotify-0.7:0
- virtual/libintl:0
- !gtk3? (
- >=dev-libs/libunique-1:1
- media-libs/libcanberra:0[gtk]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- media-libs/libcanberra:0[gtk3]
- >=x11-libs/gtk+-3.0:3
- )"
+ >=x11-libs/gtk+-3.22:3
+ x11-libs/libX11
+ x11-libs/pango
+ >=x11-libs/libnotify-0.7
+ virtual/libintl"
RDEPEND="${COMMON_DEPEND}
- >=www-apache/mod_dnssd-0.6:0
+ >=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]"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools:0
- >=dev-util/intltool-0.35:*
+ app-text/yelp-tools
+ >=dev-util/intltool-0.35
sys-devel/gettext:*
virtual/pkgconfig:*"
@@ -53,6 +46,5 @@ src_configure() {
--with-httpd=apache2 \
--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
--disable-bluetooth \
- --with-gtk=$(usex gtk3 3.0 2.0) \
$(use_with X x)
}
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.22.1.ebuild
similarity index 66%
copy from mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
copy to mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild
index 5fe69b7..4d22498 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.22.1.ebuild
@@ -1,43 +1,43 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MATE_LA_PUNT="yes"
-inherit mate multilib
+inherit mate
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
fi
DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
SLOT="0"
IUSE="X"
COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.70:0
- >=dev-libs/glib-2.15.2:2
+ >=dev-libs/dbus-glib-0.70
+ >=dev-libs/glib-2.50:2
>=mate-base/caja-1.17.1
- media-libs/libcanberra:0[gtk3]
- >=sys-apps/dbus-1.1.1:0
+ media-libs/libcanberra[gtk3]
+ >=sys-apps/dbus-1.1.1
>=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"
+ >=x11-libs/gtk+-3.22:3
+ x11-libs/libX11
+ x11-libs/pango
+ >=x11-libs/libnotify-0.7
+ virtual/libintl"
RDEPEND="${COMMON_DEPEND}
- >=www-apache/mod_dnssd-0.6:0
+ >=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]"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools:0
- >=dev-util/intltool-0.35:*
+ app-text/yelp-tools
+ >=dev-util/intltool-0.35
sys-devel/gettext:*
virtual/pkgconfig:*"
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.24.0.ebuild
similarity index 60%
rename from mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
rename to mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
index 5fe69b7..dbfca4d 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
@@ -1,45 +1,47 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MATE_LA_PUNT="yes"
-inherit mate multilib
+inherit mate
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
fi
DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
SLOT="0"
IUSE="X"
COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.70:0
- >=dev-libs/glib-2.15.2:2
+ >=dev-libs/dbus-glib-0.70
+ >=dev-libs/glib-2.50:2
>=mate-base/caja-1.17.1
- media-libs/libcanberra:0[gtk3]
- >=sys-apps/dbus-1.1.1:0
+ media-libs/libcanberra[gtk3]
+ >=sys-apps/dbus-1.1.1
>=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"
+ >=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: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]"
+ >=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:0
- >=dev-util/intltool-0.35:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ app-text/yelp-tools
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig:*
+"
src_configure() {
mate_src_configure \
diff --git a/mate-extra/mate-user-share/mate-user-share-9999.ebuild
b/mate-extra/mate-user-share/mate-user-share-9999.ebuild
index 5fe69b7..dbfca4d 100644
--- a/mate-extra/mate-user-share/mate-user-share-9999.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-9999.ebuild
@@ -1,45 +1,47 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MATE_LA_PUNT="yes"
-inherit mate multilib
+inherit mate
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
fi
DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+"
SLOT="0"
IUSE="X"
COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.70:0
- >=dev-libs/glib-2.15.2:2
+ >=dev-libs/dbus-glib-0.70
+ >=dev-libs/glib-2.50:2
>=mate-base/caja-1.17.1
- media-libs/libcanberra:0[gtk3]
- >=sys-apps/dbus-1.1.1:0
+ media-libs/libcanberra[gtk3]
+ >=sys-apps/dbus-1.1.1
>=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"
+ >=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: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]"
+ >=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:0
- >=dev-util/intltool-0.35:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ app-text/yelp-tools
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig:*
+"
src_configure() {
mate_src_configure \
diff --git a/mate-extra/mate-user-share/metadata.xml
b/mate-extra/mate-user-share/metadata.xml
index 99735b0..e67f167 100644
--- a/mate-extra/mate-user-share/metadata.xml
+++ b/mate-extra/mate-user-share/metadata.xml
@@ -5,9 +5,6 @@
<email>m...@gentoo.org</email>
<name>Gentoo MATE Desktop</name>
</maintainer>
- <use>
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
- </use>
<upstream>
<remote-id
type="github">mate-desktop/mate-user-share</remote-id>
</upstream>
