summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--app-emulation/vmware-player/Manifest2
-rw-r--r--app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild15
-rw-r--r--app-emulation/vmware-workstation/Manifest2
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild11
5 files changed, 27 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1916c36..e29f9d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $ Id: $
+ 10 Nov 2008; Mike Auty <ikelos@gentoo.org>
+ app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild,
+ app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild:
+ Fix up proper deaths on rollbacks.
+
09 Nov 2008; Mike Auty <ikelos@gentoo.org>
app-emulation/vmware-server/vmware-server-1.0.8.126538.ebuild,
app-emulation/vmware-server-console/vmware-server-console-1.0.8.126538.ebu
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index a00b540..d05413a 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -19,5 +19,5 @@ DIST VMware-Player-2.5.0-118166.x86_64.bundle 63035915 RMD160 a29b3c45e5bca07ef8
DIST VMware-player-1.0.9-126128.tar.gz 38963760 RMD160 ed54df1e097894f11b7bbce8215d1f314df03217 SHA1 701ca338ec52dcb60db26908de8e0b5bfd981fb7 SHA256 3fae981892437ec1804a2171b701ca33000405fbd799fb06112fd70c939d8d75
DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
EBUILD vmware-player-1.0.9.126128.ebuild 2651 RMD160 36054a17ee5ec4bc8b35e84cb7f6207703aebdb1 SHA1 cd4cdc99d5c8499ae9ad1873184c835fac7b3a16 SHA256 c2d09869ac8cbef5ca019f864754e90162196707fbc9684c268ef5fbd6b37442
-EBUILD vmware-player-2.5.0.118166.ebuild 5138 RMD160 0b1bc6d01d4e9081cc2adbde04fd04ef2a7bfdca SHA1 d36303208d0586b60cc5cc7369de6f34d6041518 SHA256 3c5d6ad3707704dfea6dbf40c5e804e5a2dce707db2958361efb7c959a45a07e
+EBUILD vmware-player-2.5.0.118166.ebuild 5412 RMD160 379347f7fe92b603411732f4d44b7009d8e7a71b SHA1 b666b04e9347e2f76c4788a1435abd95e536304b SHA256 f3ffc2d5ecad69ae751af1dc5d8201ddc53cd3cdba16fd9c9545fc9c41337c05
MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild b/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild
index 4b8e3b8..4e8d1d5 100644
--- a/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild
+++ b/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
+# $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
@@ -64,7 +64,7 @@ pkg_setup() {
die "Please rebuild dev-lang/python with sqlite USE flag!"
fi
- if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "" ]; then
+ if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
die "Please emerge this package using a different terminal"
fi
}
@@ -86,9 +86,9 @@ src_unpack() {
"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
# Patch up the installer
- epatch ${FILESDIR}/${P}-installer.patch
+ epatch "${FILESDIR}/${P}-installer.patch"
- mkdir ${WORKDIR}/vmware-confdir
+ mkdir "${WORKDIR}/vmware-confdir"
}
src_install() {
@@ -110,6 +110,13 @@ src_install() {
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
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 6e95b23..7f24d68 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -23,4 +23,4 @@ DIST VMware-Workstation-6.5.0-118166.x86_64.bundle 366776834 RMD160 02d4e984a827
DIST VMware-workstation-5.5.9-126128.tar.gz 111649803 RMD160 a5a867761d36c9a02821f8dd639a95b8c9ab38bc SHA1 eb8786111a74213ea4ec24636a4ba70b7f5dc741 SHA256 71a062e29480a48647c7323883e4e4b43a9365c1bb70000a23b768647db46444
DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
EBUILD vmware-workstation-5.5.9.126128.ebuild 3247 RMD160 a619054c3c4318362f30e6ca10047b54c0dd6f6a SHA1 053e1cfd70208934063fbaab49581f7907381b5f SHA256 6470238fc76ab279dfb01ee2b13a4d32ff29d4f96aa9c5d094a09a786de4a214
-EBUILD vmware-workstation-6.5.0.118166.ebuild 5150 RMD160 7ff76a090fae9cc7ec4271d0135b11eed22f778f SHA1 459d0b9e6a6a4bc5d48ed164acae6d6d22e7bc7e SHA256 9ccfc72a5ba17a9da0271231cd533c383a54b3d720e12793ed1e6fb6d62366d8
+EBUILD vmware-workstation-6.5.0.118166.ebuild 5430 RMD160 2d80b354401d73fec36e0fa0b50d929eeb5c17fa SHA1 aec806df5d69b789f09bd4514819fb0b1ed40833 SHA256 c7e0ffa6b63b4512ee0ac8687db9a56304f134f1315c6650ffc5d9ffaab93a9d
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild
index af0c029..1a58db2 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
+# $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
@@ -64,7 +64,7 @@ pkg_setup() {
die "Please rebuild dev-lang/python with sqlite USE flag!"
fi
- if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "" ]; then
+ if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
die "Please emerge this package using a different terminal"
fi
}
@@ -110,6 +110,13 @@ src_install() {
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