[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     0ddf37c140f7a9ff8fa7ce6d813881f9918f3ddc
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 14:51:48 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 14:56:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddf37c1

app-emulation/open-vm-tools: drop gtk2 again

Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247

 app-emulation/open-vm-tools/metadata.xml           |  2 --
 .../open-vm-tools/open-vm-tools-10.2.5.ebuild      | 24 +++++++---------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml
index e493eb3e04b..9e8e61bb812 100644
--- a/app-emulation/open-vm-tools/metadata.xml
+++ b/app-emulation/open-vm-tools/metadata.xml
@@ -22,8 +22,6 @@
 		<flag name="doc">Generate API documentation</flag>
 		<flag name="fuse">Enable vmblock-fuse/vmhgfs-fuse</flag>
 		<flag name="grabbitmqproxy">Build grabbitmqproxy plugin</flag>
-		<flag name="gtk2">Compile with GTK+ 2</flag>
-		<flag name="gtk3">Compile with GTK+ 3 (Recommended)</flag>
 		<flag name="gtkmm">Compile with Gtkmm and sigc++ (Recommended)</flag>
 		<flag name="multimon">Enable multimon (Requires X)</flag>
 		<flag name="pic">Force shared libraries to be built as PIC</flag>

diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild
index 9efaa12f538..43c63e4d58a 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild
@@ -13,12 +13,8 @@ SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X caf +deploypkg +dnet doc +fuse +grabbitmqproxy gtk2 gtk3 gtkmm +icu multimon pam +resolutionkms +ssl static-libs test +vgauth +xml-security-c xmlsec"
+IUSE="X caf +deploypkg +dnet doc +fuse +grabbitmqproxy gtkmm +icu multimon pam +resolutionkms +ssl static-libs test +vgauth +xml-security-c xmlsec"
 REQUIRED_USE="
-	X? ( ^^ ( gtk2 gtk3 ) )
-	gtk2? ( X )
-	gtk3? ( X )
-	gtkmm? ( || ( gtk2 gtk3 ) )
 	multimon? ( X )
 	vgauth? (
 		^^ ( xmlsec xml-security-c )
@@ -49,15 +45,11 @@ RDEPEND="
 		x11-libs/libSM
 		x11-libs/libXcomposite
 		x11-libs/gdk-pixbuf:2
-		gtk3? (
-			x11-libs/gtk+:3
-			gtkmm? ( dev-cpp/gtkmm:3.0 )
+		x11-libs/gtk+:3
+		gtkmm? (
+			dev-cpp/gtkmm:3.0
+			dev-libs/libsigc++:2
 		)
-		gtk2? (
-			x11-libs/gtk+:2
-			gtkmm? ( dev-cpp/gtkmm:2.4 )
-		)
-		gtkmm? ( dev-libs/libsigc++:2 )
 	)
 	dnet? ( dev-libs/libdnet )
 	icu? ( dev-libs/icu:= )
@@ -108,10 +100,8 @@ src_configure() {
 		--without-root-privileges
 		$(use_enable multimon)
 		$(use_with X x)
-		$(use_with gtk3)
-		$(use_with gtk2)
-		$(use gtk3 && use_with gtkmm gtkmm3)
-		$(use gtk2 && use_with gtkmm)
+		$(use_with X gtk3)
+		$(use_with gtkmm gtkmm3)
 		$(use_enable doc docs)
 		$(use_enable test tests)
 		$(use_enable resolutionkms)