Drop the cowdiskname patch, because using 'systemsim -g' *just works*. Executing run_gui directly is bad.

Package-Manager: portage-2.1.4.4

4 files changed, 13 insertions, 35 deletions

diff --git a/app-emulation/systemsim-cell/ChangeLog b/app-emulation/systemsim-cell/ChangeLog
index 26dd0f81d511..881ea9156e1d 100644
--- a/app-emulation/systemsim-cell/ChangeLog
+++ b/app-emulation/systemsim-cell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/systemsim-cell
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/systemsim-cell/ChangeLog,v 1.2 2008/02/12 18:21:53 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/systemsim-cell/ChangeLog,v 1.3 2008/02/21 20:30:03 corsair Exp $
+
+*systemsim-cell-3.0-r1 (21 Feb 2008)
+
+  21 Feb 2008; Markus Rothe <corsair@gentoo.org>
+  -files/systemsim-cell-3.0-cowdiskname.patch, -systemsim-cell-3.0.ebuild,
+  +systemsim-cell-3.0-r1.ebuild:
+  Drop the cowdiskname patch, because using 'systemsim -g' *just works*.
+  Executing run_gui directly is bad.
 
   12 Feb 2008; Markus Rothe <corsair@gentoo.org> +metadata.xml:
   Add metadata.xml
diff --git a/app-emulation/systemsim-cell/Manifest b/app-emulation/systemsim-cell/Manifest
index 3ccf2fc821e6..7f732baa50e9 100644
--- a/app-emulation/systemsim-cell/Manifest
+++ b/app-emulation/systemsim-cell/Manifest
@@ -1,8 +1,7 @@
 AUX 09systemsim-cell 74 RMD160 96efa74a5e6d46444cf08b9bec020a900d0aabeb SHA1 459e8cb0622bceedf4165c590168b11e32a750bd SHA256 fabecaab8428bcc76bcfb0f4e856a207cb9f65d9f88012f254da752aae1e1cce
-AUX systemsim-cell-3.0-cowdiskname.patch 805 RMD160 3a976634cf60a5a8a30ae32a9d3046b7b8217761 SHA1 309ee8c2e014368039a9d46a70c94da2dd695ed0 SHA256 be7bee3aa857f703662039e955de1fc7b927c9316b7cd02ec1fbf595ab4cd70d
 DIST systemsim-cell-3.0-15.i386.rpm 6079607 RMD160 c23190f52d23c877f41861e092113cecfe22079b SHA1 b6ca1863a9938240efc7200ebf6658afbd4ef0cf SHA256 da9fc5dfc9303acbf27e1e585b1c14d1a759e6280d0faf0f1199adeada5e41d7
 DIST systemsim-cell-3.0-15.ppc64.rpm 5988540 RMD160 e6c769d3e270363ae6c09d36f6e8b2eec1a9b71e SHA1 bdc4f41c74858f0cfa68b95ac6ef401f59e485c0 SHA256 a8aa1519c7118c5bf76b3df99736caee2af7f48579b622083d8d503ca2b87655
 DIST systemsim-cell-3.0-15.x86_64.rpm 6204863 RMD160 d77c6b667148282b727f31e3c93885f8fe193d6d SHA1 294287afad50d7d384baf0e14ecbebef2d9f4502 SHA256 3613954401f21a5d0ddd30fb6709cb4a123e38a7dc5914cf240505d6117020c3
-EBUILD systemsim-cell-3.0.ebuild 1979 RMD160 82134caa6f97fecfc49a4b9553b4a9b70e29ac26 SHA1 0c0ac78d5858283513f9ca83424a46ad389cc640 SHA256 19060622df126356ac862a0fedd0df7af693d1e45a3aa1b66f3e984f73669bae
-MISC ChangeLog 551 RMD160 d4402327a1073816abc33c418ca7f2890e065a17 SHA1 adcf20d0639acd7c42398bc3a3814d2d2e835e07 SHA256 065e9c9139ab524ca5c5e296179b5e7d1e8448fa99120e1c287ddb715d5e88dd
+EBUILD systemsim-cell-3.0-r1.ebuild 1738 RMD160 baf3b5f52663903462b602007e38007dc8ffcddd SHA1 38a29b1010a687db98f301ea1ed1c97287b1c4a9 SHA256 18d6ce74cd821aabb33c2c60b2f701d6965f03f9c3f24c685f2f978dbbeeb591
+MISC ChangeLog 857 RMD160 1a468c3d9be9c673f9477f43242a874571bbbbd4 SHA1 c2704d71e720fc82042ecea1254a1f3c67085fd6 SHA256 d660e322a76cef5ff51adda1fd111be4859502acb1717101e0b455acbcdfcfb0
 MISC metadata.xml 217 RMD160 cf8d11472e8d14297f2074ea3787a54c910e95b0 SHA1 ed6b0544f5e3b29d43eab818778ed4e3fc536a6b SHA256 b2c4c32e655bccb5f9f8960ec956190da115f45f67f9aea241fad78e6fe752a5
diff --git a/app-emulation/systemsim-cell/files/systemsim-cell-3.0-cowdiskname.patch b/app-emulation/systemsim-cell/files/systemsim-cell-3.0-cowdiskname.patch
deleted file mode 100644
index 7d6dcdb1b95a..000000000000
--- a/app-emulation/systemsim-cell/files/systemsim-cell-3.0-cowdiskname.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- opt/ibm/systemsim-cell/lib/cell/systemsim.tcl.orig	2008-02-12 17:45:10.000000000 +0100
-+++ opt/ibm/systemsim-cell/lib/cell/systemsim.tcl	2008-02-12 17:52:09.000000000 +0100
-@@ -17,6 +17,12 @@
- 
- set IMAGES $env(IMAGES_DIR)/cell
- 
-+if { [info exists ::env(COWDISKNAME) ] } {
-+    set cowdiskname $env(COWDISKNAME)
-+} else {
-+    set cowdiskname $env(HOME)/sysroot_disk.cow
-+}
-+
- # Initialize the systemsim tcl environment
- source $env(LIB_DIR)/cell/mambo_init.tcl
- 
-@@ -78,7 +84,7 @@
- mysim mcm 0 load vmlinux $imagefile 0x1000000
- 
- # Setup the bogus disk that Linux will use
--if {[catch {mysim bogus disk init 0 $sysrootfile newcow sysroot_disk.cow 1024}]} {
-+if {[catch {mysim bogus disk init 0 $sysrootfile newcow $cowdiskname 1024}]} {
-   puts "bogus disk init for $sysrootfile failed"
-   exit
- }
diff --git a/app-emulation/systemsim-cell/systemsim-cell-3.0.ebuild b/app-emulation/systemsim-cell/systemsim-cell-3.0-r1.ebuild
index 49174234394c..99d9dd0bf6d2 100644
--- a/app-emulation/systemsim-cell/systemsim-cell-3.0.ebuild
+++ b/app-emulation/systemsim-cell/systemsim-cell-3.0-r1.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/systemsim-cell/systemsim-cell-3.0.ebuild,v 1.1 2008/02/12 18:19:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/systemsim-cell/systemsim-cell-3.0-r1.ebuild,v 1.1 2008/02/21 20:30:03 corsair Exp $
 
 inherit rpm eutils
 
@@ -31,14 +31,11 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	rpm_unpack $DISTDIR/${A}
+	rpm_unpack "$DISTDIR"/${A}
 
 	# fix the path to the images. we don't want them in /opt
 	sed -i -e "s:\${SYSTEMSIM_TOP}/images:${IMAGE_PATH}:" \
 		"${WORKDIR}"/"${SYSTEMSIM_DIR}"/bin/systemsim || die "sed error"
-
-	# fix the path to the file that 'overlaps' the image
-	epatch "${FILESDIR}/${P}-cowdiskname.patch"
 }
 
 src_compile() {
@@ -60,6 +57,4 @@ src_install() {
 pkg_postinst() {
 	elog "The provided systemsim doesn't have kernel and system images, please"
 	elog "install them in ${IMAGE_PATH}/cell"
-	elog "Use the COWDISKNAME environment variable to change the file"
-	elog "'overlapping' the image. Default (not set) is \$HOME/sysroot_disk.cow"
 }