[gentoo-commits] gentoo-x86 commit in app-emulation/vmware-workstation: vmware-workstation-6.0.3.80004.ebuild ChangeLog vmware-workstation-4.5.3.19414-r7.ebuild vmware-workstation-5.5.6.80404.ebuild vmware-workstation-6.0.2.59824.ebuild vmware-workstation-6.0.1.55017.ebuild

[Mike Auty (ikelos)]

ikelos      08/04/26 16:29:15

  Modified:             vmware-workstation-6.0.3.80004.ebuild ChangeLog
                        vmware-workstation-4.5.3.19414-r7.ebuild
                        vmware-workstation-5.5.6.80404.ebuild
                        vmware-workstation-6.0.2.59824.ebuild
  Removed:              vmware-workstation-6.0.1.55017.ebuild
  Log:
  Fix up bugs 219076 and 123665, remove old ebuild and fix minor QA issues.
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.2                  app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild?r1=1.1&r2=1.2

Index: vmware-workstation-6.0.3.80004.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vmware-workstation-6.0.3.80004.ebuild	22 Mar 2008 09:39:38 -0000	1.1
+++ vmware-workstation-6.0.3.80004.ebuild	26 Apr 2008 16:29:15 -0000	1.2
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild,v 1.1 2008/03/22 09:39:38 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
 
-inherit vmware eutils versionator
+inherit vmware eutils versionator fdo-mime gnome2-utils
 
 MY_PN="VMware-workstation-$(replace_version_separator 3 - $PV)"
 
@@ -26,24 +26,15 @@
 # vmware-workstation should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND="sys-libs/glibc
-	amd64? (
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXi
-		x11-libs/libview
-		dev-cpp/libsexymm
-		dev-cpp/cairomm
-		dev-cpp/libgnomecanvasmm
-		virtual/xft )
-	x86? (
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXi
-		x11-libs/libview
-		dev-cpp/libsexymm
-		virtual/xft )
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXinerama
+	x11-libs/libXi
+	x11-libs/libview
+	dev-cpp/libsexymm
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	virtual/xft
 	!app-emulation/vmware-player
 	!app-emulation/vmware-server
 	~app-emulation/vmware-modules-1.0.0.17
@@ -124,11 +115,36 @@
 src_install() {
 	vmware_src_install
 
-	ICONDIR=/opt/vmware/workstation/lib/share/icons/hicolor/scalable/apps/
-	make_desktop_entry vmware "VMWare Workstation" ${ICONDIR}/${PN}.svg System
-	make_desktop_entry vmplayer "VMWare Player" ${ICONDIR}/vmware-player.svg System
+	# move the icons into a location where DEs will find it:
+	ICONDIR=/opt/vmware/workstation/lib/share/icons/hicolor
+	rm "${D}${ICONDIR}/index.theme"
+	mkdir -p "${D}/usr/share/icons"
+	mv "${D}${ICONDIR}" "${D}/usr/share/icons"
+	ln -s /usr/share/icons/hicolor "${D}${ICONSDIR}"
+
+	# install .desktop files:
+	insinto /usr/share/applications
+	doins "${FILESDIR}/vmware-workstation.desktop"
+	doins "${FILESDIR}/vmware-player.desktop"
 
 	# Nasty hack to ensure the EULA is included
 	insinto /opt/vmware/workstation/lib/share
 	newins doc/EULA EULA.txt
 }
+
+pkg_preinst() {
+	vmware_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	vmware_pkg_postinst
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	vmware_pkg_postrm
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}



1.175                app-emulation/vmware-workstation/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/ChangeLog?rev=1.175&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/ChangeLog?rev=1.175&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/ChangeLog?r1=1.174&r2=1.175

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- ChangeLog	4 Apr 2008 01:44:06 -0000	1.174
+++ ChangeLog	26 Apr 2008 16:29:15 -0000	1.175
@@ -1,6 +1,21 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.174 2008/04/04 01:44:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.175 2008/04/26 16:29:15 ikelos Exp $
+
+  26 Apr 2008; Mike Auty <ikelos@g.o>
+  -files/6.0.1.55017/000_all_initd-location.patch,
+  -files/6.0.1.55017/002_all_pagebreak-detection-fix.patch,
+  -files/6.0.1.55017/001_all_fix-permissions.patch,
+  -files/6.0.1.55017/004_all_do-not-build-modules.patch,
+  -files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch,
+  -files/6.0.1.55017/009_all_init.d-modules-warning.patch,
+  -files/6.0.1.55017/011_all_legit-modules-only.patch,
+  +files/vmware-player.desktop, +files/vmware-workstation.desktop,
+  vmware-workstation-5.5.6.80404.ebuild,
+  -vmware-workstation-6.0.1.55017.ebuild,
+  vmware-workstation-6.0.2.59824.ebuild,
+  vmware-workstation-6.0.3.80004.ebuild:
+  Fix up bugs 219076 and 123665, remove old ebuild and fix minor QA issues.
 
 *vmware-workstation-5.5.6.80404 (04 Apr 2008)
 



1.8                  app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild?r1=1.7&r2=1.8

Index: vmware-workstation-4.5.3.19414-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vmware-workstation-4.5.3.19414-r7.ebuild	13 Jul 2007 00:36:15 -0000	1.7
+++ vmware-workstation-4.5.3.19414-r7.ebuild	26 Apr 2008 16:29:15 -0000	1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild,v 1.7 2007/07/13 00:36:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild,v 1.8 2008/04/26 16:29:15 ikelos Exp $
 
 # Alter ebuild so that the metadata cache is invalidated.
 
@@ -89,7 +89,7 @@
 	vmware_src_install
 	# We remove the rpath libgdk_pixbuf stuff, to resolve bug #81344.
 	perl -pi -e 's#/tmp/rrdharan/out#/opt/vmware/null/#sg' \
-		${Ddir}/lib/lib/libgdk_pixbuf.so.2/lib{gdk_pixbuf.so.2,pixbufloader-{xpm,png}.so.1.0.0} \
+		"${Ddir}"/lib/lib/libgdk_pixbuf.so.2/lib{gdk_pixbuf.so.2,pixbufloader-{xpm,png}.so.1.0.0} \
 		|| die "Removing rpath"
 
 	make_desktop_entry vmware "VMware Workstation" ${PN}.png



1.2                  app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild?r1=1.1&r2=1.2

Index: vmware-workstation-5.5.6.80404.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vmware-workstation-5.5.6.80404.ebuild	4 Apr 2008 01:44:06 -0000	1.1
+++ vmware-workstation-5.5.6.80404.ebuild	26 Apr 2008 16:29:15 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild,v 1.1 2008/04/04 01:44:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
 
 inherit vmware eutils versionator
 
@@ -10,6 +10,7 @@
 HOMEPAGE="http://www.vmware.com/download/ws/ws5.html"
 SRC_URI="mirror://vmware/software/wkst/${MY_P}.tar.gz
 	http://download.softpedia.ro/linux/${MY_P}.tar.gz
+	mirror://gentoo/${ANY_ANY}.tar.gz
 	http://platan.vc.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
 	http://platan.vc.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz
 	http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
@@ -86,7 +87,7 @@
 
 	doicon lib/share/pixmaps/vmware-player.png
 	# Fix an ugly GCC error on start
-	rm -f ${Ddir}lib/lib/libgcc_s.so.1/libgcc_s.so.1
+	rm -f "${Ddir}lib/lib/libgcc_s.so.1/libgcc_s.so.1"
 	make_desktop_entry vmware "VMWare Workstation" ${PN}.png System
 	make_desktop_entry vmplayer "VMWare Player" vmware-player.png System
 }



1.2                  app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild?r1=1.1&r2=1.2

Index: vmware-workstation-6.0.2.59824.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vmware-workstation-6.0.2.59824.ebuild	25 Nov 2007 12:50:31 -0000	1.1
+++ vmware-workstation-6.0.2.59824.ebuild	26 Apr 2008 16:29:15 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild,v 1.1 2007/11/25 12:50:31 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
 
 inherit vmware eutils versionator
 
@@ -15,13 +15,7 @@
 	amd64? (
 		mirror://vmware/software/wkst/${MY_PN}.x86_64.tar.gz
 		http://download.softpedia.ro/linux/${MY_PN}.x86_64.tar.gz )
-	mirror://gentoo/${ANY_ANY}.tar.gz
-	http://platan.vc.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-	http://platan.vc.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz
-	http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
-	http://ftp.cvut.cz/vmware/obsolete/${ANY_ANY}.tar.gz
-	http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-	http://knihovny.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz"
+	"
 
 LICENSE="vmware"
 SLOT="0"
@@ -60,6 +54,7 @@
 
 S=${WORKDIR}/vmware-distrib
 
+ANY_ANY=""
 RUN_UPDATE="no"
 
 dir=/opt/vmware/workstation



-- 
gentoo-commits@l.g.o mailing list