From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73754138334 for ; Wed, 4 Jul 2018 14:56:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE9B2E095C; Wed, 4 Jul 2018 14:56:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69A65E095C for ; Wed, 4 Jul 2018 14:56:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 171B3335CA6 for ; Wed, 4 Jul 2018 14:56:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1499354 for ; Wed, 4 Jul 2018 14:56:23 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1530716176.0ddf37c140f7a9ff8fa7ce6d813881f9918f3ddc.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/open-vm-tools/metadata.xml app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild X-VCS-Directories: app-emulation/open-vm-tools/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 0ddf37c140f7a9ff8fa7ce6d813881f9918f3ddc X-VCS-Branch: master Date: Wed, 4 Jul 2018 14:56:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c3d076b1-20ad-4a95-9f45-0c3eaaa08698 X-Archives-Hash: 562fe614f79550e10bd24da5f3586743 commit: 0ddf37c140f7a9ff8fa7ce6d813881f9918f3ddc Author: Mike Gilbert gentoo org> AuthorDate: Wed Jul 4 14:51:48 2018 +0000 Commit: Mike Gilbert gentoo 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 @@ Generate API documentation Enable vmblock-fuse/vmhgfs-fuse Build grabbitmqproxy plugin - Compile with GTK+ 2 - Compile with GTK+ 3 (Recommended) Compile with Gtkmm and sigc++ (Recommended) Enable multimon (Requires X) Force shared libraries to be built as PIC 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)