pkg_prerm is added for safe unmerge. init script is loading vmci module.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 17 insertions, 4 deletions

diff --git a/app-emulation/vmware-server/ChangeLog b/app-emulation/vmware-server/ChangeLog
index 53e6361bda3d..bc66b33e1664 100644
--- a/app-emulation/vmware-server/ChangeLog
+++ b/app-emulation/vmware-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vmware-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.56 2009/07/06 17:40:52 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.57 2009/07/08 20:17:28 vadimk Exp $
+
+  08 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+  vmware-server-2.0.1.156745-r2.ebuild:
+  pkg_prerm is added for safe unmerge. init script is loading vmci module.
 
 *vmware-server-2.0.1.156745-r2 (06 Jul 2009)
 
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index d0eb52c69756..7fe6a0755fab 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -28,7 +28,7 @@ DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7d
 EBUILD vmware-server-1.0.8.126538.ebuild 2998 RMD160 f44db390c4e54dccf78f77d59b3aa430bc412ef9 SHA1 db86c3ab21c6cf2dbf603383a7fe98f6998f8789 SHA256 b92b97bea08c999656cf5c39a0838d2f6903b4ef36308406bd153144e1af3b25
 EBUILD vmware-server-1.0.9.156507.ebuild 2998 RMD160 a66d4710d9627b1e400595a72df53e14168c77ef SHA1 428e1ae954e79399f142904f6c067194a7b4e720 SHA256 2b3064ed384664b0ae1c0500975bcdb2bbabc50dcee5b618d99085d6e02b37fe
 EBUILD vmware-server-2.0.1.156745-r1.ebuild 2799 RMD160 30c6d30bc70b6871b2dd53b64d6f3023976b0c35 SHA1 658434a9c02ef1d9c4662b8ccb193b048e081675 SHA256 b13140796f0a88af05a1cb24e8c5248c6e18d331cadf3dc76032565dfe14ea00
-EBUILD vmware-server-2.0.1.156745-r2.ebuild 8823 RMD160 24fe38a516c9c4311d78eb890936f3ce384f4f91 SHA1 c8ddce4d72cf21b24d04a7e868382115d71592f6 SHA256 90e7f5e89e18fefd3734cbcc5a8c132f5d8f8632ef8327c90e440cfdba4a4364
+EBUILD vmware-server-2.0.1.156745-r2.ebuild 9047 RMD160 b52cde9c709ccb3a552a586a4c0d4bdb1188e46e SHA1 af829d26ac609c232a30e07934a5b04670867df4 SHA256 1d274882b0d3afcbbddafd28016e05ff8ba3efb810851ed461f77c9924cf242e
 EBUILD vmware-server-2.0.1.156745.ebuild 2796 RMD160 c26aac86392b7f94605425a4c497dda153c1d4c3 SHA1 35192867e3da224200a1fd69a2d0dac0c1288c9e SHA256 daf6974b3936487c219ba669acaa1e2a82f661696b92fc909f8e98401dc650c9
-MISC ChangeLog 10541 RMD160 92d4d02f7b1f87ff4cb7d2399d640554b061c19f SHA1 eecfe8dbca5f19da99076e587e3e24402baa1454 SHA256 10ec4e25e074b192755a8fbb765a533fce8656ec31beb3a142a0a19f89c6265f
+MISC ChangeLog 10706 RMD160 17094d98d0054ec6a96931fd03d3bb12ee3376b2 SHA1 83ed53071e36f56d25d8fa4c45f07cfe53209e37 SHA256 5845f52e9c504da3ae17f63f9d00c479fdf451fc176b6865b1e95550275fbc03
 MISC metadata.xml 451 RMD160 34ad07edf6d4f6d9b00b8c0ea197fa8ddad2397b SHA1 7983215b3da6bbfb2e5c167b33b0625a5a31280d SHA256 b64b12ed17797856c0f950540b92f134ca8ffafd40eabafb4ef90c889e16a3e3
diff --git a/app-emulation/vmware-server/vmware-server-2.0.1.156745-r2.ebuild b/app-emulation/vmware-server/vmware-server-2.0.1.156745-r2.ebuild
index 7db71f9e4485..12c67a980189 100644
--- a/app-emulation/vmware-server/vmware-server-2.0.1.156745-r2.ebuild
+++ b/app-emulation/vmware-server/vmware-server-2.0.1.156745-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-2.0.1.156745-r2.ebuild,v 1.1 2009/07/06 17:40:52 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-2.0.1.156745-r2.ebuild,v 1.2 2009/07/08 20:17:28 vadimk Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -100,6 +100,8 @@ src_prepare() {
 	# We won't want any perl scripts from VMware once we've finally got all
 	# of the configuration done, but for now, they're necessary.
 	#rm -f *.pl bin/*.pl
+	rm -f *.pl
+	rm -f etc/installer.sh
 
 	# Since with Gentoo we compile everthing it doesn't make sense to keep
 	# the precompiled modules arround. Saves about 4 megs of disk space too.
@@ -209,6 +211,8 @@ src_install() {
 	echo "answer RUN_CONFIGURATOR no" >> ${locations}
 	echo "answer INITDIR ${config_dir}/init.d" >> ${locations}
 	echo "answer INITSCRIPTSDIR ${config_dir}/init.d" >> ${locations}
+	echo "answer VMCI_CONFED yes" >> ${locations}
+	echo "answer VSOCK_CONFED yes" >> ${locations}
 }
 
 pkg_config() {
@@ -275,6 +279,11 @@ pkg_postinst() {
 	ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94"
 }
 
+pkg_prerm() {
+	einfo "Stopping ${product_name} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
 pkg_postrm() {
 	if ! has_version app-emulation/${PN}; then
 		elog "To remove all traces of ${product} you will need to remove the files"