x11-terms/mate-terminal: add explicit build dep on glib-utils

Closes: https://bugs.gentoo.org/667406
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

7 files changed, 2 insertions, 185 deletions

diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index a0499bd44159..4043c19c311a 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,4 +1 @@
-DIST mate-terminal-1.12.1.tar.xz 1143628 BLAKE2B 241edfc9cf36518638e7817e4f11ab89dfcbbc1dd11d7e10ee17bc81ceb8224fd582a1cab4b4e2aa3a24f2997298689f7bc98f07b698243885cad1c85a81eea6 SHA512 c37b725db1522153fcb4dc596205f9382605bf981504217c8b087a4d7e6086a5c40644cdab1eb3c0593632d4f38d45fbcdfd763cb1ef62ff7359335c54b6ff42
-DIST mate-terminal-1.14.1.tar.xz 1313612 BLAKE2B d8710d336964d7bc46e2e309de214bd5968697ae4b9ee750b30ff5af93480ba2bf74661698b14e4a81287c3689be4e45afb1031864183c9864773ea2097b2b2c SHA512 e7c68dfce1e9b886449774567f225cf267366ab857e510de3bae9867442306defe0b1d86bc90782326f4c252620311f6846a50b89a3f8939e8cfb816e25db209
-DIST mate-terminal-1.16.3.tar.xz 1279764 BLAKE2B 2908a9d003f1fd0e9faae3a69b55fe2a21c8ce7f54e91497964090f24f1abe553c0c4e9a28d31ac8351e9745acd496b843e1282c74fe37e41590d1b30faa5688 SHA512 b5045b57e6ad8931230edbd83cbad4e99422ccf8dbeb760327d091993012981c0ad6bfc7ae39aaeffdf8beb27a18d74c831b4e51bcef7709d7dc63bf77bcf7ad
 DIST mate-terminal-1.18.2.tar.xz 1302216 BLAKE2B 9b2e0171f62e75e967389aa3b06bcf908a9884055d220bca895ac01f8f21a4102f21a759f2b5e2f06bf2d8c18af3688f000ed9414525df203a79d2b6e66d7443 SHA512 ac35890dc955743ccf7d8176e710820179cc5dd8a89a8322eb99c29796c27586a6abb1503288896faf1eeba6047fad12cf506e67674ee6221313679061acf8c8
diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild
deleted file mode 100644
index 9823dc8c3f04..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.6[gtk3(-)=]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2
-		>=x11-libs/vte-0.28:0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[X]
-		>=x11-libs/vte-0.38:2.91
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild
deleted file mode 100644
index 9eb68011adb6..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.6[gtk3(-)=]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2
-		>=x11-libs/vte-0.28:0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/vte-0.38:2.91
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild
deleted file mode 100644
index 8c3f9cc7b3bd..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.6[gtk3(-)=]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2
-		>=x11-libs/vte-0.28:0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[X]
-		>=x11-libs/vte-0.38:2.91
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild b/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild
deleted file mode 100644
index 33f211aa820c..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/gtk+-3.14:3[X]
-	>=x11-libs/vte-0.38:2.91"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
diff --git a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
index 49f9068abe51..fbcc14a77757 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/rarian:0
 	>=app-text/scrollkeeper-dtd-1:1.0
 	app-text/yelp-tools:0
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml
index 2f0acb5747d8..85e126f0649a 100644
--- a/x11-terms/mate-terminal/metadata.xml
+++ b/x11-terms/mate-terminal/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-terminal</remote-id>
 	</upstream>