1 |
commit: abe8cf0fb513a94e18123b0c8098548600bba7a6 |
2 |
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it> |
3 |
AuthorDate: Sun Jun 25 14:54:42 2017 +0000 |
4 |
Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net> |
5 |
CommitDate: Sun Jun 25 14:54:42 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=abe8cf0f |
7 |
|
8 |
Align ebuild structure between player and workstation, version 11 |
9 |
|
10 |
.../files/{vmware-11.4.rc => vmware-7.1.rc} | 0 |
11 |
.../vmware-player/files/vmware-network.service | 17 -- |
12 |
.../files/vmware-usbarbitrator.service | 11 -- |
13 |
.../vmware-player-7.1.4.3848939.ebuild | 200 ++++++++++++++------- |
14 |
.../vmware-workstation-11.1.4.3848939.ebuild | 47 +++-- |
15 |
5 files changed, 163 insertions(+), 112 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/vmware-player/files/vmware-11.4.rc b/app-emulation/vmware-player/files/vmware-7.1.rc |
18 |
similarity index 100% |
19 |
rename from app-emulation/vmware-player/files/vmware-11.4.rc |
20 |
rename to app-emulation/vmware-player/files/vmware-7.1.rc |
21 |
|
22 |
diff --git a/app-emulation/vmware-player/files/vmware-network.service b/app-emulation/vmware-player/files/vmware-network.service |
23 |
deleted file mode 100644 |
24 |
index abc6648..0000000 |
25 |
--- a/app-emulation/vmware-player/files/vmware-network.service |
26 |
+++ /dev/null |
27 |
@@ -1,17 +0,0 @@ |
28 |
-[Unit] |
29 |
-Description=VMware Network |
30 |
-Requires=local-fs.target |
31 |
-Wants=network.target vmware-usbarbitrator.service |
32 |
-After=local-fs.target network.target vmware-usbarbitrator.service |
33 |
- |
34 |
-[Service] |
35 |
-Type=simple |
36 |
-ExecStartPre=/sbin/modprobe -av vmci vmmon vsock vmblock vmnet |
37 |
-ExecStart=/opt/vmware/bin/vmware-networks --start |
38 |
-ExecStop=/opt/vmware/bin/vmware-networks --stop |
39 |
-ExecStopPost=/sbin/modprobe -rv vmmon vsock vmblock vmnet vmci |
40 |
-TimeoutSec=0 |
41 |
-RemainAfterExit=yes |
42 |
- |
43 |
-[Install] |
44 |
-WantedBy=multi-user.target |
45 |
|
46 |
diff --git a/app-emulation/vmware-player/files/vmware-usbarbitrator.service b/app-emulation/vmware-player/files/vmware-usbarbitrator.service |
47 |
deleted file mode 100644 |
48 |
index 16a0fb8..0000000 |
49 |
--- a/app-emulation/vmware-player/files/vmware-usbarbitrator.service |
50 |
+++ /dev/null |
51 |
@@ -1,11 +0,0 @@ |
52 |
-[Unit] |
53 |
-Description=VMware USB Arbitrator |
54 |
-Requires=local-fs.target |
55 |
-Before=vmware-network.service |
56 |
- |
57 |
-[Service] |
58 |
-Type=forking |
59 |
-ExecStart=/opt/vmware/bin/vmware-usbarbitrator |
60 |
- |
61 |
-[Install] |
62 |
-WantedBy=multi-user.target |
63 |
|
64 |
diff --git a/app-emulation/vmware-player/vmware-player-7.1.4.3848939.ebuild b/app-emulation/vmware-player/vmware-player-7.1.4.3848939.ebuild |
65 |
index 3761a59..8d9d0f6 100644 |
66 |
--- a/app-emulation/vmware-player/vmware-player-7.1.4.3848939.ebuild |
67 |
+++ b/app-emulation/vmware-player/vmware-player-7.1.4.3848939.ebuild |
68 |
@@ -1,10 +1,10 @@ |
69 |
-# Copyright 1999-2016 Gentoo Foundation |
70 |
+# Copyright 1999-2017 Gentoo Foundation |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
# $Id$ |
73 |
|
74 |
EAPI=5 |
75 |
|
76 |
-inherit eutils versionator readme.gentoo fdo-mime gnome2-utils pax-utils systemd vmware-bundle |
77 |
+inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pax-utils vmware-bundle |
78 |
|
79 |
MY_PN="VMware-Player" |
80 |
MY_PV=$(get_version_component_range 1-3) |
81 |
@@ -12,70 +12,120 @@ PV_MINOR=$(get_version_component_range 3) |
82 |
PV_BUILD=$(get_version_component_range 4) |
83 |
MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" |
84 |
|
85 |
-DESCRIPTION="Emulate a complete PC without the usual performance overhead of most emulators" |
86 |
+SYSTEMD_UNITS_TAG="gentoo-02" |
87 |
+ |
88 |
+DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" |
89 |
HOMEPAGE="http://www.vmware.com/products/player/" |
90 |
BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/" |
91 |
SRC_URI=" |
92 |
amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) |
93 |
+ https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz |
94 |
" |
95 |
- |
96 |
LICENSE="vmware GPL-2" |
97 |
SLOT="0" |
98 |
KEYWORDS="-* ~amd64" |
99 |
-IUSE="cups doc ovftool +vmware-tools" |
100 |
-RESTRICT="strip" |
101 |
+IUSE="bundled-libs cups doc ovftool +vmware-tools" |
102 |
+RESTRICT="mirror strip" |
103 |
+ |
104 |
+BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib |
105 |
+ |
106 |
+BUNDLED_LIBS=" |
107 |
+ libXau.so.6 |
108 |
+ libXcomposite.so.1 |
109 |
+ libXcursor.so.1 |
110 |
+ libXdamage.so.1 |
111 |
+ libXdmcp.so.6 |
112 |
+ libXfixes.so.3 |
113 |
+ libXft.so.2 |
114 |
+ libXinerama.so.1 |
115 |
+ libXrandr.so.2 |
116 |
+ libXrender.so.1 |
117 |
+ libatk-1.0.so.0 |
118 |
+ libatkmm-1.6.so.1 |
119 |
+ libatspi.so.0 |
120 |
+ libcairo.so.2 |
121 |
+ libcairomm-1.0.so.1 |
122 |
+ libcurl.so.4 |
123 |
+ libdbus-1.so.3 |
124 |
+ libfontconfig.so.1 |
125 |
+ libfreetype.so.6 |
126 |
+ libfuse.so.2 |
127 |
+ libgailutil.so.18 |
128 |
+ libgdk-x11-2.0.so.0 |
129 |
+ libgcrypt.so.11 |
130 |
+ libgdk_pixbuf-2.0.so.0 |
131 |
+ libgdkmm-2.4.so.1 |
132 |
+ libgio-2.0.so.0 |
133 |
+ libgiomm-2.4.so.1 |
134 |
+" |
135 |
|
136 |
-# vmware-workstation should not use virtual/libc as this is a |
137 |
-# precompiled binary package thats linked to glibc. |
138 |
-RDEPEND="dev-cpp/cairomm |
139 |
- dev-cpp/glibmm:2 |
140 |
- dev-cpp/gtkmm:2.4 |
141 |
- dev-cpp/libgnomecanvasmm:2.6 |
142 |
- dev-cpp/pangomm:1.4 |
143 |
+BUNDLED_LIB_DEPENDS=" |
144 |
+ x11-libs/libXau |
145 |
+ x11-libs/libXcomposite |
146 |
+ x11-libs/libXcursor |
147 |
+ x11-libs/libXdamage |
148 |
+ x11-libs/libXdmcp |
149 |
+ x11-libs/libXfixes |
150 |
+ x11-libs/libXft |
151 |
+ x11-libs/libXinerama |
152 |
+ x11-libs/libXrandr |
153 |
+ x11-libs/libXrender |
154 |
dev-libs/atk |
155 |
+ dev-cpp/atkmm |
156 |
+ app-accessibility/at-spi2-core |
157 |
+ x11-libs/cairo |
158 |
+ dev-cpp/cairomm |
159 |
+ net-misc/curl |
160 |
+ media-libs/fontconfig |
161 |
+ media-libs/freetype |
162 |
+ sys-fs/fuse |
163 |
+ x11-libs/gtk+:2 |
164 |
+ || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 ) |
165 |
+ x11-libs/gdk-pixbuf:2 |
166 |
+ dev-cpp/gtkmm:2.4 |
167 |
dev-libs/glib:2 |
168 |
- dev-libs/libaio |
169 |
+ dev-cpp/glibmm:2 |
170 |
+" |
171 |
+ |
172 |
+# vmware-workstation should not use virtual/libc as this is a |
173 |
+# precompiled binary package thats linked to glibc. |
174 |
+RDEPEND=" |
175 |
+ dev-cpp/libgnomecanvasmm |
176 |
+ dev-cpp/pangomm |
177 |
+ dev-libs/icu |
178 |
+ dev-libs/expat |
179 |
dev-libs/libsigc++:2 |
180 |
dev-libs/libxml2 |
181 |
- =dev-libs/openssl-0.9.8* |
182 |
+ dev-libs/openssl:0 |
183 |
dev-libs/xmlrpc-c |
184 |
gnome-base/libgnomecanvas |
185 |
gnome-base/libgtop:2 |
186 |
gnome-base/librsvg:2 |
187 |
gnome-base/orbit |
188 |
- media-libs/fontconfig |
189 |
- media-libs/freetype |
190 |
media-libs/libart_lgpl |
191 |
- =media-libs/libpng-1.2* |
192 |
- net-misc/curl |
193 |
+ media-libs/libpng:1.2 |
194 |
+ media-libs/libpng |
195 |
+ media-libs/tiff:3 |
196 |
cups? ( net-print/cups ) |
197 |
sys-devel/gcc |
198 |
- sys-fs/fuse |
199 |
sys-libs/glibc |
200 |
sys-libs/zlib |
201 |
- x11-libs/cairo |
202 |
- x11-libs/gtk+:2 |
203 |
x11-libs/libgksu |
204 |
x11-libs/libICE |
205 |
x11-libs/libSM |
206 |
x11-libs/libX11 |
207 |
- x11-libs/libXau |
208 |
x11-libs/libxcb |
209 |
- x11-libs/libXcomposite |
210 |
- x11-libs/libXcursor |
211 |
- x11-libs/libXdamage |
212 |
- x11-libs/libXdmcp |
213 |
x11-libs/libXext |
214 |
- x11-libs/libXfixes |
215 |
- x11-libs/libXft |
216 |
x11-libs/libXi |
217 |
- x11-libs/libXinerama |
218 |
- x11-libs/libXrandr |
219 |
- x11-libs/libXrender |
220 |
x11-libs/libXtst |
221 |
x11-libs/pango |
222 |
+ x11-libs/pangox-compat |
223 |
x11-libs/startup-notification |
224 |
- !app-emulation/vmware-workstation" |
225 |
+ x11-themes/hicolor-icon-theme |
226 |
+ !app-emulation/vmware-workstation |
227 |
+ !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) |
228 |
+ sys-apps/dbus |
229 |
+" |
230 |
PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR} |
231 |
vmware-tools? ( app-emulation/vmware-tools )" |
232 |
|
233 |
@@ -84,25 +134,34 @@ VM_INSTALL_DIR="/opt/vmware" |
234 |
|
235 |
QA_PREBUILT="/opt/*" |
236 |
|
237 |
-QA_WX_LOAD="opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx" |
238 |
+QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx" |
239 |
|
240 |
src_unpack() { |
241 |
default |
242 |
- local bundle=${A%.tar} |
243 |
- |
244 |
- local component ; for component in \ |
245 |
- vmware-player \ |
246 |
- vmware-player-app \ |
247 |
- vmware-vmx \ |
248 |
- vmware-usbarbitrator \ |
249 |
- vmware-network-editor \ |
250 |
- vmware-player-setup |
251 |
+ local bundle=${MY_P}.x86_64.bundle |
252 |
+ |
253 |
+ local component; for component in \ |
254 |
+ vmware-player \ |
255 |
+ vmware-player-app \ |
256 |
+ vmware-player-setup \ |
257 |
+ vmware-vmx \ |
258 |
+ vmware-network-editor \ |
259 |
+ vmware-usbarbitrator |
260 |
do |
261 |
vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" |
262 |
done |
263 |
|
264 |
- use ovftool && \ |
265 |
+ if use ovftool; then |
266 |
vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool |
267 |
+ fi |
268 |
+ |
269 |
+} |
270 |
+ |
271 |
+clean_bundled_libs() { |
272 |
+ einfo Removing bundled libraries |
273 |
+ for libname in ${BUNDLED_LIBS} ; do |
274 |
+ rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" |
275 |
+ done |
276 |
} |
277 |
|
278 |
src_prepare() { |
279 |
@@ -111,29 +170,43 @@ src_prepare() { |
280 |
# Bug 459566 |
281 |
mv lib/libvmware-netcfg.so lib/lib/ |
282 |
|
283 |
+ find "${S}" -name '*.a' -delete |
284 |
+ |
285 |
+ if ! use bundled-libs ; then |
286 |
+ clean_bundled_libs |
287 |
+ fi |
288 |
+ |
289 |
DOC_CONTENTS=" |
290 |
/etc/env.d is updated during ${PN} installation. Please run:\n |
291 |
env-update && source /etc/profile\n |
292 |
Before you can use ${PN}, you must configure a default network setup. |
293 |
You can do this by running 'emerge --config ${PN}'.\n |
294 |
-To be able to run ${PN} your user must be in the vmware group. |
295 |
+To be able to run ${PN} your user must be in the vmware group.\n |
296 |
+You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. |
297 |
" |
298 |
} |
299 |
|
300 |
src_install() { |
301 |
+ local major_minor=$(get_version_component_range 1-2 "${PV}") |
302 |
+ |
303 |
+ # revdep-rebuild entry |
304 |
+ insinto /etc/revdep-rebuild |
305 |
+ echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} |
306 |
+ doins "${T}"/10${PN} |
307 |
+ |
308 |
# install the binaries |
309 |
into "${VM_INSTALL_DIR}" |
310 |
- dobin bin/* || die "failed to install bin" |
311 |
+ dobin bin/* |
312 |
|
313 |
# install the libraries |
314 |
insinto "${VM_INSTALL_DIR}"/lib/vmware |
315 |
doins -r lib/* |
316 |
|
317 |
# Bug 432918 |
318 |
- dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ |
319 |
- "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 |
320 |
- dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ |
321 |
- "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 |
322 |
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 \ |
323 |
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.1.0.1 |
324 |
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 \ |
325 |
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.1.0.1 |
326 |
|
327 |
# https://github.com/gentoo/vmware/issues/7 |
328 |
dosym "${VM_INSTALL_DIR}"/lib/vmware/ /usr/$(get_libdir)/vmware |
329 |
@@ -150,13 +223,17 @@ src_install() { |
330 |
doins -r etc/cups/* |
331 |
fi |
332 |
|
333 |
+ insinto /etc/xdg |
334 |
+ doins -r etc/xdg/* |
335 |
+ |
336 |
# install documentation |
337 |
if use doc; then |
338 |
dodoc doc/* |
339 |
fi |
340 |
|
341 |
- exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup |
342 |
- doexe vmware-config |
343 |
+ insinto "${VM_INSTALL_DIR}"/lib/vmware/setup |
344 |
+ doins vmware-config |
345 |
+ |
346 |
|
347 |
# install ovftool |
348 |
if use ovftool; then |
349 |
@@ -190,10 +267,13 @@ src_install() { |
350 |
PATH='${VM_INSTALL_DIR}/bin' |
351 |
ROOTPATH='${VM_INSTALL_DIR}/bin' |
352 |
EOF |
353 |
- doenvd "${envd}" || die |
354 |
+ |
355 |
+ use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" |
356 |
+ |
357 |
+ doenvd "${envd}" |
358 |
|
359 |
# create the configuration |
360 |
- dodir /etc/vmware || die |
361 |
+ dodir /etc/vmware |
362 |
|
363 |
cat > "${D}"/etc/vmware/bootstrap <<-EOF |
364 |
BINDIR='${VM_INSTALL_DIR}/bin' |
365 |
@@ -216,20 +296,20 @@ src_install() { |
366 |
|
367 |
# install the init.d script |
368 |
local initscript="${T}/vmware.rc" |
369 |
- |
370 |
sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ |
371 |
- "${FILESDIR}/vmware-11.${PV_MINOR}.rc" > "${initscript}" || die |
372 |
- newinitd "${initscript}" vmware || die |
373 |
+ "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die |
374 |
+ newinitd "${initscript}" vmware |
375 |
|
376 |
- systemd_dounit "${FILESDIR}/vmware-usbarbitrator.service" |
377 |
- systemd_dounit "${FILESDIR}/vmware-network.service" |
378 |
|
379 |
# fill in variable placeholders |
380 |
sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ |
381 |
-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die |
382 |
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ |
383 |
-e "/^Encoding/d" \ |
384 |
- -i "${D}/usr/share/applications/${PN}.desktop" || die |
385 |
+ -i "${D}/usr/share/applications/vmware-player.desktop" || die |
386 |
+ |
387 |
+ # install systemd unit files |
388 |
+ systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} |
389 |
|
390 |
readme.gentoo_create_doc |
391 |
} |
392 |
|
393 |
diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.4.3848939.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.4.3848939.ebuild |
394 |
index 4f488fd..ed45771 100644 |
395 |
--- a/app-emulation/vmware-workstation/vmware-workstation-11.1.4.3848939.ebuild |
396 |
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.4.3848939.ebuild |
397 |
@@ -1,4 +1,4 @@ |
398 |
-# Copyright 1999-2016 Gentoo Foundation |
399 |
+# Copyright 1999-2017 Gentoo Foundation |
400 |
# Distributed under the terms of the GNU General Public License v2 |
401 |
# $Id$ |
402 |
|
403 |
@@ -12,7 +12,7 @@ PV_MINOR=$(get_version_component_range 3) |
404 |
PV_BUILD=$(get_version_component_range 4) |
405 |
MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" |
406 |
|
407 |
-SYSTEMD_UNITS_TAG="gentoo-01" |
408 |
+SYSTEMD_UNITS_TAG="gentoo-02" |
409 |
|
410 |
DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" |
411 |
HOMEPAGE="http://www.vmware.com/products/workstation/" |
412 |
@@ -24,7 +24,7 @@ SRC_URI=" |
413 |
LICENSE="vmware GPL-2" |
414 |
SLOT="0" |
415 |
KEYWORDS="-* ~amd64" |
416 |
-IUSE="cups bundled-libs doc ovftool server vix vmware-tools" |
417 |
+IUSE="bundled-libs cups doc ovftool server vix +vmware-tools" |
418 |
RESTRICT="mirror strip" |
419 |
|
420 |
BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib |
421 |
@@ -138,17 +138,17 @@ VM_HOSTD_USER="root" |
422 |
|
423 |
QA_PREBUILT="/opt/*" |
424 |
|
425 |
-QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 /opt/vmware/lib/vmware/bin/vmware-vmx-stats /opt/vmware/lib/vmware/bin/vmware-vmx-debug /opt/vmware/lib/vmware/bin/vmware-vmx" |
426 |
+QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx" |
427 |
|
428 |
src_unpack() { |
429 |
default |
430 |
- local bundle |
431 |
- use amd64 && bundle=${MY_P}.x86_64.bundle |
432 |
+ local bundle=${MY_P}.x86_64.bundle |
433 |
+ |
434 |
local component; for component in \ |
435 |
- vmware-vmx \ |
436 |
+ vmware-workstation \ |
437 |
vmware-player-app \ |
438 |
vmware-player-setup \ |
439 |
- vmware-workstation \ |
440 |
+ vmware-vmx \ |
441 |
vmware-network-editor \ |
442 |
vmware-network-editor-ui \ |
443 |
vmware-usbarbitrator \ |
444 |
@@ -157,6 +157,10 @@ src_unpack() { |
445 |
vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" |
446 |
done |
447 |
|
448 |
+ if use ovftool; then |
449 |
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool |
450 |
+ fi |
451 |
+ |
452 |
if use server; then |
453 |
vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" |
454 |
fi |
455 |
@@ -165,9 +169,6 @@ src_unpack() { |
456 |
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix |
457 |
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix |
458 |
fi |
459 |
- if use ovftool; then |
460 |
- vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool |
461 |
- fi |
462 |
} |
463 |
|
464 |
clean_bundled_libs() { |
465 |
@@ -178,7 +179,7 @@ clean_bundled_libs() { |
466 |
} |
467 |
|
468 |
src_prepare() { |
469 |
- rm -f bin/vmware-modconfig |
470 |
+ rm -f bin/vmware-modconfig |
471 |
rm -rf lib/modules/binary |
472 |
# Bug 459566 |
473 |
mv lib/libvmware-netcfg.so lib/lib/ |
474 |
@@ -196,7 +197,7 @@ src_prepare() { |
475 |
DOC_CONTENTS=" |
476 |
/etc/env.d is updated during ${PN} installation. Please run:\n |
477 |
env-update && source /etc/profile\n |
478 |
-Before you can use vmware workstation, you must configure a default network setup. |
479 |
+Before you can use ${PN}, you must configure a default network setup. |
480 |
You can do this by running 'emerge --config ${PN}'.\n |
481 |
To be able to run ${PN} your user must be in the vmware group.\n |
482 |
You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. |
483 |
@@ -205,8 +206,6 @@ You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will no |
484 |
|
485 |
src_install() { |
486 |
local major_minor=$(get_version_component_range 1-2 "${PV}") |
487 |
- local major_minor_revision=$(get_version_component_range 1-3 "${PV}") |
488 |
- local build=$(get_version_component_range 4 "${PV}") |
489 |
|
490 |
# revdep-rebuild entry |
491 |
insinto /etc/revdep-rebuild |
492 |
@@ -392,11 +391,11 @@ src_install() { |
493 |
VMBLOCK_CONFED = "yes" |
494 |
VSOCK_CONFED = "yes" |
495 |
NETWORKING = "yes" |
496 |
- player.product.version = "${major_minor_revision}" |
497 |
- product.version = "${major_minor_revision}" |
498 |
- product.buildNumber = "${build}" |
499 |
+ player.product.version = "${MY_PV}" |
500 |
+ product.buildNumber = "${PV_BUILD}" |
501 |
+ product.version = "${MY_PV}" |
502 |
product.name = "VMware Workstation" |
503 |
- workstation.product.version = "${major_minor_revision}" |
504 |
+ workstation.product.version = "${MY_PV}" |
505 |
EOF |
506 |
|
507 |
if use vix; then |
508 |
@@ -418,7 +417,7 @@ src_install() { |
509 |
# install the init.d script |
510 |
local initscript="${T}/vmware.rc" |
511 |
sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ |
512 |
- "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript} |
513 |
+ "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die |
514 |
newinitd "${initscript}" vmware |
515 |
|
516 |
if use server; then |
517 |
@@ -434,13 +433,13 @@ src_install() { |
518 |
|
519 |
# fill in variable placeholders |
520 |
sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ |
521 |
- -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} |
522 |
+ -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die |
523 |
+ sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ |
524 |
+ -e "/^Encoding/d" \ |
525 |
+ -i "${D}/usr/share/applications/vmware-player.desktop" || die |
526 |
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ |
527 |
-e "/^Encoding/d" \ |
528 |
-i "${D}/usr/share/applications/${PN}.desktop" |
529 |
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ |
530 |
- -e "/^Encoding/d" \ |
531 |
- -i "${D}/usr/share/applications/vmware-player.desktop" |
532 |
sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ |
533 |
-e "/^Encoding/d" \ |
534 |
-i "${D}/usr/share/applications/vmware-netcfg.desktop" |