mate-base/mate-desktop: Drop old, sync with Gentoo

Package-Manager: Portage-2.3.82, Repoman-2.3.18
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>

8 files changed, 75 insertions, 139 deletions

diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index 971a2c2..5e3f64e 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,5 +1,4 @@
-DIST mate-desktop-1.12.1.tar.xz 773332 BLAKE2B 90e70929dcf1b3136a17ae658065d823dd052c53677db0b57e6843c4c86da4bd4de1f036c54b0fe0cc29b7c4e3bd83e9583a14ed148f30d67f8631a756891f50 SHA512 bcd3731bded736cdb4e0531d9c35253c025fa654d51f3ffb72ad7768ef62a1407b6ef62c2ff6beb45b0a30c2fe85e8d72c3e13068c92716e85f99f103b562c9e
-DIST mate-desktop-1.14.1.tar.xz 829244 BLAKE2B baecc3f130d095b2f1c679591ac48c28cf5fcb2b785ecd55ff03fde7b7b44b72cdf52dc38d931a2a312ce2999e5d3fc4a48cede4fc19d1ee2aa85f7e6003861e SHA512 b8d9688bfbea83d1264bce32be72fcb629b007e073553af24a9a79895baa29db3137cf6eed6a1bdf1a0b16ba3e02de892e85cbcfa62b84773d02fce71311496d
-DIST mate-desktop-1.16.1.tar.xz 810184 BLAKE2B ea30ff353dd5e20cdcd1854f5744c17bf80829ac7a965c9ad8f5a5ce9d61a4770a5a711b37a63fb63c1e3b7f6c15f9faa5dfad18465aaf046ea9ff1473c8b886 SHA512 4daec6ef5e9fd523962d34d59ecda91acb3831825100b2a96836d402dc187e1a4123642149bfa600a22a9ff1ed2a83632176a5864e2df027b29c5d42ef9d598d
-DIST mate-desktop-1.16.2.tar.xz 822124 BLAKE2B 5c5ad8048dabfd460662e5c9b0f9ddc08119fc1eda31a6496ba3f344f4625e3243e9c88c1ea9fd2cdb54ffba7957ab0f6907beb5ec82dc81ab854d4e77567cd2 SHA512 da557edae0f5e2ed197b3d4601fa49e791274f7c5e6ba47846ee47d886ac660849786b7b143028826a5c29520465c06f100df7d9999717aace05d78d0da1f6d7
-DIST mate-desktop-1.18.0.tar.xz 827332 BLAKE2B e5a0439c768a388a76f1bd2a7ba819d92fd020565d63d4b412c5edac54c28493e83d9fa9c5b9f7c82dd5d76338f257e7cb8db7318d7743f6101098f20d47db5c SHA512 0490e9810009923fa315e7f191103bc797c37f4417cf41bf317c55d26f7b52a848a65c28dde6903a861694c131ca52f3ed0be05cbbf6b2dd1cb216539f513220
+DIST mate-desktop-1.22.0.tar.xz 962580 BLAKE2B 0bc3418ab25fd9f30e216a5b845722327449f8d05944c028b4cb967acd6415ca9c3c560856485f34e90752c9a3263ba093e1eb69daaea2586c6371ad4c4ee22f SHA512 3950249c0bc026163da7f38a6fd5551c0e1e863e298e9d2ca224679b6c802d1deaf12e16ea873a2ea0539a7989a523d0495fb0dc4c556857203c0b04ab6edf7a
+DIST mate-desktop-1.22.1.tar.xz 901764 BLAKE2B 9da94899d48aa5b949dae466d9a581cd090feeba8b12949cbd9df20e79b8597420fb99785aab14f6a6faf2865e4a4b8356b2a2cc44d5eae087f37e7ec7957541 SHA512 bb2bf9de05439a0fcd4ab01ac628a2a235808cd07c1b7ce9abfbf2e64f98dc572603dfbd4a52bca5f03446825fba199715d7e08fcdc84f0df8d2ffeb4c87da62
+DIST mate-desktop-1.22.2.tar.xz 903312 BLAKE2B cadc8ade769d3a85b604ce7807235878d986a7d3bf3f2e05f836c783c3f3983cb760ff33b60b1c2f19538687aa62f5707f5f4eea9fef05d992080821d452783c SHA512 d2e965f9e26e4fe25337a4ef69521239388f38cff25e978331a307591555d8a9ff22d6a19ef3c92cf336c472fbfb231969ef5ac60e3a4c5908a81ded1e5f0f46
+DIST mate-desktop-1.24.0.tar.xz 1113912 BLAKE2B e5630ae4fe3f6a309d935153069b354a66d9d544bb3c2c7368373134b71a3d177385b157c01845742463ec8c91d0d4df1b39def7202142070221bb3dc7ba505b SHA512 ca60325e7f6167efd21bdd32ae40c2f2bf5ae9bef85f0a43afec05d50567fb650fc0426d94c510b3a42c625dc4b2d31d7559befa50cfbb6d9878635558a52323
diff --git a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild b/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
deleted file mode 100644
index a48d966..0000000
--- a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug gtk3 +introspection startup-notification"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?]
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	>=gnome-base/dconf-0.13.4:0
-	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		--disable-mate-conf-import \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
index 16df086..af4e2df 100644
--- a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,24 +8,23 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2+ FDL-1.1 LGPL-2+ MIT-with-advertising"
 SLOT="0"
 
-IUSE="X debug gtk3 +introspection startup-notification"
+IUSE="X debug +introspection startup-notification"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.3
+	virtual/libintl
+	>=x11-libs/gtk+-3.22:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
 
@@ -33,19 +32,17 @@ RDEPEND="${COMMON_DEPEND}"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
+	app-text/iso-codes
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40:*
 	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
+	x11-base/xorg-proto
 	virtual/pkgconfig:*"
 
 src_configure() {
 	mate_src_configure \
-		--disable-mpaste \
 		--enable-mate-about \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
 		$(use_with X x) \
 		$(use_enable debug) \
 		$(use_enable introspection) \
diff --git a/mate-base/mate-desktop/mate-desktop-1.16.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.1.ebuild
index 16df086..f4d6e69 100644
--- a/mate-base/mate-desktop/mate-desktop-1.16.1.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,24 +8,23 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2+ FDL-1.1 LGPL-2+ MIT-with-advertising"
 SLOT="0"
 
-IUSE="X debug gtk3 +introspection startup-notification"
+IUSE="X debug +introspection startup-notification"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.3
+	virtual/libintl
+	>=x11-libs/gtk+-3.22:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
 
@@ -33,19 +32,18 @@ RDEPEND="${COMMON_DEPEND}"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
+	app-text/iso-codes
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40:*
+	gnome-base/librsvg
 	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
+	x11-base/xorg-proto
 	virtual/pkgconfig:*"
 
 src_configure() {
 	mate_src_configure \
-		--disable-mpaste \
 		--enable-mate-about \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
 		$(use_with X x) \
 		$(use_enable debug) \
 		$(use_enable introspection) \
diff --git a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild
index 11f0461..d19a0f7 100644
--- a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,19 +12,19 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2+ FDL-1.1 LGPL-2+ MIT-with-advertising"
 SLOT="0"
 
 IUSE="X debug +introspection startup-notification"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.3
+	virtual/libintl
+	>=x11-libs/gtk+-3.22:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
 
@@ -32,12 +32,12 @@ RDEPEND="${COMMON_DEPEND}"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
+	app-text/iso-codes
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40:*
 	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
+	x11-base/xorg-proto
 	virtual/pkgconfig:*"
 
 src_configure() {
diff --git a/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.24.0.ebuild
index 49fc7f1..0c7949c 100644
--- a/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,44 +8,42 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="FDL-1.1 GPL-2+ LGPL-2+ MIT-with-advertising"
 SLOT="0"
 
-IUSE="X debug gtk3 +introspection startup-notification"
+IUSE="X debug +introspection startup-notification"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.3
+	>=x11-libs/gtk+-3.22:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
 
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
+	app-text/iso-codes
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
+	>=sys-devel/gettext-0.19.8:*
+	x11-base/xorg-proto
+	>=x11-libs/gdk-pixbuf-2.36.5
 	virtual/pkgconfig:*"
 
 src_configure() {
 	mate_src_configure \
-		--disable-mpaste \
 		--enable-mate-about \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
 		$(use_with X x) \
 		$(use_enable debug) \
 		$(use_enable introspection) \
diff --git a/mate-base/mate-desktop/mate-desktop-9999.ebuild b/mate-base/mate-desktop/mate-desktop-9999.ebuild
index ff8a88e..0c7949c 100644
--- a/mate-base/mate-desktop/mate-desktop-9999.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,36 +8,37 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="FDL-1.1 GPL-2+ LGPL-2+ MIT-with-advertising"
 SLOT="0"
 
 IUSE="X debug +introspection startup-notification"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.3
+	>=x11-libs/gtk+-3.22:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
 
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
+	app-text/iso-codes
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
+	>=sys-devel/gettext-0.19.8:*
+	x11-base/xorg-proto
+	>=x11-libs/gdk-pixbuf-2.36.5
 	virtual/pkgconfig:*"
 
 src_configure() {
diff --git a/mate-base/mate-desktop/metadata.xml b/mate-base/mate-desktop/metadata.xml
index 5d6f0fe..07d2ede 100644
--- a/mate-base/mate-desktop/metadata.xml
+++ b/mate-base/mate-desktop/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@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-desktop</remote-id>
 	</upstream>