diff options
author | Vadim Kuznetsov <vadimk@gentoo.org> | 2009-08-25 22:59:20 +0000 |
---|---|---|
committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2009-08-25 22:59:20 +0000 |
commit | 2f708c2854236acf9b83893119fe656505375010 (patch) | |
tree | 694aa34c3f335fe1e5e7369502f7bf046dd802a4 /app-emulation | |
parent | clean up (diff) | |
download | vmware-2f708c2854236acf9b83893119fe656505375010.tar.gz vmware-2f708c2854236acf9b83893119fe656505375010.tar.bz2 vmware-2f708c2854236acf9b83893119fe656505375010.zip |
clean up
svn path=/trunk/; revision=378
Diffstat (limited to 'app-emulation')
35 files changed, 0 insertions, 1872 deletions
diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog deleted file mode 100644 index cdb3a03..0000000 --- a/app-emulation/open-vm-tools/ChangeLog +++ /dev/null @@ -1,22 +0,0 @@ -# ChangeLog for app-emulation/open-vm-tools -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 04 Feb 2009; Mike Auty <ikelos@gentoo.org> files/open-vm-tools.desktop: - Add in Type=Application to open-vm-tools.desktop file. - - 31 Jan 2009; Mike Auty <ikelos@gentoo.org> -files/10-vmware-tools, - -files/disable-toolbox.patch, +files/open-vm-tools.desktop, - -files/tools.conf, -files/xautostart.conf, - open-vm-tools-0.0.20090121.142982.ebuild: - Update open-vm-tools to use XDG autostart. - -*open-vm-tools-0.0.20090121.142982 (30 Jan 2009) - - 30 Jan 2009; Mike Auty <ikelos@gentoo.org> - +files/2.6.28.1-api-break.patch, - -open-vm-tools-0.0.20081223.137496.ebuild, - +open-vm-tools-0.0.20090121.142982.ebuild: - Update open-vm-tools and add in a patch to fix bug 256678, since they - broke the 2.6.28 api with .1. - diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest deleted file mode 100644 index 4f76556..0000000 --- a/app-emulation/open-vm-tools/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX default-scripts.patch 3525 RMD160 7c3dfd342be245531493a9cf7a8be2be4c67dc4b SHA1 56ba6ca91262f73732a7d806a9c812aea683c2d2 SHA256 99ad1a202335736c50bbb92432371e522934d1a3347e992158b881cf9f810da6 -AUX makefile-destdir.patch 3108 RMD160 e2acae9a7a1eee8b900dea64ffe32da84bfb9cdc SHA1 77663372717e06c0e9e4bd47e02401d76298a298 SHA256 0be2f3ac56c6abee208c771a29f97c6cbc78e8cef128f2ac3a60cf471a6efff2 -AUX open-vm-tools.desktop 127 RMD160 375ec8cd688a5fe0609076798e515c048be81c15 SHA1 6b6adcb93fbcb11e1638d6a80b3828256f880dcf SHA256 7cb78f0d94f1849aa964bc8e9d9a6c49955ba1a9b937174b1c266a9cc8eb4bc3 -AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c21c6d29243ac81a9c1ada61616778f3ce2 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c -AUX open-vm.initd 1875 RMD160 9d2cc36fd93e70ae20eecd49b10c4da0e09aad69 SHA1 1702f267d32ca138e0e99d9ed86b4abc32cc3997 SHA256 1799b78836441b389de0b3d92aad80fcf020fe8b57da4f6d6999f86ee87f51bf -DIST open-vm-tools-2009.03.18-154848.tar.gz 3964960 RMD160 83df432107eaea2c174cd77a6d857c77a29cde2c SHA1 31b85613b6fe43c89dadb7f49ac26e7b96097f58 SHA256 6c9d06dee94c04214526f439599ed42064d6cee62125791f7c9c07d60f09cd57 -EBUILD open-vm-tools-0.0.20090318.154848.ebuild 2888 RMD160 cd83ad757cfc87a643443ec75eeb0ab9652de7e1 SHA1 a60b4bdba07209984a1f6aa2dd9289aa736cb7e7 SHA256 034ccf47629b61d5e080066e15d4b6f8b5d777e4a7c3c7b72b9607db5bdaf03a -MISC ChangeLog 851 RMD160 85dd87325a0294d1a6268e9382429e53f691d749 SHA1 86123884ec7e16958fb50c0a3bc8341eeb832871 SHA256 96c8325fcaf9bf629f28afc1e97eb6e1f1a09e78f9e80e2c7d1ee97c9a6f847d diff --git a/app-emulation/open-vm-tools/files/default-scripts.patch b/app-emulation/open-vm-tools/files/default-scripts.patch deleted file mode 100644 index 2136dad..0000000 --- a/app-emulation/open-vm-tools/files/default-scripts.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff --git a/scripts/linux/resume-vm-default b/scripts/linux/resume-vm-default -index cebbba0..dbd38a6 100644 ---- a/scripts/linux/resume-vm-default -+++ b/scripts/linux/resume-vm-default -@@ -25,41 +25,10 @@ - echo `date` ": Executing '$0'" - echo - --find_networking_script() { -- local script="error" -- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do -- if [ -d "$dir/rc0.d" ] && -- [ -d "$dir/rc1.d" ] && -- [ -d "$dir/rc2.d" ] && -- [ -d "$dir/rc3.d" ] && -- [ -d "$dir/rc4.d" ] && -- [ -d "$dir/rc5.d" ] && -- [ -d "$dir/rc6.d" ]; then -- -- # Now find the appropriate networking script. -- if [ -d "$dir/init.d" ]; then -- if [ -x "$dir/init.d/network" ]; then -- script="$dir/init.d/network" -- elif [ -x "$dir/init.d/networking" ]; then -- script="$dir/init.d/networking" -- fi -- else -- if [ -x "$dir/network" ]; then -- script="$dir/network" -- elif [ -x "$dir/networking" ]; then -- script="$dir/networking" -- fi -- fi -- fi -- done -- -- echo "$script" --} -- - rescue_NIC() { - niclist="/var/run/vmware-active-nics" - -- ifup_path=`which ifup 2>/dev/null`; -+ ifup_path="/etc/init.d/net."; - if [ $? -ne 0 ]; then - return 1; - fi -@@ -76,7 +45,7 @@ rescue_NIC() { - else - echo `date` "[rescue_nic] activating $nic ..." - -- $ifup_path $nic -+ $ifup_path$nic restart - fi - done < $niclist - -@@ -95,15 +64,8 @@ if [ -d "$scriptsdir" ]; then - done - fi - --network=`find_networking_script` --if [ "$network" != "error" ]; then -- "$network" restart -- # Continue even if the networking init script wasn't successful. -- status=0 --else -- echo "networking script not found" -- status=1 --fi -+# Continue even if the networking init script wasn't successful. -+status=0 - - if [ $status -eq 0 ]; then - rescue_NIC -diff --git a/scripts/linux/suspend-vm-default b/scripts/linux/suspend-vm-default -index 80bf5b9..f590194 100644 ---- a/scripts/linux/suspend-vm-default -+++ b/scripts/linux/suspend-vm-default -@@ -25,37 +25,6 @@ - echo `date` ": Executing '$0'" - echo - --find_networking_script() { -- local script="error" -- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do -- if [ -d "$dir/rc0.d" ] && -- [ -d "$dir/rc1.d" ] && -- [ -d "$dir/rc2.d" ] && -- [ -d "$dir/rc3.d" ] && -- [ -d "$dir/rc4.d" ] && -- [ -d "$dir/rc5.d" ] && -- [ -d "$dir/rc6.d" ]; then -- -- # Now find the appropriate networking script. -- if [ -d "$dir/init.d" ]; then -- if [ -x "$dir/init.d/network" ]; then -- script="$dir/init.d/network" -- elif [ -x "$dir/init.d/networking" ]; then -- script="$dir/init.d/networking" -- fi -- else -- if [ -x "$dir/network" ]; then -- script="$dir/network" -- elif [ -x "$dir/networking" ]; then -- script="$dir/networking" -- fi -- fi -- fi -- done -- -- echo "$script" --} -- - save_active_NIC_list() { - ifconfig_path=`which ifconfig 2>/dev/null` - if [ $? ]; then -@@ -76,15 +45,12 @@ fi - - save_active_NIC_list - --network=`find_networking_script` --if [ "$network" != "error" ]; then -- "$network" stop -- # If the network is down, this may fail but that's not a good reason -- # to prevent the suspend. -- status=0 --else -- echo "networking script not found" -- status=1 --fi -+for network in `ls /etc/init.d/net.*`; -+do -+ "$network" stop -+done -+# If the network is down, this may fail but that's not a good reason -+# to prevent the suspend. -+status=0 - - exit "$status" diff --git a/app-emulation/open-vm-tools/files/makefile-destdir.patch b/app-emulation/open-vm-tools/files/makefile-destdir.patch deleted file mode 100644 index d1b8dad..0000000 --- a/app-emulation/open-vm-tools/files/makefile-destdir.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/guestd/Makefile.am b/guestd/Makefile.am -index 68e55bb..c027edb 100644 ---- a/guestd/Makefile.am -+++ b/guestd/Makefile.am -@@ -96,8 +96,8 @@ endif PAMD - endif LINUX - - install-exec-hook: -- $(INSTALL) -d /etc/vmware-tools -- echo 'disable-tools-version = "true"' > /etc/vmware-tools/tools.conf -+ $(INSTALL) -d $(DESTDIR)/etc/vmware-tools -+ echo 'disable-tools-version = "true"' > $(DESTDIR)/etc/vmware-tools/tools.conf - - uninstall-hook: -- $(RM) -rf /etc/vmware-tools -+ $(RM) -rf $(DESTDIR)/etc/vmware-tools -diff --git a/hgfsmounter/Makefile.am b/hgfsmounter/Makefile.am -index 83dc90a..0202d5d 100644 ---- a/hgfsmounter/Makefile.am -+++ b/hgfsmounter/Makefile.am -@@ -30,13 +30,13 @@ mount_vmhgfs_SOURCES += stub-user-util.c - - if FREEBSD - install-exec-hook: -- $(MV) $(sbindir)/mount.vmhgfs $(sbindir)/mount_vmhgfs -- chown root $(sbindir)/mount_vmhgfs -- chmod u+s $(sbindir)/mount_vmhgfs -+ $(MV) $(DESTDIR)$(sbindir)/mount.vmhgfs $(DESTDIR)$(sbindir)/mount_vmhgfs -+ chown root $(DESTDIR)$(sbindir)/mount_vmhgfs -+ chmod u+s $(DESTDIR)$(sbindir)/mount_vmhgfs - uninstall-hook: -- $(RM) -f $(sbindir)/mount_vmhgfs -+ $(RM) -f $(DESTDIR)$(sbindir)/mount_vmhgfs - else - install-exec-hook: -- chown root $(sbindir)/mount.vmhgfs -- chmod u+s $(sbindir)/mount.vmhgfs -+ chown root $(DESTDIR)$(sbindir)/mount.vmhgfs -+ chmod u+s $(DESTDIR)$(sbindir)/mount.vmhgfs - endif !FREEBSD -diff --git a/toolbox/Makefile.am b/toolbox/Makefile.am -index 18508ec..544e9c7 100644 ---- a/toolbox/Makefile.am -+++ b/toolbox/Makefile.am -@@ -62,14 +62,14 @@ vmware_toolbox_SOURCES += toolboxScripts.c - vmware_toolbox_SOURCES += toolboxShrink.c - - install-exec-hook: -- $(INSTALL) -d $(datadir)/applications/ -+ $(INSTALL) -d $(DESTDIR)$(datadir)/applications/ - $(INSTALL) -m 644 ../scripts/common/vmware-toolbox.desktop \ -- $(datadir)/applications/ -+ $(DESTDIR)$(datadir)/applications/ - $(SED) -i s/Exec=.*/Exec=vmware-toolbox/ \ -- $(datadir)/applications/vmware-toolbox.desktop -- $(INSTALL) -d /usr/share/pixmaps/vmware -+ $(DESTDIR)$(datadir)/applications/vmware-toolbox.desktop -+ $(INSTALL) -d $(DESTDIR)/usr/share/pixmaps/vmware - $(INSTALL) -m 644 bigIcon.xpm \ -- /usr/share/pixmaps/vmware/vmware-toolbox.xpm -+ $(DESTDIR)/usr/share/pixmaps/vmware/vmware-toolbox.xpm - uninstall-hook: -- -$(RM) -f $(datadir)/share/applications/vmware-toolbox.desktop -- -$(RM) -rf /usr/share/pixmaps/vmware -+ -$(RM) -f $(DESTDIR)$(datadir)/share/applications/vmware-toolbox.desktop -+ -$(RM) -rf $(DESTDIR)/usr/share/pixmaps/vmware -diff --git a/vmware-user/Makefile.am b/vmware-user/Makefile.am -index 0f64cc9..4a7133e 100644 ---- a/vmware-user/Makefile.am -+++ b/vmware-user/Makefile.am -@@ -89,8 +89,8 @@ vmware_user_SOURCES += pointer.c - vmware_user_SOURCES += vmware-user.c - - install-exec-hook: -- $(INSTALL) -d $(datadir)/applications/ -+ $(INSTALL) -d $(DESTDIR)$(datadir)/applications/ - $(INSTALL) -m 644 ../scripts/common/vmware-user.desktop \ -- $(datadir)/applications/ -+ $(DESTDIR)$(datadir)/applications/ - uninstall-hook: -- -$(RM) -f $(datadir)/applications/vmware-user.desktop -+ -$(RM) -f $(DESTDIR)$(datadir)/applications/vmware-user.desktop diff --git a/app-emulation/open-vm-tools/files/open-vm-tools.desktop b/app-emulation/open-vm-tools/files/open-vm-tools.desktop deleted file mode 100644 index 2107a62..0000000 --- a/app-emulation/open-vm-tools/files/open-vm-tools.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Exec=vmware-user -Name=VMware User Agent -X-KDE-autostart-phase=1 -NoDisplay=true diff --git a/app-emulation/open-vm-tools/files/open-vm.confd b/app-emulation/open-vm-tools/files/open-vm.confd deleted file mode 100644 index 4414fab..0000000 --- a/app-emulation/open-vm-tools/files/open-vm.confd +++ /dev/null @@ -1,2 +0,0 @@ -# Set this to no to disable drag and drop (and vmblock) loading. -VM_DRAG_AND_DROP="yes" diff --git a/app-emulation/open-vm-tools/files/open-vm.initd b/app-emulation/open-vm-tools/files/open-vm.initd deleted file mode 100644 index d4f96cc..0000000 --- a/app-emulation/open-vm-tools/files/open-vm.initd +++ /dev/null @@ -1,76 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm.initd,v 1.2 2008/02/01 12:33:36 flameeyes Exp $ - -DND_TMPDIR="/tmp/VMwareDnD" -USER_GROUP="root:vmware" -DND_TMPDIR_PERMS="1777" -GUESTD_BIN="/usr/sbin/vmware-guestd" -PIDFILE="/var/run/vmware-guestd.pid" -MOUNTPOINT="/proc/fs/vmblock/mountPoint" - -depend() { - before checkfs fsck net X -} - -start() { - if [ "${VM_DRAG_AND_DROP}" == "yes" ]; - then - - if ! grep -q -w vmblock /proc/modules; - then - ebegin "Loading vmblock module" - modprobe vmblock - eend $? - sleep 0.25 - fi - - if [[ ! -d "${DND_TMPDIR}" ]]; - then - # einfo "Creating the VM drag and drop directory" - mkdir "${DND_TMPDIR}" - chown "${USER_GROUP}" "${DND_TMPDIR}" - chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}" - fi - - # DnD_TMPDIR must exist before vmblock can be mounted - ebegin "Mounting vmblock device" - mount -t vmblock none ${MOUNTPOINT} - eend $? - fi - - ebegin "Starting vmware-guestd" - start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --exec ${GUESTD_BIN} -- --background "${PIDFILE}" - eend $? -} - -stop() { - local ret - - if [ "${VM_DRAG_AND_DROP}" == "yes" ]; - then - ebegin "Cleaning the contents of ${DND_TMPDIR}" - # First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/* - if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]]; - then - rm -rf ${DND_TMPDIR}/* - ret=0 - else - eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable" - ret=1 - fi - eend $ret - - ebegin "Unmounting vmblock device" - if grep -q -w "${MOUNTPOINT}" /proc/mounts; - then - umount ${MOUNTPOINT} 1>&2 > /dev/null - fi - eend 0 - fi - - ebegin "Stopping vmware-guestd" - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend $? -} diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090318.154848.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090318.154848.ebuild deleted file mode 100644 index d5d1477..0000000 --- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090318.154848.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20081223.137496.ebuild,v 1.1 2008/12/31 00:39:39 ikelos Exp $ - -inherit pam eutils linux-mod versionator - -MY_DATE="$(get_version_component_range 3)" -MY_BUILD="$(get_version_component_range 4)" -MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}" -MY_P="${PN}-${MY_PV}" - -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Opensourced tools for VMware guests" -HOMEPAGE="http://open-vm-tools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="X xinerama icu unity gtkmm" -DEPEND=" - virtual/linux-sources - sys-apps/ethtool - X? ( - x11-libs/libX11 - x11-libs/gtk+ - ) - unity? ( - x11-libs/libXScrnSaver - dev-libs/uriparser - ) - xinerama? ( - x11-libs/libXinerama - ) - gtkmm? ( - dev-cpp/gtkmm - ) - !app-emulation/vmware-workstation-tools - !app-emulation/vmware-server-tools - !app-emulation/vmware-esx-tools - sys-process/procps - dev-libs/libdnet - icu? ( dev-libs/icu ) - " - -RDEPEND="${DEPEND/virtual\/linux\-sources/} - virtual/pam - X? ( - x11-base/xorg-server - x11-drivers/xf86-video-vmware - x11-drivers/xf86-input-vmmouse - ) - unity? ( - x11-libs/libXScrnSaver - dev-libs/uriparser - ) -" - -VMWARE_MOD_DIR="modules/linux" -VMWARE_MODULE_LIST="vmblock vmhgfs vmsync vmmemctl vmxnet" - -pkg_setup() { - use unity && ! use xinerama && \ - die 'The Unity USE flag requires USE="xinerama" as well' - - linux-mod_pkg_setup - MODULE_NAMES="" - BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR}" - - for mod in ${VMWARE_MODULE_LIST}; - do - if [[ "${mod}" == "vmxnet" ]]; - then - MODTARGET="net" - else - MODTARGET="openvmtools" - fi - MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})" - done - - enewgroup vmware -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/default-scripts.patch" -} - -src_compile() { - econf \ - --without-kernel-modules \ - $(use_with icu) \ - $(use_with X x) \ - $(use_with gtkmm) \ - $(use_enable unity) \ - $(use_enable xinerama multimon) \ - || die "Error: econf failed!" - - linux-mod_src_compile - - emake || die -} - -src_install() { - - linux-mod_src_install - - pamd_mimic_system vmware-guestd auth account - - emake install DESTDIR="${D}" || die "Failed to install" - - newinitd "${FILESDIR}/open-vm.initd" vmware-tools - newconfd "${FILESDIR}/open-vm.confd" vmware-tools - - if use X; - then - insinto /etc/xdg/autostart - doins "${FILESDIR}/open-vm-tools.desktop" - - elog "To be able to use the drag'n'drop feature of VMware for file" - elog "exchange, you need to do this:" - elog " Add 'vmware-tools' to your default runlevel" - elog " Add the users which should have access to this function" - elog " to the group 'vmware'" - fi -} diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index dbbe16d..668fa91 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -1,5 +1,3 @@ -AUX 1.0.0.23-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f -AUX 1.0.0.23-r1-kernel-2.6.29.patch 10451 RMD160 2f0094a87ae9530e6a5937f6b3dc3bdeeebe2370 SHA1 86d4f265ecb7921dae4a5cf6531c85f5c4dde82e SHA256 c1f0467f9326f39fbfe81027f26fac478eeb5136f0c06c102e4d3b029971d021 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 AUX patches/vmblock/010_all_kernel-2.6.25.patch 2398 RMD160 d0a3464f03486eda983b230d0bd90bca8a5d7ed3 SHA1 b5de035a7d1f0051a76512be7e25b04ff3d0dbdd SHA256 4036d37415cad6109e95e82c3789f32ea2c4901961612fb158d5f7148671b32e @@ -10,9 +8,6 @@ AUX patches/vmnet/021_all_wireless_fix.patch 668 RMD160 dbcd47fc4749b36417d028a5 AUX patches/vmnet/025_all_kernel-2.6.25.patch 939 RMD160 c7f9f0b9e7bf98b4b37db70926c1c463874e8458 SHA1 43f8f9a5a0b9a28223ad901afd5b45749447bdc4 SHA256 a3247b261376f7cde78724d5704c4ea2511d54644f9c2b776b41f19d261cba17 AUX patches/vmnet/030_all_kernel-2.6.27.patch 2236 RMD160 1b415cd3aeab9a7ce1cb23e9efc99534983e6645 SHA1 26e62550971e5f4f1328a0c546e219d0e493f781 SHA256 43f3f49c21c797a6ee184af258eef61dd2fd9b9e2be2f104a86607e28ffcd36a DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1 -DIST vmware-modules-1.0.0.23-r1.amd64.tar.bz2 486989 RMD160 12f197294b4df7bf15935ef9d44d7c809a5d88aa SHA1 51436cfd97311eb5d1430b390d2d98a27bf47494 SHA256 b062c7505e0251ce5352c40d081a62989e6fa5f6441b737bbeb6c4471867686e -DIST vmware-modules-1.0.0.23-r1.x86.tar.bz2 487101 RMD160 f69475312cbaeb0afccc46e8465dfbed7bee49d2 SHA1 f2b23a2adcfc8fde3cd26f1a75e504c82010bb10 SHA256 5fb5eb11d26e86a62018a57e6afe975f32ce9a7b0ec1069ed1f756e034337b6b EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d -EBUILD vmware-modules-1.0.0.23-r1.ebuild 812 RMD160 b5f84d19b86f136d5d816216c5296945a802871c SHA1 921f4bb58f1061799294a9a25171057b4af16f05 SHA256 cf1e63c3832ea7e43a39ca4e4344ea2705f0f206fcbd45c720f5846ffbd1352f MISC ChangeLog 753 RMD160 e1878bd15ff77452618d34f07465d307308147ed SHA1 198a0d1e2d6e4d14c47a728a7f6e11ce7c761aec SHA256 b045f38e6df6d9ce21b8d2928d93a0a18fc21c3458345a213ef044ee531d46c8 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 diff --git a/app-emulation/vmware-modules/files/1.0.0.23-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.23-makefile-kernel-dir.patch deleted file mode 100644 index 8df4d86..0000000 --- a/app-emulation/vmware-modules/files/1.0.0.23-makefile-kernel-dir.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile -index 0a9ffd6..4aa09e8 100644 ---- a/vmblock-only/Makefile -+++ b/vmblock-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmblock - PRODUCT := @PRODUCT@ -diff --git a/vmci-only/Makefile b/vmci-only/Makefile -index 0a6c9c6..6cd0b6d 100644 ---- a/vmci-only/Makefile -+++ b/vmci-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmci - PRODUCT := @PRODUCT@ -diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile -index d26e58c..f8a40f4 100644 ---- a/vmmon-only/Makefile -+++ b/vmmon-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmmon - PRODUCT := @PRODUCT@ -diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile -index 4cabc30..568271a 100644 ---- a/vmnet-only/Makefile -+++ b/vmnet-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmnet - PRODUCT := @PRODUCT@ -diff --git a/vsock-only/Makefile b/vsock-only/Makefile -index a69bc22..8a74856 100644 ---- a/vsock-only/Makefile -+++ b/vsock-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vsock - PRODUCT := ws diff --git a/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch b/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch deleted file mode 100644 index a4ad6e9..0000000 --- a/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -ur vmware-modules-1.0.0.23-r1.0/work/vmblock-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmblock-only/Makefile.kernel ---- vmware-modules-1.0.0.23-r1.0/work/vmblock-only/Makefile.kernel 2009-03-27 08:05:21.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vmblock-only/Makefile.kernel 2009-04-07 16:14:55.000000000 +0400 -@@ -19,7 +19,7 @@ - - INCLUDE := -I$(SRCROOT)/include - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) -diff -ur vmware-modules-1.0.0.23-r1.0/work/vmci-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmci-only/Makefile.kernel ---- vmware-modules-1.0.0.23-r1.0/work/vmci-only/Makefile.kernel 2009-03-27 08:05:22.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vmci-only/Makefile.kernel 2009-04-07 16:14:55.000000000 +0400 -@@ -21,7 +21,7 @@ - - INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) - -diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/driver.c vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/driver.c ---- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/driver.c 2009-03-27 08:05:19.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/driver.c 2009-04-07 16:15:11.000000000 +0400 -@@ -1984,10 +1984,10 @@ - } - - case IOCTL_VMX86_ALLOW_CORE_DUMP: -- if (current->euid == current->uid && -- current->fsuid == current->uid && -- current->egid == current->gid && -- current->fsgid == current->gid) { -+ if (current_euid() == current_uid() && -+ current_fsuid() == current_uid() && -+ current_egid() == current_gid() && -+ current_fsgid() == current_gid()) { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) || defined(MMF_DUMPABLE) - /* Dump core, readable by user. */ - set_bit(MMF_DUMPABLE, ¤t->mm->flags); -diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/hostif.c vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/hostif.c ---- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/hostif.c 2009-03-27 08:05:18.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/hostif.c 2009-04-07 16:19:05.000000000 +0400 -@@ -3424,6 +3424,82 @@ - } - - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+static inline -+void compat_cap_raise(int cap) -+{ -+ cap_raise(current->cap_effective, cap); -+} -+#else -+static -+void compat_cap_raise(int cap) -+{ -+ struct cred *new_cred; -+ -+ new_cred = prepare_creds(); -+ if (new_cred != NULL) -+ { -+ cap_raise(new_cred->cap_effective, cap); -+ commit_creds(new_cred); -+ } -+ else -+ { -+ Log("compat_cap_raise(%d) prepare_creds(): Out of memory\n", cap); -+ } -+} -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+static inline -+void compat_cap_lower(int cap) -+{ -+ cap_lower(current->cap_effective, cap); -+} -+#else -+static -+void compat_cap_lower(int cap) -+{ -+ struct cred *new_cred; -+ -+ new_cred = prepare_creds(); -+ if (new_cred != NULL) -+ { -+ cap_lower(new_cred->cap_effective, cap); -+ commit_creds(new_cred); -+ } -+ else -+ { -+ Log("compat_cap_lower(%d) prepare_creds(): Out of memory\n", cap); -+ } -+} -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+static inline -+void compat_set_fsuid(int fsuid) -+{ -+ current->fsuid = fsuid; -+} -+#else -+static -+void compat_set_fsuid(int fsuid) -+{ -+ struct cred *new_cred; -+ -+ new_cred = prepare_creds(); -+ if (new_cred != NULL) -+ { -+ new_cred->fsuid = fsuid; -+ commit_creds(new_cred); -+ } -+ else -+ { -+ Log("compat_set_fsuid(%d) prepare_creds(): Out of memory\n", fsuid); -+ } -+} -+#endif -+ -+ - /* - *---------------------------------------------------------------------- - * -@@ -3456,7 +3532,7 @@ - oldFS = get_fs(); - set_fs(KERNEL_DS); - compat_allow_signal(SIGKILL); -- cap_raise(current->cap_effective, CAP_SYS_RESOURCE); -+ compat_cap_raise(CAP_SYS_RESOURCE); - compat_set_user_nice(current, linuxState.fastClockPriority); - - while (linuxState.fastClockRate > HZ + HZ/16) { -@@ -3580,19 +3656,19 @@ - Bool cap; - long pid; - -- fsuid = current->fsuid; -- current->fsuid = 0; -+ fsuid = current_fsuid(); -+ compat_set_fsuid(0); - filp = filp_open("/dev/rtc", O_RDONLY, 0); -- current->fsuid = fsuid; -+ compat_set_fsuid(fsuid); - if (IS_ERR(filp)) { - Warning("/dev/rtc open failed: %d\n", (int)(VA)filp); - return -(int)(VA)filp; - } -- cap = cap_raised(current->cap_effective, CAP_SYS_RESOURCE); -- cap_raise(current->cap_effective, CAP_SYS_RESOURCE); -+ cap = cap_raised(current_cap(), CAP_SYS_RESOURCE); -+ compat_cap_raise(CAP_SYS_RESOURCE); - res = HostIFDoIoctl(filp, RTC_PIE_ON, 0); - if (!cap) { -- cap_lower(current->cap_effective, CAP_SYS_RESOURCE); -+ compat_cap_lower(CAP_SYS_RESOURCE); - } - if (res < 0) { - Warning("/dev/rtc enable interrupt failed: %d\n", res); -diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmmon-only/Makefile.kernel ---- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/Makefile.kernel 2009-03-27 08:05:19.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vmmon-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 -@@ -22,7 +22,7 @@ - INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ - -I$(SRCROOT)/vmcore - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c, -DVMW_SKAS_MMAP, ) -diff -ur vmware-modules-1.0.0.23-r1.0/work/vmnet-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmnet-only/Makefile.kernel ---- vmware-modules-1.0.0.23-r1.0/work/vmnet-only/Makefile.kernel 2009-03-27 08:05:20.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vmnet-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 -@@ -19,7 +19,7 @@ - - INCLUDE := -I$(SRCROOT) - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c, -DVMW_HAVE_EPOLL, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/socket.c, -DVMW_HAVE_SK_WMEM_ALLOC, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, ) -diff -ur vmware-modules-1.0.0.23-r1.0/work/vmnet-only/netif.c vmware-modules-1.0.0.23-r1/work/vmnet-only/netif.c ---- vmware-modules-1.0.0.23-r1.0/work/vmnet-only/netif.c 2009-03-27 08:05:20.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vmnet-only/netif.c 2009-04-07 16:15:21.000000000 +0400 -@@ -55,6 +55,30 @@ - struct net_device_stats stats; - } VNetNetIF; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+/* -+ Prior to KERNEL_VERSION(2, 6, 29) "struct net_device" had "void -+ *priv" field which was used as pointer to "VNetNetIF". -+*/ -+ -+#define VNetNetIF_netdev_priv_size 0 -+ -+#define VNetNetIF_netdev_netIf(dev) (*(VNetNetIF**)&((dev)->priv)) -+ -+#else -+/* -+ Since KERNEL_VERSION(2, 6, 29) pointer to "VNetNetIF" is stored in -+ explicitly allocated private area. -+*/ -+typedef struct { -+ VNetNetIF *netIf; -+} VNetNetIF_netdev_priv; -+ -+#define VNetNetIF_netdev_priv_size sizeof(VNetNetIF_netdev_priv) -+ -+#define VNetNetIF_netdev_netIf(dev) (((VNetNetIF_netdev_priv *)compat_netdev_priv(dev))->netIf) -+ -+#endif - - static void VNetNetIfFree(VNetJack *this); - static void VNetNetIfReceive(VNetJack *this, struct sk_buff *skb); -@@ -318,13 +342,13 @@ - memcpy(netIf->devName, devName, sizeof netIf->devName); - NULL_TERMINATE_STRING(netIf->devName); - -- dev = compat_alloc_netdev(0, netIf->devName, VNetNetIfSetup); -+ dev = compat_alloc_netdev(VNetNetIF_netdev_priv_size, netIf->devName, VNetNetIfSetup); - if (!dev) { - retval = -ENOMEM; - goto out; - } - -- dev->priv = netIf; -+ VNetNetIF_netdev_netIf(dev) = netIf; - netIf->dev = dev; - - memcpy(dev->dev_addr, netIf->port.paddr, sizeof netIf->port.paddr); -@@ -566,7 +590,7 @@ - VNetNetifStartXmit(struct sk_buff *skb, // IN: - struct net_device *dev) // IN: - { -- VNetNetIF *netIf = (VNetNetIF*)dev->priv; -+ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); - - if(skb == NULL) { - return 0; -@@ -618,7 +642,7 @@ - VNetNetifSetMAC(struct net_device *dev, // IN: - void *p) // IN: - { -- VNetNetIF *netIf = (VNetNetIF*)dev->priv; -+ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); - struct sockaddr const *addr = p; - if (!VMX86_IS_STATIC_MAC(addr->sa_data)) { - return -EINVAL; -@@ -675,7 +699,7 @@ - struct net_device_stats * - VNetNetifGetStats(struct net_device *dev) // IN: - { -- VNetNetIF *netIf = (VNetNetIF*)dev->priv; -+ VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev); - return &(netIf->stats); - } - -diff -ur vmware-modules-1.0.0.23-r1.0/work/vsock-only/linux/util.c vmware-modules-1.0.0.23-r1/work/vsock-only/linux/util.c ---- vmware-modules-1.0.0.23-r1.0/work/vsock-only/linux/util.c 2009-03-27 08:05:23.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vsock-only/linux/util.c 2009-04-07 16:15:21.000000000 +0400 -@@ -154,7 +154,7 @@ - goto error; - } - -- Log(buf); -+ Log("%s", buf); - - return; - -diff -ur vmware-modules-1.0.0.23-r1.0/work/vsock-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vsock-only/Makefile.kernel ---- vmware-modules-1.0.0.23-r1.0/work/vsock-only/Makefile.kernel 2009-03-27 08:05:23.000000000 +0300 -+++ vmware-modules-1.0.0.23-r1/work/vsock-only/Makefile.kernel 2009-04-07 16:15:21.000000000 +0400 -@@ -25,7 +25,7 @@ - INCLUDE += -I$(SRCROOT)/linux - INCLUDE += -I$(SRCROOT)/common - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) - diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild deleted file mode 100644 index 320cf5e..0000000 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.23.ebuild,v 1.2 2009/01/12 21:42:37 maekke Exp $ - -KEYWORDS="amd64 x86" -VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER - -PATCH_VER="1" - -inherit eutils vmware-mod - -LICENSE="GPL-2" -IUSE="" - -VMWARE_MODULE_LIST="vmmon vmnet vmblock vmci vsock" -SRC_URI="x86? ( http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-${PVR}.x86.tar.bz2 ) - amd64? ( http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-${PVR}.amd64.tar.bz2 )" -VMWARE_MOD_DIR="${PN}-${PVR}" - -src_unpack() { - vmware-mod_src_unpack - cd "${S}" - epatch "${FILESDIR}/${PVR}-kernel-2.6.29.patch" - epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch" -} diff --git a/app-emulation/vmware-player/files/2.5.2.156735/vmware-player-extras.py.patch b/app-emulation/vmware-player/files/2.5.2.156735/vmware-player-extras.py.patch deleted file mode 100644 index eb9e723..0000000 --- a/app-emulation/vmware-player/files/2.5.2.156735/vmware-player-extras.py.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/vmware-player-extras.py b/vmware-player-extras.py -index 21595b1..e8adf08 100644 ---- a/vmware-player-extras.py -+++ b/vmware-player-extras.py -@@ -6,7 +6,8 @@ VMware Player Extras component installer. - - DEST = LIBDIR/'vmware' - SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', } --CONF = DEST/'setup/vmware-config' -+import os -+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh' - - - class PlayerExtras(Installer): diff --git a/app-emulation/vmware-player/files/2.5.2.156735/vmware-player.py.patch b/app-emulation/vmware-player/files/2.5.2.156735/vmware-player.py.patch deleted file mode 100644 index 49306c3..0000000 --- a/app-emulation/vmware-player/files/2.5.2.156735/vmware-player.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/vmware-player.py b/vmware-player.py -index bee22df..d06cca9 100644 ---- a/vmware-player.py -+++ b/vmware-player.py -@@ -6,7 +6,8 @@ VMware Player component installer. - - GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults' - DEST = LIBDIR/'vmware' --CONFIG = DEST/'setup/vmware-config' -+import os -+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh' - CUPSLIBDIR = LIBDIR/'cups' - # XXX: LIBDIR should be properly calculated, to make this cleaner - if (PREFIX/'lib64/cups').exists(): -@@ -84,12 +85,12 @@ class Player(Installer): - ret, kvers = output('uname', '-r') - kvers = kvers.strip() - modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock') -- base = path('/lib/modules/%s/misc' % kvers) -+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers) - - for module in modules: - for ext in ('o', 'ko'): - mod = '%s.%s' % (module, ext) -- (base/mod).remove(ignore_errors=True) -+ # (base/mod).remove(ignore_errors=True) - - def PreUninstall(self, old, new, upgrade): - script = INITSCRIPTDIR/'vmware' -@@ -156,8 +157,8 @@ class Player(Installer): - def PostTransactionInstall(self, old, new, upgrade): - if ENV.get('VMWARE_SKIP_MODULES'): - log.info('Skipping kernel module installation') -- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: -- log.info('Successfully installed kernel modules') -+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: -+ # log.info('Successfully installed kernel modules') - else: - log.info('Unable to install kernel modules') - -@@ -189,8 +190,8 @@ class Player(Installer): - for handler in ('vm', 'vms'): - for gconfType, key, value in settings: - key = key % handler -- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -- '--type', gconfType, '--set', key, value) -+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -+ # '--type', gconfType, '--set', key, value) - - # Instruct all gconfd daemons to reload. - run('killall', '-HUP', 'gconfd-2') -@@ -200,9 +201,9 @@ class Player(Installer): - def _deconfigureVMStreamingHandlers(self): - """ Deconfigures the handlers for vm:// and vms:// used for VM streaming""" - def deconfigureGConf(): -- for handler in ('vm', 'vms'): -- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) -+ # for handler in ('vm', 'vms'): -+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) - - # Instruct all gconfd daemons to reload. - run('killall', '-HUP', 'gconfd-2') diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.2.156735-installer.patch b/app-emulation/vmware-player/files/vmware-player-2.5.2.156735-installer.patch deleted file mode 100644 index 80a301e..0000000 --- a/app-emulation/vmware-player/files/vmware-player-2.5.2.156735-installer.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py -index 7a46312..e1dbff1 100644 ---- a/payload/install/vmware-installer/vmis/__init__.py -+++ b/payload/install/vmware-installer/vmis/__init__.py -@@ -12,5 +12,5 @@ VERSION_INFO = (1,0) - VERSION = '.'.join([str(x) for x in VERSION_INFO]) - MAJOR_VERSION = VERSION_INFO[0] - --CONFDIR = path(u'/etc/vmware') -+CONFDIR = path(u'./vmware-confdir') - DATABASE_PATH = CONFDIR/'database' -diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py -index e7abc2e..81c4a2b 100644 ---- a/payload/install/vmware-installer/vmis/core/env.py -+++ b/payload/install/vmware-installer/vmis/core/env.py -@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath): - # Python will interrept as being a module separator - moduleName = component.name.replace('.', '') - fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) -+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], -+ fileObj = file(pathName) - - try: - # XXX: db.config cannot be set at the module level because this -diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py -index 2be10de..f92ecff 100644 ---- a/payload/install/vmware-installer/vmis/core/questions.py -+++ b/payload/install/vmware-installer/vmis/core/questions.py -@@ -139,6 +139,9 @@ class InitDir(Directory): - """ - super(InitDir, self).Validate(answer) - -+ ### GENTOO PATCH ### Finish early -+ return True -+ - rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') - answer = path(answer) - -diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py -index 525df75..abb81b3 100644 ---- a/payload/install/vmware-installer/vmis/ui/console.py -+++ b/payload/install/vmware-installer/vmis/ui/console.py -@@ -148,7 +148,7 @@ class Wizard(object): - wrapper = TextWrapper() - wrapper.width = 79 - wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. -- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) -+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) - except IOError: # RHEL4 appears to close stdin while we still expect it to be open - pass - -diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py -index 4f609c4..b07b89d 100644 ---- a/payload/install/vmware-installer/vmis/util/log.py -+++ b/payload/install/vmware-installer/vmis/util/log.py -@@ -22,6 +22,8 @@ else: - # running a build) - LOG_FILE = '/tmp/vmware-installer.log' - -+LOG_FILE = './vmware-installer.log' -+ - if level <= logging.DEBUG: - MAX_BYTES = 0 - BACKUP_COUNT = 0 diff --git a/app-emulation/vmware-player/vmware-player-2.5.2.156735.ebuild b/app-emulation/vmware-player/vmware-player-2.5.2.156735.ebuild deleted file mode 100644 index b9f2d9e..0000000 --- a/app-emulation/vmware-player/vmware-player-2.5.2.156735.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild,v 1.2 2008/11/09 21:43:02 ikelos Exp $ - -inherit eutils versionator fdo-mime gnome2-utils - -MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)" - -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=" - x86? ( - mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle - http://download.softpedia.ro/linux/${MY_PN}.i386.bundle ) - amd64? ( - mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle - http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle ) - " - -LICENSE="vmware" -SLOT="0" -KEYWORDS="-* ~x86 ~amd64" -IUSE="" -RESTRICT="strip binchecks" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -DEPEND=">=dev-lang/python-2.5 - dev-python/lxml" -RDEPEND="sys-libs/glibc - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXinerama - x11-libs/libXi - >=x11-libs/libview-0.6.2 - dev-cpp/libsexymm - dev-cpp/cairomm - dev-cpp/libgnomecanvasmm - x11-libs/libXft - !app-emulation/vmware-player - !app-emulation/vmware-server - ~app-emulation/vmware-modules-1.0.0.23 - !<app-emulation/vmware-modules-1.0.0.23 - !>=app-emulation/vmware-modules-1.0.0.24 - sys-apps/pciutils" - -S=${WORKDIR}/vmware-distrib -VM_INSTALL_DIR="/opt/vmware/player" - -pkg_setup() { - if use x86; then - MY_P="${MY_PN}.i386" - elif use amd64; then - MY_P="${MY_PN}.x86_64" - fi - - if ! built_with_use -a '>=dev-lang/python-2.5' sqlite ncurses; then - eerror "You need to build dev-lang/python with \"sqlite ncurses\" USE flags!" - die "Please rebuild dev-lang/python with sqlite and ncurses USE flags!" - fi - - if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then - die "Please emerge this package using a different terminal (e.g. not within screen)." - fi -} - -pkg_nofetch() { - if use x86; then - MY_P="${MY_PN}.i386" - elif use amd64; then - MY_P="${MY_PN}.x86_64" - fi - - einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}" -} - -src_unpack() { - # Unbundle the bundle - cp "${FILESDIR}"/helpers/* "${WORKDIR}" - chmod a+x "${WORKDIR}"/*.sh - "${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle - - # Patch up the installer - epatch "${FILESDIR}/${P}-installer.patch" - - mkdir "${WORKDIR}/vmware-confdir" -} - -src_install() { - dodir /etc/init.d - - #Run the installer - local INSTALLER="${WORKDIR}/payload/install/vmware-installer" - local PYOPTS="-W ignore::DeprecationWarning" - export VMWARE_SKIP_NETWORKING="true" - python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \ - --set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \ - --set-setting initdir "${T}" \ - --set-setting initscriptdir "${D}/etc/init.d" \ - --set-setting prefix "${D}${VM_INSTALL_DIR}" \ - --set-setting sysconfdir "${D}/etc" \ - --install-component "${INSTALLER}" \ - --install-bundle "${DISTDIR}/${MY_P}.bundle" \ - --console --required - - rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary" - - if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then - eerror "VMware installation seems to have rolled back." - eerror "Please include the contents of ${WORKDIR}/vmware-installer.log" - eerror "in any bug reports you file." - die "VMware installation rolled back." - fi - - # Redirect all the ${D} paths to / paths" - sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap - - # Fix up icons/mime/desktop handlers - dodir /usr/share/ - mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/ - rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme} - mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/ - dodir /usr/share/mime - mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime - sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop - - # Copy across the temporary /etc/vmware directory - dodir /etc/vmware/init.d - cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware" - mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d" - newinitd "${FILESDIR}/${PN}"-2.5.rc vmware - touch "${D}"/etc/vmware/networking - - # Setup the path environment - insinto /etc/env.d - doins "${FILESDIR}/90${PN}" - - # Fix some paths to allow included gtk to work - for i in "/etc/pango/pangorc" \ - "/etc/pango/pango.modules" \ - "/etc/gtk-2.0/gtk.immodules" \ - "/etc/gtk-2.0/gdk-pixbuf.loaders" ; do - sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ; - sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ; - done - - # No idea why this happens, but it seems to happen all the time - ewarn "The following installation segment takes a *very* long time." - ewarn "Please be patient." -} - -pkg_config() { - ${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - ewarn "Before you can use vmware-player, you must configure a default - network setup." - ewarn "You can do this by running 'emerge --config ${PN}'." -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch b/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch deleted file mode 100644 index 77146c3..0000000 --- a/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl ---- vmware-server-distrib.orig/bin/vmware-config.pl 2007-12-02 11:40:41.000000000 +0000 -+++ vmware-server-distrib/bin/vmware-config.pl 2007-12-02 11:43:29.000000000 +0000 -@@ -10162,7 +10162,7 @@ - error('Please shut down any running VMs and run this script again.' . - "\n\n"); - } else { -- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') -+ if (system(shell_string('/etc/init.d' . '/vmware') - . ' stop')) { - error('Unable to stop services for ' . vmware_product_name() . "\n\n"); - } -@@ -10212,8 +10212,8 @@ - - if (isDesktopProduct()) { - build_vmblock(); -- createMimePackageFile(); -- configureDesktopFiles(); -+ # createMimePackageFile(); -+ # configureDesktopFiles(); - if (vmware_binary() ne "vmplayer") { - configure_eclipse_plugin(); - } -@@ -10283,7 +10283,7 @@ - db_save(); - # Then start VMware's services - if (!$gOption{'skip-stop-start'}) { -- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start'); -+ system(shell_string('/etc/init.d' . '/vmware') . ' start'); - print "\n"; - } - diff --git a/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch b/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch deleted file mode 100644 index 605e358..0000000 --- a/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl ---- vmware-server-distrib.orig/bin/vmware-config.pl 2007-12-02 11:16:42.000000000 +0000 -+++ vmware-server-distrib/bin/vmware-config.pl 2007-12-02 11:25:36.000000000 +0000 -@@ -9097,7 +9097,10 @@ - error('Unable to write configuration file "' . $name . '".' . "\n\n"); - } - db_add_file($name, $cFlagTimestamp | $cFlagConfig); -- safe_chmod(0644, $name); -+ safe_chmod(0664, $name); -+ my $gid = (getgrnam('vmware'))[2]; -+ my $uid = (stat($name))[4]; -+ safe_chown($uid,$gid,$name); - - # Append the promotional configuration if it exists - $promoconfig = $libdir . '/configurator/PROMOCONFIG'; diff --git a/app-emulation/vmware-server/files/2.0.1.156745/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-server/files/2.0.1.156745/002_all_pagebreak-detection-fix.patch deleted file mode 100644 index fd3fc76..0000000 --- a/app-emulation/vmware-server/files/2.0.1.156745/002_all_pagebreak-detection-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl ---- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100 -+++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100 -@@ -2015,9 +2015,9 @@ - . shell_string($pattern)); - chomp($header_page_offset); - # Ignore PAGE_OFFSET if we cannot parse it. -- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) { -+ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) { - # We found a valid page offset -- $header_page_offset = $1; -+ $header_page_offset = $2; - if (defined($gSystem{'page_offset'}) and - not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) { - if ($source eq 'user') { diff --git a/app-emulation/vmware-server/files/2.0.1.156745/004_all_do-not-build-modules.patch b/app-emulation/vmware-server/files/2.0.1.156745/004_all_do-not-build-modules.patch deleted file mode 100644 index 35fe16b..0000000 --- a/app-emulation/vmware-server/files/2.0.1.156745/004_all_do-not-build-modules.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl -index 363f9cb..7ffc212 100755 ---- a/bin/vmware-config.pl -+++ b/bin/vmware-config.pl -@@ -10404,16 +10404,16 @@ sub main { - } - - if (vmware_product() ne 'server') { -- configure_mon(); -- configure_vmci(); -- configure_vsock(); -- configure_pp(); -+ #configure_mon(); -+ #configure_vmci(); -+ #configure_vsock(); -+ #configure_pp(); - - if (vmware_product() eq 'wgs') { - configure_net(); - } - -- build_vmnet(); -+ #build_vmnet(); - } - - if (isDesktopProduct()) { diff --git a/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch deleted file mode 100644 index 42fc20a..0000000 --- a/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/installer/services.sh b/installer/services.sh -index 402ad79..2fb53ab 100755 ---- a/installer/services.sh -+++ b/installer/services.sh -@@ -755,7 +755,7 @@ vmware_run_vimsh_cmd() { - } - - vmware_load_module() { -- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1 -+ /sbin/modprobe -s "$1" || exit 1 - return 0 - } - diff --git a/app-emulation/vmware-server/files/2.0.1.156745/009_all_init.d-modules-warning.patch b/app-emulation/vmware-server/files/2.0.1.156745/009_all_init.d-modules-warning.patch deleted file mode 100644 index dc57efb..0000000 --- a/app-emulation/vmware-server/files/2.0.1.156745/009_all_init.d-modules-warning.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh ---- vmware-server-distrib.orig/installer/services.sh 2007-12-02 12:08:09.000000000 +0000 -+++ vmware-server-distrib/installer/services.sh 2007-12-02 12:12:08.000000000 +0000 -@@ -823,8 +823,13 @@ - check_configured() { - if [ -e "$vmware_etc_dir"/not_configured ]; then - echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured' -- echo 'for the running kernel. To (re-)configure it, invoke the' -- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.' -+ echo 'for the running kernel.' -+ echo -+ echo 'Please ensure that the modules have been compiled for this kernel:' -+ echo ' emerge --oneshot vmware-modules' -+ echo -+ echo 'Also ensure '"`vmware_product_name`"' has been configured:' -+ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl.' - echo - - exit 1 diff --git a/app-emulation/vmware-server/files/2.0.1.156745/011_all_legit-modules-only.patch b/app-emulation/vmware-server/files/2.0.1.156745/011_all_legit-modules-only.patch deleted file mode 100644 index cbfa05b..0000000 --- a/app-emulation/vmware-server/files/2.0.1.156745/011_all_legit-modules-only.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl -index bb9d04f..458a14b 100755 ---- a/bin/vmware-config.pl -+++ b/bin/vmware-config.pl -@@ -10315,7 +10315,7 @@ sub main { - - if ($gOption{'tools-switch'} == 0) { - my @modules = non_vmware_modules_installed(); -- if (scalar(@modules) > 0) { -+ if (scalar(@modules) < 0) { - my $osVersion = direct_command(shell_string($gHelper{'uname'}) . ' -r'); - chomp($osVersion); - error("The following VMware kernel modules have been found on your " . diff --git a/app-emulation/vmware-server/vmware-server-2.0.1.156745.ebuild b/app-emulation/vmware-server/vmware-server-2.0.1.156745.ebuild deleted file mode 100644 index 269c447..0000000 --- a/app-emulation/vmware-server/vmware-server-2.0.1.156745.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# 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-1.0.4.56528.ebuild,v 1.3 2007/11/25 13:08:59 ikelos 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 versionator vmware - -MY_PV=$(replace_version_separator 3 '-' ) -# MY_PV="e.x.p-$(get_version_component_range 4)" -MY_PN="VMware-server-${MY_PV}" - -DESCRIPTION="VMware Server for Linux" -HOMEPAGE="http://www.vmware.com/" -SRC_URI=" - x86? ( - mirror://vmware/software/vmserver/${MY_PN}.i386.tar.gz - http://download.softpedia.ro/linux/${MY_PN}.i386.tar.gz ) - amd64? ( - mirror://vmware/software/vmserver/${MY_PN}.x86_64.tar.gz - http://download.softpedia.ro/linux/${MY_PN}.x86_64.tar.gz ) - " - -LICENSE="vmware" -IUSE="" -SLOT="0" -KEYWORDS="-* ~x86 ~amd64" -RESTRICT="strip" - -CDEPEND=">=sys-libs/glibc-2.3.5 - >=dev-lang/perl-5 - sys-apps/pciutils" -DEPEND="${CDEPEND} - sys-apps/findutils - virtual/os-headers" -# vmware-server should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND="${CDEPEND} - dev-libs/libxml2 - dev-libs/glib - x11-libs/libICE - x11-libs/libSM - x11-libs/libXft - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXt - x11-libs/libXtst - x11-misc/xdg-utils - sys-fs/fuse - sys-apps/hal - sys-libs/zlib - virtual/pam - !<sys-apps/dbus-0.62 - !app-emulation/vmware-player - !app-emulation/vmware-workstation - ~app-emulation/vmware-modules-1.0.0.23 - !<app-emulation/vmware-modules-1.0.0.23 - !>=app-emulation/vmware-modules-1.0.0.24 - " - -S=${WORKDIR}/vmware-server-distrib - -ANY_ANY="" -RUN_UPDATE="no" - -pkg_setup() { - if use x86; then - MY_P="${MY_PN}.i386" - elif use amd64; then - MY_P="${MY_PN}.x86_64" - fi - - vmware_pkg_setup -} - -src_install() { - vmware_src_install - - newinitd "${FILESDIR}/vmware-server-2.rc" vmware - insinto /etc/vmware/hostd - doins "${FILESDIR}/authorization.xml" -} - -pkg_config() { - einfo "Running ${ROOT}${dir}/bin/vmware-config.pl" - "${ROOT}${dir}/bin/vmware-config.pl" -} - -pkg_postinst() { - vmware_pkg_postinst - elog "Remember by default xinetd only allows connections from localhost" - elog "To allow external users access to vmware-server you must edit" - elog " /etc/xinetd.d/vmware-authd" - elog "and specify a new 'only_from' line" - echo - ewarn "VMWare Server also has issues when running on a JFS filesystem. For more" - ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94" -} diff --git a/app-emulation/vmware-view-open-client/ChangeLog b/app-emulation/vmware-view-open-client/ChangeLog deleted file mode 100644 index 426c837..0000000 --- a/app-emulation/vmware-view-open-client/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -# ChangeLog for app-emulation/vmware-view-open-client -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 04 Feb 2009; Mike Auty <ikelos@gentoo.org> - vmware-view-open-client-2.1.1.144835.ebuild: - Fix up SRC_URI to use variable names whereever possible. - -*vmware-view-open-client-2.1.1.144835 (04 Feb 2009) - - 04 Feb 2009; Mike Auty <ikelos@gentoo.org> - +files/2.1.1.144835-curl_easy_getinfo.patch, - +vmware-view-open-client-2.1.1.144835.ebuild: - Initial commit, ebuild courtesy of Jeremy Wood from bug 257637. - diff --git a/app-emulation/vmware-view-open-client/Manifest b/app-emulation/vmware-view-open-client/Manifest deleted file mode 100644 index ddc8952..0000000 --- a/app-emulation/vmware-view-open-client/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 2.1.1.144835-curl_easy_getinfo.patch 583 RMD160 b9540dfd09b03d5641f31ea15c59cf08c9394c43 SHA1 bca3aba060879409a0b1736c2ea0c8444848de4b SHA256 2a1746ea8557eb73557c0dc9a448ace76fe5dce634e49fd6341e3d3ecb9312eb -DIST VMware-view-open-client-source-2.1.1-144835.tar.gz 2577181 RMD160 7fcd309ccfc949eba026e898aa970f7e28d3af5a SHA1 12d2848d69270b5417df641fac3241a3786765a7 SHA256 d05d4b796cd02ffee4a5226ee37fc2c636e03eb8c60ef7762bbc641d998967b6 -DIST VMware-view-open-client-source-3.1.0-160969.tar.gz 1573525 RMD160 ca7a1466ea346afac73285380c81d66f80efc9a0 SHA1 cb5f17293e1cd0f3b2955ec768eff1be0ac3f221 SHA256 c9ac59fc447f98d9fb76f8320cdc8e350a46ef64e1345789e030e987b6ebb97a -EBUILD vmware-view-open-client-2.1.1.144835.ebuild 789 RMD160 8b224c24f4f1d3cf3accd54d929adfb9e94ef323 SHA1 44513e16bf95fd7be1da73e4ef6a4dcbefdeda2b SHA256 87710a4cb89c76b4442893e29f00b5f851b544b57695ae2b61c3fb74a6f34f8b -EBUILD vmware-view-open-client-3.1.0.160969.ebuild 880 RMD160 60b3551a3f4ff60b349626c062dfe2ff4901244f SHA1 4d2aae94bd2aefea1898d5106077ca7029f86ad9 SHA256 7d079f52da3489b50e705c5c592923b437c4539a01723bdfb4dcc43cb3229741 -MISC ChangeLog 550 RMD160 72a2bb1a33370793e540228f7a5a507533da9f75 SHA1 7b004168d7776d75894f6a44535c354a599196cb SHA256 8ed0883454a9a0effce38633a62715e375be7a997180a1f17ba1ab6d5e075090 diff --git a/app-emulation/vmware-view-open-client/files/2.1.1.144835-curl_easy_getinfo.patch b/app-emulation/vmware-view-open-client/files/2.1.1.144835-curl_easy_getinfo.patch deleted file mode 100644 index 79777f2..0000000 --- a/app-emulation/vmware-view-open-client/files/2.1.1.144835-curl_easy_getinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vmware-view-open-client-source-2.1.1-144835/lib/bora/basicHttp/http.c 2009-02-04 11:14:42.465445198 -0500 -+++ vmware-view-client-2.1.1.144835/lib/bora/basicHttp/http.c 2009-01-29 23:01:04.000000000 -0500 -@@ -1388,7 +1388,7 @@ - - ASSERT(NULL != request->curl); - if (curl_easy_getinfo(request->curl, CURLINFO_REDIRECT_COUNT, -- &redirectCount, NULL) == CURLE_OK) { -+ &redirectCount) == CURLE_OK) { - if (redirectCount > request->redirectCount) { - /* - * We've been redirected since the last read. Reset diff --git a/app-emulation/vmware-view-open-client/vmware-view-open-client-2.1.1.144835.ebuild b/app-emulation/vmware-view-open-client/vmware-view-open-client-2.1.1.144835.ebuild deleted file mode 100644 index 8bc4098..0000000 --- a/app-emulation/vmware-view-open-client/vmware-view-open-client-2.1.1.144835.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils versionator - -MY_PV=$(replace_version_separator 3 '-' ) -MY_P="${PN/vm/VM}-source-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Open Source VMware View Client" -HOMEPAGE="http://code.google.com/p/vmware-view-open-client/" -SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND=">=x11-libs/gtk+-2.4.0 - >=dev-libs/libxml2-2.6.0 - >=net-misc/curl-7.16.0 - >=dev-libs/openssl-0.9.8 - >=dev-libs/boost-1.34.1" - -RDEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PV}-curl_easy_getinfo.patch" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" -} diff --git a/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.0.160969.ebuild b/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.0.160969.ebuild deleted file mode 100644 index 37994e1..0000000 --- a/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.0.160969.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils versionator - -MY_PV=$(replace_version_separator 3 '-' ) -MY_P="${PN/vm/VM}-source-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Open Source VMware View Client" -HOMEPAGE="http://code.google.com/p/vmware-view-open-client/" -SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86" -IUSE="ao oss pcsc-lite" - -DEPEND=">=x11-libs/gtk+-2.4.0 - >=dev-libs/libxml2-2.6.0 - >=net-misc/curl-7.16.0 - >=dev-libs/openssl-0.9.8 - >=dev-libs/boost-1.34.1 - dev-libs/icu - ao? ( net-misc/rdesktop[ao] ) - oss? ( net-misc/rdesktop[oss] ) - pcsc-lite? ( net-misc/rdesktop[pcsc-lite] )" - -RDEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" -} diff --git a/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-player-extras.py.patch b/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-player-extras.py.patch deleted file mode 100644 index eb9e723..0000000 --- a/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-player-extras.py.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/vmware-player-extras.py b/vmware-player-extras.py -index 21595b1..e8adf08 100644 ---- a/vmware-player-extras.py -+++ b/vmware-player-extras.py -@@ -6,7 +6,8 @@ VMware Player Extras component installer. - - DEST = LIBDIR/'vmware' - SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', } --CONF = DEST/'setup/vmware-config' -+import os -+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh' - - - class PlayerExtras(Installer): diff --git a/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-player.py.patch b/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-player.py.patch deleted file mode 100644 index 49306c3..0000000 --- a/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-player.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/vmware-player.py b/vmware-player.py -index bee22df..d06cca9 100644 ---- a/vmware-player.py -+++ b/vmware-player.py -@@ -6,7 +6,8 @@ VMware Player component installer. - - GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults' - DEST = LIBDIR/'vmware' --CONFIG = DEST/'setup/vmware-config' -+import os -+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh' - CUPSLIBDIR = LIBDIR/'cups' - # XXX: LIBDIR should be properly calculated, to make this cleaner - if (PREFIX/'lib64/cups').exists(): -@@ -84,12 +85,12 @@ class Player(Installer): - ret, kvers = output('uname', '-r') - kvers = kvers.strip() - modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock') -- base = path('/lib/modules/%s/misc' % kvers) -+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers) - - for module in modules: - for ext in ('o', 'ko'): - mod = '%s.%s' % (module, ext) -- (base/mod).remove(ignore_errors=True) -+ # (base/mod).remove(ignore_errors=True) - - def PreUninstall(self, old, new, upgrade): - script = INITSCRIPTDIR/'vmware' -@@ -156,8 +157,8 @@ class Player(Installer): - def PostTransactionInstall(self, old, new, upgrade): - if ENV.get('VMWARE_SKIP_MODULES'): - log.info('Skipping kernel module installation') -- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: -- log.info('Successfully installed kernel modules') -+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: -+ # log.info('Successfully installed kernel modules') - else: - log.info('Unable to install kernel modules') - -@@ -189,8 +190,8 @@ class Player(Installer): - for handler in ('vm', 'vms'): - for gconfType, key, value in settings: - key = key % handler -- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -- '--type', gconfType, '--set', key, value) -+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -+ # '--type', gconfType, '--set', key, value) - - # Instruct all gconfd daemons to reload. - run('killall', '-HUP', 'gconfd-2') -@@ -200,9 +201,9 @@ class Player(Installer): - def _deconfigureVMStreamingHandlers(self): - """ Deconfigures the handlers for vm:// and vms:// used for VM streaming""" - def deconfigureGConf(): -- for handler in ('vm', 'vms'): -- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) -+ # for handler in ('vm', 'vms'): -+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, -+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) - - # Instruct all gconfd daemons to reload. - run('killall', '-HUP', 'gconfd-2') diff --git a/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-vix.py.patch b/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-vix.py.patch deleted file mode 100644 index 5984bdf..0000000 --- a/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-vix.py.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/vmware-vix.py b/vmware-vix.py -index ac64dc5..8fdc2b2 100644 ---- a/vmware-vix.py -+++ b/vmware-vix.py -@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc. All rights reserved. -- VMware Confidential - VIX component installer. - """ - DEST = LIBDIR/'vmware-vix' --conf = DEST/'setup/vmware-config' -+import os -+conf = path(os.environ['WORKDIR'])/'vmware-config.sh' - - class VIX(Installer): - def InitializeInstall(self, old, new, upgrade): diff --git a/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-workstation.py.patch b/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-workstation.py.patch deleted file mode 100644 index da139bb..0000000 --- a/app-emulation/vmware-workstation/files/6.5.2.156735/vmware-workstation.py.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/vmware-workstation.py b/vmware-workstation.py -index 55476d9..8dd4c0a 100644 ---- a/vmware-workstation.py -+++ b/vmware-workstation.py -@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc. All rights reserved. -- VMware Confidential - VMware Workstation component installer. - """ - DEST = LIBDIR/'vmware' --conf = DEST/'setup/vmware-config' -+import os -+conf = path(os.environ['WORKDIR'])/'vmware-config.sh' - - class Workstation(Installer): - def PreTransactionInstall(self, old, new, upgrade): -@@ -40,7 +41,7 @@ class Workstation(Installer): - self.AddPermission(DEST/'bin/*', BINARY) - - eclipse = config.Get('vmware-workstation.eclipse') -- eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0', -+ False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0', - Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0') - - def _vmwareMountRunnable(self, vmwareMount): diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch deleted file mode 100644 index 80a301e..0000000 --- a/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py -index 7a46312..e1dbff1 100644 ---- a/payload/install/vmware-installer/vmis/__init__.py -+++ b/payload/install/vmware-installer/vmis/__init__.py -@@ -12,5 +12,5 @@ VERSION_INFO = (1,0) - VERSION = '.'.join([str(x) for x in VERSION_INFO]) - MAJOR_VERSION = VERSION_INFO[0] - --CONFDIR = path(u'/etc/vmware') -+CONFDIR = path(u'./vmware-confdir') - DATABASE_PATH = CONFDIR/'database' -diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py -index e7abc2e..81c4a2b 100644 ---- a/payload/install/vmware-installer/vmis/core/env.py -+++ b/payload/install/vmware-installer/vmis/core/env.py -@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath): - # Python will interrept as being a module separator - moduleName = component.name.replace('.', '') - fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) -+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], -+ fileObj = file(pathName) - - try: - # XXX: db.config cannot be set at the module level because this -diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py -index 2be10de..f92ecff 100644 ---- a/payload/install/vmware-installer/vmis/core/questions.py -+++ b/payload/install/vmware-installer/vmis/core/questions.py -@@ -139,6 +139,9 @@ class InitDir(Directory): - """ - super(InitDir, self).Validate(answer) - -+ ### GENTOO PATCH ### Finish early -+ return True -+ - rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') - answer = path(answer) - -diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py -index 525df75..abb81b3 100644 ---- a/payload/install/vmware-installer/vmis/ui/console.py -+++ b/payload/install/vmware-installer/vmis/ui/console.py -@@ -148,7 +148,7 @@ class Wizard(object): - wrapper = TextWrapper() - wrapper.width = 79 - wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. -- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) -+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) - except IOError: # RHEL4 appears to close stdin while we still expect it to be open - pass - -diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py -index 4f609c4..b07b89d 100644 ---- a/payload/install/vmware-installer/vmis/util/log.py -+++ b/payload/install/vmware-installer/vmis/util/log.py -@@ -22,6 +22,8 @@ else: - # running a build) - LOG_FILE = '/tmp/vmware-installer.log' - -+LOG_FILE = './vmware-installer.log' -+ - if level <= logging.DEBUG: - MAX_BYTES = 0 - BACKUP_COUNT = 0 diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.5.2.156735.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.2.156735.ebuild deleted file mode 100644 index 9758164..0000000 --- a/app-emulation/vmware-workstation/vmware-workstation-6.5.2.156735.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2009 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.5.0.118166.ebuild,v 1.2 2008/11/09 21:41:32 ikelos Exp $ - -inherit eutils versionator fdo-mime gnome2-utils - -MY_PN="VMware-Workstation-$(replace_version_separator 3 - $PV)" - -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=" - x86? ( - mirror://vmware/software/wkst/${MY_PN}.i386.bundle - http://download.softpedia.ro/linux/${MY_PN}.i386.bundle ) - amd64? ( - mirror://vmware/software/wkst/${MY_PN}.x86_64.bundle - http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle ) - " - -LICENSE="vmware" -SLOT="0" -KEYWORDS="-* ~x86 ~amd64" -IUSE="" -RESTRICT="strip fetch binchecks" -PROPERTIES="interactive" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -DEPEND=">=dev-lang/python-2.5 - dev-python/lxml" -RDEPEND="sys-libs/glibc - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXinerama - x11-libs/libXi - x11-libs/libXft - x11-libs/libgksu - >=x11-libs/libview-0.6.2 - dev-cpp/libsexymm - dev-cpp/cairomm - dev-cpp/libgnomecanvasmm - !app-emulation/vmware-player - !app-emulation/vmware-server - ~app-emulation/vmware-modules-1.0.0.23 - !<app-emulation/vmware-modules-1.0.0.23 - !>=app-emulation/vmware-modules-1.0.0.24 - sys-fs/fuse - sys-apps/pciutils" - -S=${WORKDIR}/vmware-distrib -VM_INSTALL_DIR="/opt/vmware/workstation" - -pkg_setup() { - if use x86; then - MY_P="${MY_PN}.i386" - elif use amd64; then - MY_P="${MY_PN}.x86_64" - fi - - if ! built_with_use -a '>=dev-lang/python-2.5' sqlite ncurses; then - eerror "You need to build dev-lang/python with \"sqlite ncurses\" USE flags!" - die "Please rebuild dev-lang/python with sqlite and ncurses USE flags!" - fi - - if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then - die "Please emerge this package using a different terminal (e.g. not within screen)." - fi -} - -pkg_nofetch() { - if use x86; then - MY_P="${MY_PN}.i386" - elif use amd64; then - MY_P="${MY_PN}.x86_64" - fi - - einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}" -} - -src_unpack() { - # Unbundle the bundle - cp "${FILESDIR}"/helpers/* "${WORKDIR}" - chmod a+x "${WORKDIR}"/*.sh - "${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle - - # Patch up the installer - epatch "${FILESDIR}/${P}-installer.patch" - - mkdir "${WORKDIR}/vmware-confdir" -} - -src_install() { - dodir /etc/init.d - - #Run the installer - local INSTALLER="${WORKDIR}/payload/install/vmware-installer" - local PYOPTS="-W ignore::DeprecationWarning" - export VMWARE_SKIP_NETWORKING="true" - python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \ - --set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \ - --set-setting initdir "${T}" \ - --set-setting initscriptdir "${D}/etc/init.d" \ - --set-setting prefix "${D}${VM_INSTALL_DIR}" \ - --set-setting sysconfdir "${D}/etc" \ - --install-component "${INSTALLER}" \ - --install-bundle "${DISTDIR}/${MY_P}.bundle" \ - --console --required - - rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary" - - if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then - eerror "VMware installation seems to have rolled back." - eerror "Please include the contents of ${WORKDIR}/vmware-installer.log" - eerror "in any bug reports you file." - die "VMware installation rolled back." - fi - - # Redirect all the ${D} paths to / paths" - sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap - - # Fix up icons/mime/desktop handlers - dodir /usr/share/ - mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/ - rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme} - mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/ - dodir /usr/share/mime - mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime - sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop - - # Copy across the temporary /etc/vmware directory - dodir /etc/vmware/init.d - cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware" - mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d" - newinitd "${FILESDIR}/${PN}"-6.5.rc vmware - touch "${D}"/etc/vmware/networking - - # Setup the path environment - insinto /etc/env.d - doins "${FILESDIR}/90${PN}" - - # Fix some paths to allow included gtk to work - for i in "/etc/pango/pangorc" \ - "/etc/pango/pango.modules" \ - "/etc/gtk-2.0/gtk.immodules" \ - "/etc/gtk-2.0/gdk-pixbuf.loaders" ; do - sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ; - sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ; - done - - # No idea why this happens, but it seems to happen all the time - ewarn "The following installation segment takes a *very* long time." - ewarn "Please be patient." -} - -pkg_config() { - ${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - ewarn "Before you can use vmware-player, you must configure a default - network setup." - ewarn "You can do this by running 'emerge --config ${PN}'." -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} |