Fixing vix.libdir

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

3 files changed, 36 insertions, 14 deletions

diff --git a/app-emulation/vmware-vix/ChangeLog b/app-emulation/vmware-vix/ChangeLog
index eb2b6ee6dccc..4c9fc4b9a213 100644
--- a/app-emulation/vmware-vix/ChangeLog
+++ b/app-emulation/vmware-vix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-vix
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-vix/ChangeLog,v 1.2 2009/07/06 17:44:37 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-vix/ChangeLog,v 1.3 2009/07/08 18:26:38 vadimk Exp $
+
+*vmware-vix-1.6.2.156745-r1 (08 Jul 2009)
+
+  08 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+  -vmware-vix-1.6.2.156745.ebuild, +vmware-vix-1.6.2.156745-r1.ebuild:
+  Fixing vix.libdir
 
   06 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
   vmware-vix-1.6.2.156745.ebuild:
diff --git a/app-emulation/vmware-vix/Manifest b/app-emulation/vmware-vix/Manifest
index 4ccd66903595..9eddeace6cd6 100644
--- a/app-emulation/vmware-vix/Manifest
+++ b/app-emulation/vmware-vix/Manifest
@@ -1,5 +1,5 @@
 DIST VMware-vix-1.6.2-156745.i386.tar.gz 18413447 RMD160 36d7e4c3740e109c515de5150ec7ed969db421b1 SHA1 01ef532e329f56c6839a5be9531673623b7ddcd4 SHA256 5e230879d5c24dffda36c9b0fc69637dcdd9fffd3b306f86a5ebd9ba231a6f5b
 DIST VMware-vix-1.6.2-156745.x86_64.tar.gz 22657119 RMD160 1841373c363a71645a5f8ab2b4e3790bf00d21e9 SHA1 034a7f75d58b73bc31d02c8f2503f7fdd1f1fe31 SHA256 c37b58d1cfa3686138178cc60af92c48e81ccca6f039c966ebb43928fc95adb7
-EBUILD vmware-vix-1.6.2.156745.ebuild 5501 RMD160 ced9c7cfa9366defd94ea9031777ae205fdbf803 SHA1 1bede31136edf88e05cf921e5ac854e08c099e4b SHA256 7955a4e8d7057b598f0b453a8dfc2d129efd732e308a562a70f222ab5e002d26
-MISC ChangeLog 500 RMD160 c0fe4d085d27b0b2cac920955ac471eb243af635 SHA1 4c9d5d002508f60a7dbb4c76a6c99c6b17858a28 SHA256 a1c195b732b181fbc01a7a06dba7a11bac06d8443d4badb7c27cade4203e29ab
+EBUILD vmware-vix-1.6.2.156745-r1.ebuild 5966 RMD160 a0848b608623e485f18231f862438484c82c0943 SHA1 e99c6a28fb099630b1b07272c77bc77f67ad5f2c SHA256 9c6cfaca022d10513796d8a4e2ee7a16d22a05e3b2c50d106cd7d77712f5cbc8
+MISC ChangeLog 684 RMD160 fdc82b23709862939a96f1da189db8ac7490c393 SHA1 fddd3ea5f9f9fa1db2b482c4c2b22a9f85d0737e SHA256 62df714510441995c1a23aa377e5e27feb439f339ae5f44526fae5cd5b8dff47
 MISC metadata.xml 736 RMD160 9e0b6138a82c1ca34b847bc71bc072e44c60d95a SHA1 4365d9dc523f50c84cb02caf44fadf05ee996b3c SHA256 3882e8981caee5b279a4a1990df6b404e920ab088d6a4cd1d789cbb29e301f74
diff --git a/app-emulation/vmware-vix/vmware-vix-1.6.2.156745.ebuild b/app-emulation/vmware-vix/vmware-vix-1.6.2.156745-r1.ebuild
index 3f68b39fb2e8..d70ee0f26c4e 100644
--- a/app-emulation/vmware-vix/vmware-vix-1.6.2.156745.ebuild
+++ b/app-emulation/vmware-vix/vmware-vix-1.6.2.156745-r1.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-vix/vmware-vix-1.6.2.156745.ebuild,v 1.3 2009/07/06 20:50:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-vix/vmware-vix-1.6.2.156745-r1.ebuild,v 1.1 2009/07/08 18:26:38 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
@@ -45,6 +45,7 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/vmware-vix-distrib
 
+
 pkg_setup() {
 	if use x86; then
 		MY_P="${MY_PN}.i386"
@@ -66,14 +67,15 @@ src_prepare() {
 #	EPATCH_SOURCE="${FILESDIR}"/${PV} EPATCH_SUFFIX="patch" epatch
 
 	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/installer/services.sh || die "sed of services"
-}
 
-src_install() {
 	# We won't want any perl scripts from VMware
 	rm -f *.pl bin/*.pl
+	rm -f etc/installer.sh
+}
 
+src_install() {
 	# We loop through our directories and copy everything to our system.
-	for x in bin lib include
+	for x in api bin lib include
 	do
 		if [[ -e "${S}/vmware-vix/${x}" ]]
 		then
@@ -84,13 +86,13 @@ src_install() {
 	done
 
 	# If we have an /etc directory, we copy it.
-	if [[ -e "${S}/etc" ]]
-	then
+	#if [[ -e "${S}/etc" ]]
+	#then
 		dodir "${config_dir}"
-		cp -pPR "${S}"/etc/* "${D}""${config_dir}"
-		fowners root:${VMWARE_GROUP} "${config_dir}"
-		fperms 770 "${config_dir}"
-	fi
+	#	cp -pPR "${S}"/etc/* "${D}""${config_dir}"
+	#	fowners root:${VMWARE_GROUP} "${config_dir}"
+	#	fperms 770 "${config_dir}"
+	#fi
 
 	# If we have any helper files, we install them.  First, we check for an
 	# init script.
@@ -101,6 +103,7 @@ src_install() {
 
 	local ENVD="${T}/90${PN}"
 	echo "PATH=${VMWARE_INSTALL_DIR}/bin" > "${ENVD}"
+	echo "ROOTPATH=${VMWARE_INSTALL_DIR}/bin" >> "${ENVD}"
 	doenvd "${ENVD}" || die "doenvd"
 
 	# Last, we check for any mime files.
@@ -128,11 +131,20 @@ src_install() {
 	einfo "Adding answers to ${config_dir}/locations"
 	locations="${D}${config_dir}/locations"
 	echo "answer BINDIR ${VMWARE_INSTALL_DIR}/bin" >> ${locations}
-	echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
 	echo "answer VIXLIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
+	echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
 	#echo "answer MANDIR ${VMWARE_INSTALL_DIR}/man" >> ${locations}
 	echo "answer DOCDIR /usr/share/doc/${P}" >> ${locations}
 
+	local VMWARECONFIG="${T}"/config
+	if [[ -e ${ROOT}/etc/vmware/config ]]
+	then
+		cp -a "${ROOT}"/etc/vmware/config "${VMWARECONFIG}"
+		sed -i -e "/vix.libdir/d" "${VMWARECONFIG}"
+	fi
+	echo "vix.libdir = \"${VMWARE_INSTALL_DIR}/lib\"" >> "${VMWARECONFIG}"
+	insinto /etc/vmware/
+	doins "${VMWARECONFIG}"
 }
 
 pkg_preinst() {
@@ -182,6 +194,10 @@ pkg_postinst() {
 	ewarn "be in the '${VMWARE_GROUP}' group."
 }
 
+pkg_prerm() {
+	sed -i -e "/vix.libdir/d" "${ROOT}"/etc/vmware/config
+}
+
 pkg_postrm() {
 	if ! has_version app-emulation/${PN}; then
 		ewarn "To remove all traces of ${producti_name} you will need to remove the files"