Renaming squeak-vm to squeak-fullimage which provides a squeak-image

squeak now RDEPENDs on squeak-image which can be provided by squeak-fullimage
or squeak-basicimage

25 files changed, 236 insertions, 36 deletions

diff --git a/dev-lang/squeak-basicimage/Manifest b/dev-lang/squeak-basicimage/Manifest
new file mode 100644
index 000000000000..fb37b2d992c4
--- /dev/null
+++ b/dev-lang/squeak-basicimage/Manifest
@@ -0,0 +1,2 @@
+MD5 b9bd055fb555bf5fa282330b4cf21938 squeak-basicimage-3.6_p5429.ebuild 1020
+MD5 75da034c67d502c24067388c1be2a526 files/digest-squeak-basicimage-3.6_p5429 135
diff --git a/dev-lang/squeak-basicimage/files/digest-squeak-basicimage-3.6_p5429 b/dev-lang/squeak-basicimage/files/digest-squeak-basicimage-3.6_p5429
new file mode 100644
index 000000000000..e88e72491cad
--- /dev/null
+++ b/dev-lang/squeak-basicimage/files/digest-squeak-basicimage-3.6_p5429
@@ -0,0 +1,2 @@
+MD5 0269db8b85b1042825f689da8bb0f583 Squeak3.6-5429-basic.zip 5667283
+MD5 7dc6b3840e6bc1e5f81e3717fb46d2c3 SqueakV3.sources.gz 3476504
diff --git a/dev-lang/squeak-basicimage/metadata.xml b/dev-lang/squeak-basicimage/metadata.xml
new file mode 100644
index 000000000000..c5d67a611520
--- /dev/null
+++ b/dev-lang/squeak-basicimage/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>jhhudso@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-lang/squeak-basicimage/squeak-basicimage-3.6_p5429.ebuild b/dev-lang/squeak-basicimage/squeak-basicimage-3.6_p5429.ebuild
new file mode 100644
index 000000000000..ae0c914fd9e8
--- /dev/null
+++ b/dev-lang/squeak-basicimage/squeak-basicimage-3.6_p5429.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-basicimage/squeak-basicimage-3.6_p5429.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+
+MY_P="Squeak${PV/_p/-}"
+DESCRIPTION="Squeak basic image file"
+HOMEPAGE="http://www.squeak.org/"
+SRC_URI="ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PV/_*}/${MY_P}-basic.zip
+	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PV/_*}/SqueakV3.sources.gz"
+
+LICENSE="Apple"
+SLOT="${PV/_*}"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+PROVIDE="virtual/squeak-image"
+
+DEPEND=">=sys-apps/sed-4"
+
+S=${WORKDIR}
+
+src_compile() {
+	einfo "Compressing Image/Changes files..."
+	gzip ${MY_P}-basic.image || die
+	gzip ${MY_P}-basic.changes || die
+	einfo "done!"
+}
+
+src_install() {
+	dodoc ReadMe.txt
+	insinto /usr/lib/squeak
+	doins ${MY_P}-basic.changes.gz
+	doins ${MY_P}-basic.image.gz
+	doins SqueakV3.sources
+	dosym /usr/lib/squeak/${MY_P}-basic.changes.gz \
+		/usr/lib/squeak/squeak.changes.gz
+	dosym /usr/lib/squeak/${MY_P}-basic.image.gz \
+		/usr/lib/squeak/squeak.image.gz
+
+	einfo "Squeak ${PV/_p/-} image/changes now installed"
+}
diff --git a/dev-lang/squeak-vm/ChangeLog b/dev-lang/squeak-fullimage/ChangeLog
index 46213d4021e7..a3759720fff8 100644
--- a/dev-lang/squeak-vm/ChangeLog
+++ b/dev-lang/squeak-fullimage/ChangeLog
@@ -1,29 +1,34 @@
-# ChangeLog for dev-lang/squeak-vm
+# ChangeLog for dev-lang/squeak-fullimage
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-vm/ChangeLog,v 1.6 2004/02/15 07:55:42 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/ChangeLog,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
 
-  15 Feb 2004; David Holm <dholm@gentoo.org> squeak-vm-3.6.5424.ebuild:
+*squeak-fullimage-3.6_p5429 (15 Apr 2004)
+
+  15 Apr 2004; Jared Hudson <jhhudso@gentoo.org> : Version bump. I also have
+  renamed squeak-vm to squeak-fullimage.
+	
+  15 Feb 2004; David Holm <dholm@gentoo.org> squeak-fullimage-3.6.5424.ebuild:
   Added to ~ppc.
 
-*squeak-vm-3.6.5424 (11 Oct 2003)
+*squeak-fullimage-3.6.5424 (11 Oct 2003)
 
   11 Oct 2003; Michael Imhof <tantive@gentoo.org>:
   Version bump.  Ebuild submitted by Christopher Verges
   <squirrel@headnut.org>. Closes #30530
 
-*squeak-vm-3.5.5180 (21 May 2003)
+*squeak-fullimage-3.5.5180 (21 May 2003)
 
   21 May 2003; Michael Imhof <tantive@gentoo.org>:
   Version bump.  Ebuild submitted by Christopher Verges
   <squirrel@headnut.org>.
 
-*squeak-vm-3.4.5170 (21 May 2003)
+*squeak-fullimage-3.4.5170 (21 May 2003)
 
   21 May 2003; Michael Imhof <tantive@gentoo.org>:
   Version bump.  Ebuild submitted by Christopher Verges
   <squirrel@headnut.org>.
 
-*squeak-vm-3.2.4956 (29 Dec 2002)
+*squeak-fullimage-3.2.4956 (29 Dec 2002)
 
   29 Dec 2002; Jared Hudson <jhhudso@gentoo.org> : Initial import. Ebuild
   submitted by Ragnar Hojland Espinosa <ragnar@linalco.com>.
diff --git a/dev-lang/squeak-fullimage/Manifest b/dev-lang/squeak-fullimage/Manifest
new file mode 100644
index 000000000000..9cac78ab5f2f
--- /dev/null
+++ b/dev-lang/squeak-fullimage/Manifest
@@ -0,0 +1,11 @@
+MD5 f0d812c911990566a0e88cd3b9c34e49 squeak-fullimage-3.5.5180.ebuild 1071
+MD5 6ae3b5dcdb3a4fbe48bd86f50c8dd742 ChangeLog 1047
+MD5 b790430ec914dc37e069884849247705 squeak-fullimage-3.4.5170.ebuild 869
+MD5 106d93d4a34cbfae518129d9e21b4705 squeak-fullimage-3.6.5424.ebuild 1111
+MD5 1fcb577229fde4b99585089a9f1f79eb squeak-fullimage-3.6_p5429.ebuild 990
+MD5 c5b091a8eeeb2389d428d4ec17353792 squeak-fullimage-3.2.4956.ebuild 859
+MD5 c47ea324aaf69084cd07c9a19d3e133f files/digest-squeak-fullimage-3.4.5170 129
+MD5 2046414939363ef56525dd2aa0163e3a files/digest-squeak-fullimage-3.6_p5429 134
+MD5 d01d765b41f8c065ec9a19a7c7278e76 files/digest-squeak-fullimage-3.2.4956 129
+MD5 9fe48b0176607ba4e789a8ef1f78075e files/digest-squeak-fullimage-3.5.5180 129
+MD5 277c5b13b803bc7b53c2303166389f6a files/digest-squeak-fullimage-3.6.5424 134
diff --git a/dev-lang/squeak-vm/files/digest-squeak-vm-3.2.4956 b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.2.4956
index 7df25607c373..7df25607c373 100644
--- a/dev-lang/squeak-vm/files/digest-squeak-vm-3.2.4956
+++ b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.2.4956
diff --git a/dev-lang/squeak-vm/files/digest-squeak-vm-3.4.5170 b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.4.5170
index 0883de96087b..0883de96087b 100644
--- a/dev-lang/squeak-vm/files/digest-squeak-vm-3.4.5170
+++ b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.4.5170
diff --git a/dev-lang/squeak-vm/files/digest-squeak-vm-3.5.5180 b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.5.5180
index c74db2e3a091..c74db2e3a091 100644
--- a/dev-lang/squeak-vm/files/digest-squeak-vm-3.5.5180
+++ b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.5.5180
diff --git a/dev-lang/squeak-vm/files/digest-squeak-vm-3.6.5424 b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.6.5424
index 441c9ba23d8b..441c9ba23d8b 100644
--- a/dev-lang/squeak-vm/files/digest-squeak-vm-3.6.5424
+++ b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.6.5424
diff --git a/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.6_p5429 b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.6_p5429
new file mode 100644
index 000000000000..f6fb86c182d2
--- /dev/null
+++ b/dev-lang/squeak-fullimage/files/digest-squeak-fullimage-3.6_p5429
@@ -0,0 +1,2 @@
+MD5 9a35fa39f2338d26a721564472d4d933 Squeak3.6-5429-full.zip 7837139
+MD5 7dc6b3840e6bc1e5f81e3717fb46d2c3 SqueakV3.sources.gz 3476504
diff --git a/dev-lang/squeak-fullimage/metadata.xml b/dev-lang/squeak-fullimage/metadata.xml
new file mode 100644
index 000000000000..c5d67a611520
--- /dev/null
+++ b/dev-lang/squeak-fullimage/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>jhhudso@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-lang/squeak-vm/squeak-vm-3.2.4956.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild
index 2a520e94d635..378bfde9e9de 100644
--- a/dev-lang/squeak-vm/squeak-vm-3.2.4956.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-vm/squeak-vm-3.2.4956.ebuild,v 1.4 2004/03/14 02:40:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
 
 DESCRIPTION="Highly-portable Smalltalk-80 implementation VM image"
 HOMEPAGE="http://www.squeak.org/"
@@ -12,6 +12,7 @@ LICENSE="Apple"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
+PROVIDE="virtual/squeak-image"
 
 DEPEND=""
 RDEPEND="=dev-lang/squeak-3.2*"
diff --git a/dev-lang/squeak-vm/squeak-vm-3.4.5170.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild
index b606184647ba..b9add2e7a01c 100644
--- a/dev-lang/squeak-vm/squeak-vm-3.4.5170.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-vm/squeak-vm-3.4.5170.ebuild,v 1.3 2004/03/14 02:40:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
 
 DESCRIPTION="Highly-portable Smalltalk-80 implementation VM image"
 HOMEPAGE="http://www.squeak.org/"
@@ -13,6 +13,7 @@ LICENSE="Apple"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
+PROVIDE="virtual/squeak-image"
 
 S=
 DEPEND=
diff --git a/dev-lang/squeak-vm/squeak-vm-3.5.5180.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild
index 1bd91a61f9f7..39dbc2f82f4a 100644
--- a/dev-lang/squeak-vm/squeak-vm-3.5.5180.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-vm/squeak-vm-3.5.5180.ebuild,v 1.4 2004/03/14 02:40:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
 
 MAJOR=3
 MINOR=5
@@ -25,6 +25,8 @@ KEYWORDS="~x86"
 
 IUSE="mozilla"
 
+PROVIDE="virtual/squeak-image"
+
 DEPEND=""
 
 RDEPEND=""
diff --git a/dev-lang/squeak-vm/squeak-vm-3.6.5424.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild
index 02dd6fb1693d..bc56dbf89cfd 100644
--- a/dev-lang/squeak-vm/squeak-vm-3.6.5424.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-vm/squeak-vm-3.6.5424.ebuild,v 1.2 2004/02/15 07:55:42 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
 
 MAJOR=3
 MINOR=6
@@ -25,6 +25,8 @@ KEYWORDS="~x86 ~ppc"
 
 IUSE="mozilla"
 
+PROVIDE="virtual/squeak-image"
+
 DEPEND=""
 
 RDEPEND=""
diff --git a/dev-lang/squeak-fullimage/squeak-fullimage-3.6_p5429.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.6_p5429.ebuild
new file mode 100644
index 000000000000..32168d1aa126
--- /dev/null
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.6_p5429.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.6_p5429.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+
+MY_P="Squeak${PV/_p/-}"
+DESCRIPTION="Squeak full image file"
+HOMEPAGE="http://www.squeak.org/"
+SRC_URI="ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PV/_*}/${MY_P}-full.zip
+	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PV/_*}/SqueakV3.sources.gz"
+
+LICENSE="Apple"
+SLOT="${PV/_*}"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+PROVIDE="virtual/squeak-image"
+
+DEPEND=">=sys-apps/sed-4"
+
+S=${WORKDIR}
+
+src_compile() {
+	einfo "Compressing Image/Changes files..."
+	gzip ${MY_P}-full.image || die
+	gzip ${MY_P}-full.changes || die
+	einfo "done!"
+}
+
+src_install() {
+	dodoc ReadMe.txt
+	insinto /usr/lib/squeak
+	doins ${MY_P}-full.changes.gz
+	doins ${MY_P}-full.image.gz
+	doins SqueakV3.sources
+	dosym /usr/lib/squeak/${MY_P}-full.changes.gz \
+		/usr/lib/squeak/squeak.changes.gz
+	dosym /usr/lib/squeak/${MY_P}-full.image.gz \
+		/usr/lib/squeak/squeak.image.gz
+
+	einfo "Squeak ${PV/_p/-} image/changes now installed"
+}
diff --git a/dev-lang/squeak-vm/Manifest b/dev-lang/squeak-vm/Manifest
deleted file mode 100644
index 0883c81e291b..000000000000
--- a/dev-lang/squeak-vm/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 d51a02e23d9232e2a01f952efcd8ddfc ChangeLog 998
-MD5 221b78985e670b1bff1ec97538cf479a squeak-vm-3.2.4956.ebuild 969
-MD5 40284d95ac2538fa19d8ac2e692eda53 squeak-vm-3.4.5170.ebuild 979
-MD5 6b493e874a1ae9b3d4284a4798ad7c0f squeak-vm-3.5.5180.ebuild 1181
-MD5 bf7a4856eb91e211481ec58140a24293 squeak-vm-3.6.5424.ebuild 1217
-MD5 d01d765b41f8c065ec9a19a7c7278e76 files/digest-squeak-vm-3.2.4956 129
-MD5 c47ea324aaf69084cd07c9a19d3e133f files/digest-squeak-vm-3.4.5170 129
-MD5 9fe48b0176607ba4e789a8ef1f78075e files/digest-squeak-vm-3.5.5180 129
-MD5 277c5b13b803bc7b53c2303166389f6a files/digest-squeak-vm-3.6.5424 134
diff --git a/dev-lang/squeak/Manifest b/dev-lang/squeak/Manifest
index 4cd6080706b3..f93796fabef1 100644
--- a/dev-lang/squeak/Manifest
+++ b/dev-lang/squeak/Manifest
@@ -1,11 +1,13 @@
-MD5 dd00234d20eaef7c33e9750054c20696 ChangeLog 1729
-MD5 edcbafc5bfef609a401f6ac5fc80a32e squeak-3.2.5.ebuild 2898
-MD5 6edea8af88a35a83fd15e2ba98e56778 squeak-3.4.1.ebuild 2983
-MD5 34af5579ebc2e57f6bc748374ce84e70 squeak-3.4.1-r1.ebuild 3326
+MD5 61a7ba2ee1542bc8a2b4f6e166976111 squeak-3.4.1-r2.ebuild 3596
 MD5 2c3158204cfb4b9c36b8bc78e8421b16 metadata.xml 223
-MD5 6d1bd4cf2fb3677d4e862430d728fd45 squeak-3.4.1-r2.ebuild 3594
-MD5 95975b038cad92087afe83055e6b2137 files/digest-squeak-3.2.5 69
-MD5 e15651f69bf3b5c02f40bcffceefb53c files/digest-squeak-3.4.1 69
-MD5 e15651f69bf3b5c02f40bcffceefb53c files/digest-squeak-3.4.1-r1 69
+MD5 dd00234d20eaef7c33e9750054c20696 ChangeLog 1729
+MD5 1bd8928495ee8da8432422d8b5b04ef0 squeak-3.4.1-r1.ebuild 3328
+MD5 662e0e919fb1adf531d565553da0fce6 squeak-3.2.5.ebuild 2900
+MD5 47055516c71890591557a74f7f28c8aa squeak-3.6_p3.ebuild 2197
+MD5 ee5c39dc86a20926d2db29af01218963 squeak-3.4.1.ebuild 2985
+MD5 66b6405c56a2abd2413db79bfc04f71a files/digest-squeak-3.6_p3 137
 MD5 4b2bf4f92065c5e86350d0cbaefe5fb8 files/squeak-3.4.1-gcc33-string-fix.patch 16184
+MD5 e15651f69bf3b5c02f40bcffceefb53c files/digest-squeak-3.4.1 69
 MD5 e15651f69bf3b5c02f40bcffceefb53c files/digest-squeak-3.4.1-r2 69
+MD5 95975b038cad92087afe83055e6b2137 files/digest-squeak-3.2.5 69
+MD5 e15651f69bf3b5c02f40bcffceefb53c files/digest-squeak-3.4.1-r1 69
diff --git a/dev-lang/squeak/files/digest-squeak-3.6_p3 b/dev-lang/squeak/files/digest-squeak-3.6_p3
new file mode 100644
index 000000000000..6665a2b937da
--- /dev/null
+++ b/dev-lang/squeak/files/digest-squeak-3.6_p3
@@ -0,0 +1,2 @@
+MD5 cb8ab95fa9d840f5b04868f99600e018 Squeak-3.6-3.src.tar.gz 2552981
+MD5 46b1a1f9c3b9b8eb6c3107a2b9a24483 SqueakPlugin.image.zip 3332888
diff --git a/dev-lang/squeak/squeak-3.2.5.ebuild b/dev-lang/squeak/squeak-3.2.5.ebuild
index a741ee1a8cc1..f36e1345d0ca 100644
--- a/dev-lang/squeak/squeak-3.2.5.ebuild
+++ b/dev-lang/squeak/squeak-3.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.2.5.ebuild,v 1.6 2004/03/30 20:51:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.2.5.ebuild,v 1.7 2004/04/28 16:19:19 jhhudso Exp $
 
 DESCRIPTION="Highly-portable Smalltalk-80 implementation"
 HOMEPAGE="http://www.squeak.org/"
@@ -13,7 +13,7 @@ IUSE="X oss mmx mozilla"
 
 DEPEND="virtual/glibc
 	X? ( virtual/x11 )"
-RDEPEND="=dev-lang/squeak-vm-3.2*
+RDEPEND="=virtual/squeak-image-3.2*
 	virtual/glibc
 	 X? ( virtual/x11 )"
 
diff --git a/dev-lang/squeak/squeak-3.4.1-r1.ebuild b/dev-lang/squeak/squeak-3.4.1-r1.ebuild
index 739aac5897f8..c8a81e25ad78 100644
--- a/dev-lang/squeak/squeak-3.4.1-r1.ebuild
+++ b/dev-lang/squeak/squeak-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r1.ebuild,v 1.5 2004/04/01 23:04:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r1.ebuild,v 1.6 2004/04/28 16:19:19 jhhudso Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -20,7 +20,7 @@ IUSE="X oss mmx mozilla"
 
 DEPEND="virtual/glibc
 	X? ( virtual/x11 )"
-RDEPEND="dev-lang/squeak-vm
+RDEPEND="virtual/squeak-image
 		virtual/glibc
 		X? ( virtual/x11 )"
 
diff --git a/dev-lang/squeak/squeak-3.4.1-r2.ebuild b/dev-lang/squeak/squeak-3.4.1-r2.ebuild
index 8dc8494c26e3..4b7489b76996 100644
--- a/dev-lang/squeak/squeak-3.4.1-r2.ebuild
+++ b/dev-lang/squeak/squeak-3.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r2.ebuild,v 1.5 2004/04/01 23:04:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r2.ebuild,v 1.6 2004/04/28 16:19:19 jhhudso Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -20,7 +20,7 @@ IUSE="X oss mmx mozilla"
 
 DEPEND="virtual/glibc
 	X? ( virtual/x11 )"
-RDEPEND="dev-lang/squeak-vm
+RDEPEND="virtual/squeak-image
 		virtual/glibc
 		X? ( virtual/x11 )"
 
diff --git a/dev-lang/squeak/squeak-3.4.1.ebuild b/dev-lang/squeak/squeak-3.4.1.ebuild
index 92a66f5e11c4..da2ad6b325a2 100644
--- a/dev-lang/squeak/squeak-3.4.1.ebuild
+++ b/dev-lang/squeak/squeak-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1.ebuild,v 1.4 2004/03/30 20:51:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1.ebuild,v 1.5 2004/04/28 16:19:19 jhhudso Exp $
 
 #Simply change these numbers for different versions
 MV=3.4
@@ -18,7 +18,7 @@ IUSE="X oss mmx mozilla"
 
 DEPEND="virtual/glibc
 	X? ( virtual/x11 )"
-RDEPEND="dev-lang/squeak-vm
+RDEPEND="virtual/squeak-image
 		virtual/glibc
 		X? ( virtual/x11 )"
 
diff --git a/dev-lang/squeak/squeak-3.6_p3.ebuild b/dev-lang/squeak/squeak-3.6_p3.ebuild
new file mode 100644
index 000000000000..096ca1d36ba2
--- /dev/null
+++ b/dev-lang/squeak/squeak-3.6_p3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.6_p3.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+
+inherit nsplugins libtool flag-o-matic eutils
+
+MY_PV=${PV/_p/-}
+DESCRIPTION="Highly-portable Smalltalk-80 implementation"
+HOMEPAGE="http://www.squeak.org/"
+SRC_URI="http://www-sor.inria.fr/~piumarta/squeak/unix/release/Squeak-${MY_PV}.src.tar.gz
+	mozilla? ( http://squeakland.org/installers/SqueakPlugin.image.zip )"
+LICENSE="Apple"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X nas mmx mozilla"
+# a ffi flag would be nice
+
+DEPEND="virtual/glibc
+	nas? ( media-libs/nas )
+	X? ( virtual/x11 )"
+RDEPEND="${DEPEND}
+	virtual/squeak-image"
+
+S="${WORKDIR}/Squeak-${MY_PV}"
+
+src_compile() {
+	local myconf=""
+
+	strip-flags
+	filter-mfpmath sse
+	filter-flags "-fPIC" "-maltivec" "-mabi=altivec" "-fstack-protector" "-pipe" "-g" "-mtune" "-march" "-mcpu" "-O" "-O1" "-O2" "-Os" "-O3" "-freorder-blocks" "-fprefetch-loop-array" "-fforce-addr"
+
+	use X || myconf="--without-x"
+	use mmx && myconf="${myconf} --enable-mpg-mmx"
+	use mozilla || myconf="${myconf} --without-npsqueak"
+	# use oss && myconf="${myconf} --with-audio=oss"
+	# use nas && myconf="${myconf} --with-audio=nas"
+
+	# fix tail problems
+	cd ${S}/platforms/unix/config
+	sed -i -e 's/tail -1/tail -n 1/g' mkconfig.in
+	sed -i -e 's/tail -1/tail -n 1/g' verstamp
+	chmod +x verstamp
+
+	cd ${S}
+
+	mkdir build
+	cd build
+	#CPPFLAGS: for nas
+	CPPFLAGS="-I/usr/X11R6/include" ../platforms/unix/config/configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		${myconf} || die "configure failed"
+	emake || die
+}
+
+src_install() {
+	cd ${S}/build
+	make ROOT=${D} docdir=/usr/share/doc/${PF} install || die
+
+	exeinto /usr/lib/squeak; doexe inisqueak
+	dosym /usr/lib/squeak/inisqueak /usr/bin/inisqueak
+
+	### the rest is all for the plugin
+	if [ "`use mozilla`" ] ; then
+		inst_plugin /usr/lib/squeak/${MY_PV}/npsqueak.so
+
+		dodoc nps/README.npsqueak
+		dohtml -a html,sts nps/test/*
+
+		# maybe we should install the image here..
+		insinto /usr/lib/squeak
+		newins ${WORKDIR}/SqueakPlugin.image npsqueak.image
+	fi
+}
+
+pkg_postinst() {
+	einfo 'Run "inisqueak" to get a private copy of the VM image.'
+}