diff options
6 files changed, 30 insertions, 245 deletions
diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog index a786b495e484..8f91f9f423a8 100644 --- a/app-emulation/vmware-workstation/ChangeLog +++ b/app-emulation/vmware-workstation/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/vmware-workstation # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.67 2005/01/05 15:38:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.68 2005/01/11 16:37:45 wolf31o2 Exp $ + + 11 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> + vmware-workstation-3.2.1.2242-r2.ebuild, + -vmware-workstation-4.5.2.8848-r1.ebuild, + vmware-workstation-4.5.2.8848-r2.ebuild: + Marking stable on x86 and amd64, updated to use latest vmware-any-any-update + version, and removed suid bits from non-essential binaries so it plays nice + with sfperms. Closing bug #59632. 05 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml: Changed herd to new vmware herd. diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index 28256f0f9c3f..d8cca89a244d 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -1,18 +1,16 @@ -MD5 4be84c93db36292c9a534f761bdbc45d ChangeLog 14878 -MD5 a4e5ebe5e931d6196fd49550e067b078 metadata.xml 339 -MD5 19e1420e567c0945861954d210c0e21b vmware-workstation-3.2.1.2242-r2.ebuild 6933 -MD5 8264b6826854bed76af426f0374eb075 vmware-workstation-4.5.2.8848-r1.ebuild 7311 -MD5 36e15720b74f19e0537554f847ed9fe0 vmware-workstation-4.5.2.8848-r2.ebuild 7061 +MD5 92cb9b6f3020b117eba4020668d17b7e vmware-workstation-3.2.1.2242-r2.ebuild 6829 MD5 668f9feebaccd4f013d1a1030370cf21 vmware-workstation-5.0_beta1.ebuild 5954 +MD5 91c665a8838f0feafa379ae3e7422b57 vmware-workstation-4.5.2.8848-r2.ebuild 6909 +MD5 7b1abcba60af7f25ca12c748ebf412fe ChangeLog 15256 +MD5 a4e5ebe5e931d6196fd49550e067b078 metadata.xml 339 MD5 48c1667773503fee21a1068da07440b9 files/90vmware 70 +MD5 1a72b09b718dd43f60908f488eaa2918 files/digest-vmware-workstation-5.0_beta1 84 +MD5 4a762a28daf24c45ac47d25dc5897091 files/digest-vmware-workstation-4.5.2.8848-r2 210 MD5 4c2f197007436c71738cdab98bb5ea5b files/digest-vmware-workstation-3.2.1.2242-r2 210 -MD5 a37bd06d6d307cc928aa936e9c8e0a27 files/digest-vmware-workstation-4.5.2.8848-r1 210 +MD5 c2dc0111fb5bf45ff99578b57d349cb3 files/vmware.rc 1417 MD5 5c852829f9043917fddc2f80ebb99802 files/vmware-26kern-init-gentoo.patch 3983 MD5 7ca1ec14670b51d8cf824a58bc8d6621 files/vmware.png 470 -MD5 c2dc0111fb5bf45ff99578b57d349cb3 files/vmware.rc 1417 -MD5 4a762a28daf24c45ac47d25dc5897091 files/digest-vmware-workstation-4.5.2.8848-r2 210 -MD5 1a72b09b718dd43f60908f488eaa2918 files/digest-vmware-workstation-5.0_beta1 84 MD5 48c1667773503fee21a1068da07440b9 files/3.2.1.2242/90vmware 70 -MD5 cd2c7dfb0ea80293b3647713f5e35969 files/3.2.1.2242/vmware 1419 MD5 3bfb39f5e96f60db67c7246f74c21501 files/3.2.1.2242/vmware-config.pl-gcc-generalized.patch 2948 MD5 b95a250f31a6d2005176b27b8d48c182 files/3.2.1.2242/vmware-glibc-2.3.2-compat.c 1039 +MD5 cd2c7dfb0ea80293b3647713f5e35969 files/3.2.1.2242/vmware 1419 diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r1 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r1 deleted file mode 100644 index df9d0afc73f7..000000000000 --- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 cd52130a4ad753ac9d017cc031038a3c VMware-workstation-4.5.2-8848.tar.gz 43948624 -MD5 228db8b26c4231ff4b07254ad59883e2 vmware-any-any-update83.tar.gz 259952 -MD5 7ca1ec14670b51d8cf824a58bc8d6621 vmware.png 470 diff --git a/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r2.ebuild index 6baf85e92de8..d43789032a66 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r2.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r2.ebuild,v 1.7 2005/01/05 15:38:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r2.ebuild,v 1.8 2005/01/11 16:37:45 wolf31o2 Exp $ # Unlike many other binary packages the user doesn't need to agree to a licence # to download VM Ware. The agreeing to a licence is part of the configure step @@ -9,7 +9,7 @@ inherit gcc eutils S=${WORKDIR}/vmware-distrib -N26KernSupport="vmware-any-any-update84" +ANY_ANY="vmware-any-any-update84" NP="VMware-workstation-3.2.1-2242" DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html" @@ -20,10 +20,10 @@ SRC_URI="http://vmware-svca.www.conxion.com/software/${NP}.tar.gz http://vmware-heva.www.conxion.com/software/${NP}.tar.gz http://vmware.wespe.de/software/${NP}.tar.gz ftp://vmware.wespe.de/pub/software/${NP}.tar.gz - http://ftp.cvut.cz/vmware/${N26KernSupport}.tar.gz - http://ftp.cvut.cz/vmware/obsolete/${N26KernSupport}.tar.gz - http://knihovny.cvut.cz/ftp/pub/vmware/${N26KernSupport}.tar.gz - http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${N26KernSupport}.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/obselete/${ANY_ANY}.tar.gz mirror://gentoo/vmware.png" LICENSE="vmware" @@ -41,8 +41,8 @@ src_unpack() { check_KV unpack ${NP}.tar.gz if [ "${KV:0:3}" == "2.6" ] || [ "${KV:0:3}" == "2.5" ] ; then - unpack ${N26KernSupport}.tar.gz - mv ${N26KernSupport}/*.tar ${S}/lib/modules/source/ + unpack ${ANY_ANY}.tar.gz + mv ${ANY_ANY}/*.tar ${S}/lib/modules/source/ fi } @@ -109,11 +109,9 @@ src_install() { keepdir /etc/vmware/init.d/rc{0,1,2,3,4,5,6}.d # A simple icon I made - dodir /opt/vmware/lib/icon insinto /opt/vmware/lib/icon doins ${DISTDIR}/vmware.png || die - insinto /usr/share/pixmaps - doins ${DISTDIR}/vmware.png || die + doicon ${DISTDIR}/vmware.png || die make_desktop_entry vmware "VMWare Workstation" vmware.png diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r1.ebuild deleted file mode 100644 index 081239496ff3..000000000000 --- a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2005 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.2.8848-r1.ebuild,v 1.9 2005/01/05 15:38:01 wolf31o2 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 -# which the user must run manually. - -inherit eutils - -S=${WORKDIR}/vmware-distrib -N26KernSupport="vmware-any-any-update83" -NP="VMware-workstation-4.5.2-8848" -DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html" -SRC_URI="http://vmware-svca.www.conxion.com/software/wkst/${NP}.tar.gz - http://download3.vmware.com/software/wkst/${NP}.tar.gz - http://download.vmware.com/htdocs/software/wkst/${NP}.tar.gz - http://www.vmware.com/download1/software/wkst/${NP}.tar.gz - ftp://download1.vmware.com/pub/software/wkst/${NP}.tar.gz - http://vmware-chil.www.conxion.com/software/wkst/${NP}.tar.gz - http://vmware-heva.www.conxion.com/software/wkst/${NP}.tar.gz - http://vmware.wespe.de/software/wkst/${NP}.tar.gz - ftp://vmware.wespe.de/pub/software/wkst/${NP}.tar.gz - http://ftp.cvut.cz/vmware/${N26KernSupport}.tar.gz - http://ftp.cvut.cz/vmware/obselete/${N26KernSupport}.tar.gz - http://knihovny.cvut.cz/ftp/pub/vmware/${N26KernSupport}.tar.gz - http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${N26KernSupport}.tar.gz - mirror://gentoo/vmware.png" - -LICENSE="vmware" -IUSE="" -SLOT="0" -KEYWORDS="-* x86 amd64" -RESTRICT="nostrip" - -DEPEND="virtual/libc - virtual/x11 - virtual/os-headers - >=dev-lang/perl-5 - sys-apps/pciutils" - -src_unpack() { - check_KV - unpack ${NP}.tar.gz - if [ "${KV:0:3}" == "2.6" ] || [ "${KV:0:3}" == "2.5" ]; then - einfo "Adding 2.{5,6}.x kernel support" - cd ${S} - unpack ${N26KernSupport}.tar.gz - mv -f ${N26KernSupport}/*.tar ${S}/lib/modules/source/ - cd ${N26KernSupport} - chmod 755 ../lib/bin/vmware ../bin/vmnet-bridge ../lib/bin/vmware-vmx ../lib/bin-debug/vmware-vmx - # update75 doesn't patch vmware - # ./update vmware ../lib/bin/vmware || die - ./update bridge ../bin/vmnet-bridge || die - ./update vmx ../lib/bin/vmware-vmx || die - ./update vmxdebug ../lib/bin-debug/vmware-vmx || die - else - einfo "Using 2.4.x kernel support" - fi -} - -src_install() { - dodir /opt/vmware/bin - cp -a bin/* ${D}/opt/vmware/bin/ - # vmware and vmware-ping needs to be suid root. - chmod u+s ${D}/opt/vmware/bin/vmware || die - chmod u+s ${D}/opt/vmware/bin/vmware-ping || die - - dodir /opt/vmware/lib - cp -dr lib/* ${D}/opt/vmware/lib/ - - chmod u+s ${D}/opt/vmware/lib/bin/vmware-vmx || die - - # 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. - rm -rf ${D}/opt/vmware/lib/modules/binary - - dodir /opt/vmware/doc - cp -a doc/* ${D}/opt/vmware/doc/ - - dodir /opt/vmware/man/ - cp -a man/* ${D}/opt/vmware/man/ - - # vmware service loader - exeinto /etc/init.d - newexe ${FILESDIR}/vmware.rc vmware || die - - # vmware enviroment - insinto /etc/env.d - doins ${FILESDIR}/90vmware || die - - dodir /etc/vmware/ - cp -a etc/* ${D}/etc/vmware/ - - dodir /etc/vmware/init.d - dodir /etc/vmware/init.d/rc0.d - dodir /etc/vmware/init.d/rc1.d - dodir /etc/vmware/init.d/rc2.d - dodir /etc/vmware/init.d/rc3.d - dodir /etc/vmware/init.d/rc4.d - dodir /etc/vmware/init.d/rc5.d - dodir /etc/vmware/init.d/rc6.d - cp -a installer/services.sh ${D}/etc/vmware/init.d/vmware || die - - # This is to fix a problem where if someone merges vmware and then - # before configuring vmware they upgrade or re-merge the vmware - # package which would rmdir the /etc/vmware/init.d/rc?.d directories. - keepdir /etc/vmware/init.d/rc{0,1,2,3,4,5,6}.d - - # A simple icon I made - dodir /opt/vmware/lib/icon - insinto /opt/vmware/lib/icon - doins ${DISTDIR}/vmware.png || die - insinto /usr/share/pixmaps - doins ${DISTDIR}/vmware.png || die - - make_desktop_entry vmware "VMWare Workstation" vmware.png - - dodir /usr/bin - dosym /opt/vmware/bin/vmware /usr/bin/vmware - - # Questions: - einfo "Adding answers to /etc/vmware/locations" - locations="${D}/etc/vmware/locations" - echo "answer BINDIR /opt/vmware/bin" >> ${locations} - echo "answer LIBDIR /opt/vmware/lib" >> ${locations} - echo "answer MANDIR /opt/vmware/man" >> ${locations} - echo "answer DOCDIR /opt/vmware/doc" >> ${locations} - echo "answer RUN_CONFIGURATOR no" >> ${locations} - echo "answer INITDIR /etc/vmware/init.d" >> ${locations} - echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations} -} - -pkg_preinst() { - # This must be done after the install to get the mtimes on each file - # right. This perl snippet gets the /etc/vmware/locations file code: - # perl -e "@a = stat('bin/vmware'); print \$a[9]" - # The above perl line and the find line below output the same thing. - # I would think the find line is faster to execute. - # find /opt/vmware/bin/vmware -printf %T@ - - #Note: it's a bit weird to use ${D} in a preinst script but it should work - #(drobbins, 1 Feb 2002) - - einfo "Generating /etc/vmware/locations file." - d=`echo ${D} | wc -c` - for x in `find ${D}/opt/vmware ${D}/etc/vmware` ; do - x="`echo ${x} | cut -c ${d}-`" - if [ -d ${D}/${x} ] ; then - echo "directory ${x}" >> ${D}/etc/vmware/locations - else - echo -n "file ${x}" >> ${D}/etc/vmware/locations - if [ "${x}" == "/etc/vmware/locations" ] ; then - echo "" >> ${D}/etc/vmware/locations - elif [ "${x}" == "/etc/vmware/not_configured" ] ; then - echo "" >> ${D}/etc/vmware/locations - else - echo -n " " >> ${D}/etc/vmware/locations - #perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware/locations - find ${D}${x} -printf %T@ >> ${D}/etc/vmware/locations - echo "" >> ${D}/etc/vmware/locations - fi - fi - done -} - -pkg_config() { - # In case pkg_config() ends up being the defacto standard for - # configuring packages (malverian <malverian@gentoo.org>) - - einfo "Running /opt/vmware/bin/vmware-config.pl" - /opt/vmware/bin/vmware-config.pl -} - -pkg_postinst() { - # This is to fix the problem where the not_configured file doesn't get - # removed when the configuration is run. This doesn't remove the file - # It just tells the vmware-config.pl script it can delete it. - einfo "Updating /etc/vmware/locations" - for x in /etc/vmware/._cfg????_locations ; do - if [ -f $x ] ; then - cat $x >> /etc/vmware/locations - rm $x - fi - done - - einfo - einfo "You need to run /opt/vmware/bin/vmware-config.pl to complete the install." - einfo - einfo "For VMware Add-Ons just visit" - einfo "http://www.vmware.com/download/downloadaddons.html" - einfo - einfo "After configuring, type 'vmware' to launch" - einfo - einfo "Also note that when you reboot you should run:" - einfo "/etc/init.d/vmware start" - einfo "before trying to run vmware. Or you could just add" - einfo "it to the default run level:" - einfo "rc-update add vmware default" - echo - #ewarn "For users of glibc-2.3.x, vmware-nat support is *still* broken on 2.6.x" -} - -pkg_postrm() { - einfo - einfo "To remove all traces of vmware you will need to remove the files" - einfo "in /etc/vmware/, /etc/init.d/vmware, /lib/modules/*/misc/vm*.o," - einfo "and .vmware/ in each users home directory. Don't forget to rmmod the" - einfo "vm* modules, either." - einfo -} diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r2.ebuild index 9e81bd770bf4..5dc581f4d8c5 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r2.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.2.8848-r2.ebuild,v 1.4 2005/01/05 15:38:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r2.ebuild,v 1.5 2005/01/11 16:37:45 wolf31o2 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 @@ -9,7 +9,7 @@ inherit eutils S=${WORKDIR}/vmware-distrib -ANY_ANY="vmware-any-any-update84" +ANY_ANY="vmware-any-any-update88" NP="VMware-workstation-4.5.2-8848" DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html" @@ -31,7 +31,7 @@ SRC_URI="http://vmware-svca.www.conxion.com/software/wkst/${NP}.tar.gz LICENSE="vmware" IUSE="" SLOT="0" -KEYWORDS="-* ~x86 ~amd64" +KEYWORDS="-* x86 amd64" RESTRICT="nostrip" DEPEND="virtual/libc @@ -57,8 +57,6 @@ src_unpack() { src_install() { dodir /opt/vmware/bin cp -a bin/* ${D}/opt/vmware/bin/ - chmod u+s ${D}/opt/vmware/bin/vmware || die - chmod u+s ${D}/opt/vmware/bin/vmware-ping || die dodir /opt/vmware/lib cp -dr lib/* ${D}/opt/vmware/lib/ @@ -102,11 +100,9 @@ src_install() { keepdir /etc/vmware/init.d/rc{0,1,2,3,4,5,6}.d # A simple icon I made - dodir /opt/vmware/lib/icon insinto /opt/vmware/lib/icon doins ${DISTDIR}/vmware.png || die - insinto /usr/share/pixmaps - doins ${DISTDIR}/vmware.png || die + doicon ${DISTDIR}/vmware.png || die make_desktop_entry vmware "VMWare Workstation" vmware.png |