| 1 |
commit: 0ddf37c140f7a9ff8fa7ce6d813881f9918f3ddc |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 4 14:51:48 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 4 14:56:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddf37c1 |
| 7 |
|
| 8 |
app-emulation/open-vm-tools: drop gtk2 again |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247 |
| 11 |
|
| 12 |
app-emulation/open-vm-tools/metadata.xml | 2 -- |
| 13 |
.../open-vm-tools/open-vm-tools-10.2.5.ebuild | 24 +++++++--------------- |
| 14 |
2 files changed, 7 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml |
| 17 |
index e493eb3e04b..9e8e61bb812 100644 |
| 18 |
--- a/app-emulation/open-vm-tools/metadata.xml |
| 19 |
+++ b/app-emulation/open-vm-tools/metadata.xml |
| 20 |
@@ -22,8 +22,6 @@ |
| 21 |
<flag name="doc">Generate API documentation</flag> |
| 22 |
<flag name="fuse">Enable vmblock-fuse/vmhgfs-fuse</flag> |
| 23 |
<flag name="grabbitmqproxy">Build grabbitmqproxy plugin</flag> |
| 24 |
- <flag name="gtk2">Compile with GTK+ 2</flag> |
| 25 |
- <flag name="gtk3">Compile with GTK+ 3 (Recommended)</flag> |
| 26 |
<flag name="gtkmm">Compile with Gtkmm and sigc++ (Recommended)</flag> |
| 27 |
<flag name="multimon">Enable multimon (Requires X)</flag> |
| 28 |
<flag name="pic">Force shared libraries to be built as PIC</flag> |
| 29 |
|
| 30 |
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 |
| 31 |
index 9efaa12f538..43c63e4d58a 100644 |
| 32 |
--- a/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild |
| 33 |
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild |
| 34 |
@@ -13,12 +13,8 @@ SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/ |
| 35 |
LICENSE="LGPL-2.1" |
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="~amd64 ~x86" |
| 38 |
-IUSE="X caf +deploypkg +dnet doc +fuse +grabbitmqproxy gtk2 gtk3 gtkmm +icu multimon pam +resolutionkms +ssl static-libs test +vgauth +xml-security-c xmlsec" |
| 39 |
+IUSE="X caf +deploypkg +dnet doc +fuse +grabbitmqproxy gtkmm +icu multimon pam +resolutionkms +ssl static-libs test +vgauth +xml-security-c xmlsec" |
| 40 |
REQUIRED_USE=" |
| 41 |
- X? ( ^^ ( gtk2 gtk3 ) ) |
| 42 |
- gtk2? ( X ) |
| 43 |
- gtk3? ( X ) |
| 44 |
- gtkmm? ( || ( gtk2 gtk3 ) ) |
| 45 |
multimon? ( X ) |
| 46 |
vgauth? ( |
| 47 |
^^ ( xmlsec xml-security-c ) |
| 48 |
@@ -49,15 +45,11 @@ RDEPEND=" |
| 49 |
x11-libs/libSM |
| 50 |
x11-libs/libXcomposite |
| 51 |
x11-libs/gdk-pixbuf:2 |
| 52 |
- gtk3? ( |
| 53 |
- x11-libs/gtk+:3 |
| 54 |
- gtkmm? ( dev-cpp/gtkmm:3.0 ) |
| 55 |
+ x11-libs/gtk+:3 |
| 56 |
+ gtkmm? ( |
| 57 |
+ dev-cpp/gtkmm:3.0 |
| 58 |
+ dev-libs/libsigc++:2 |
| 59 |
) |
| 60 |
- gtk2? ( |
| 61 |
- x11-libs/gtk+:2 |
| 62 |
- gtkmm? ( dev-cpp/gtkmm:2.4 ) |
| 63 |
- ) |
| 64 |
- gtkmm? ( dev-libs/libsigc++:2 ) |
| 65 |
) |
| 66 |
dnet? ( dev-libs/libdnet ) |
| 67 |
icu? ( dev-libs/icu:= ) |
| 68 |
@@ -108,10 +100,8 @@ src_configure() { |
| 69 |
--without-root-privileges |
| 70 |
$(use_enable multimon) |
| 71 |
$(use_with X x) |
| 72 |
- $(use_with gtk3) |
| 73 |
- $(use_with gtk2) |
| 74 |
- $(use gtk3 && use_with gtkmm gtkmm3) |
| 75 |
- $(use gtk2 && use_with gtkmm) |
| 76 |
+ $(use_with X gtk3) |
| 77 |
+ $(use_with gtkmm gtkmm3) |
| 78 |
$(use_enable doc docs) |
| 79 |
$(use_enable test tests) |
| 80 |
$(use_enable resolutionkms) |
Archives