(Portage version: 2.0.51.19)

6 files changed, 139 insertions, 4 deletions

diff --git a/dev-lang/gnu-smalltalk/ChangeLog b/dev-lang/gnu-smalltalk/ChangeLog
index d9c34b50faeb..0074ac8db032 100644
--- a/dev-lang/gnu-smalltalk/ChangeLog
+++ b/dev-lang/gnu-smalltalk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/gnu-smalltalk
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/ChangeLog,v 1.3 2004/08/18 21:58:15 mkennedy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/ChangeLog,v 1.4 2005/03/31 05:27:19 mkennedy Exp $
+
+*gnu-smalltalk-2.1.10 (31 Mar 2005)
+
+  31 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/2.1.10-gst-image-temp.patch, metadata.xml,
+  +gnu-smalltalk-2.1.10.ebuild:
+  New upstream version; Resolves Bug #78880; Update contributed by Luis F.
+  Araujo <araujo@gentoo.org>; Created Luis maintainer entry to metadata.xml.
 
   18 Aug 2004; <mkennedy@gentoo.org> gnu-smalltalk-2.1.8.ebuild:
   Fixed problem with configuration parameters when tcltk is not in USE
diff --git a/dev-lang/gnu-smalltalk/Manifest b/dev-lang/gnu-smalltalk/Manifest
index 54247a86f5a2..85bb37b94aa9 100644
--- a/dev-lang/gnu-smalltalk/Manifest
+++ b/dev-lang/gnu-smalltalk/Manifest
@@ -1,6 +1,12 @@
-MD5 0c6eaf50a0c054e0cec00460354fcf4c gnu-smalltalk-2.1.8.ebuild 1655
 MD5 d47dab4bb1f8faaa8b1de59bf9bfe353 ChangeLog 726
+MD5 0c6eaf50a0c054e0cec00460354fcf4c gnu-smalltalk-2.1.8.ebuild 1655
 MD5 c67d223b05922d506793147ed4a212f4 metadata.xml 562
+MD5 0c6eaf50a0c054e0cec00460354fcf4c gnu-smalltalk-2.1.9.ebuild 1655
+MD5 c30f031a317f5e2ce020a5a806714e12 gnu-smalltalk-2.1.10.ebuild 2037
 MD5 2a74f549d87286f4ceed883af53724c2 files/2.1.8-gst-package-mktemp-gentoo.patch 780
-MD5 66ddf9dc07f2331955851bc54cb3b17f files/digest-gnu-smalltalk-2.1.8 68
 MD5 4e4efa446a75ebaf3437fe42510348c5 files/50gnu-smalltalk-gentoo.el 143
+MD5 66ddf9dc07f2331955851bc54cb3b17f files/digest-gnu-smalltalk-2.1.8 68
+MD5 30e6ec77c2af2cb52445b215513058a0 files/digest-gnu-smalltalk-2.1.9 68
+MD5 f3410447fcd011a73fd9dcb31818234c files/2.1.9-gst-package-mktemp-gentoo.patch 745
+MD5 3c44219f948e6f4f983ac5225c93a845 files/digest-gnu-smalltalk-2.1.10 69
+MD5 38985fa85d0e6de68b4ac79a1bb08da7 files/2.1.10-gst-image-temp.patch 2125
diff --git a/dev-lang/gnu-smalltalk/files/2.1.10-gst-image-temp.patch b/dev-lang/gnu-smalltalk/files/2.1.10-gst-image-temp.patch
new file mode 100644
index 000000000000..d589fb513ea5
--- /dev/null
+++ b/dev-lang/gnu-smalltalk/files/2.1.10-gst-image-temp.patch
@@ -0,0 +1,45 @@
+diff -urwpN smalltalk-2.1.10/Makefile.am smalltalk-2.1.10.changed/Makefile.am
+--- smalltalk-2.1.10/Makefile.am	2005-02-03 04:43:38.000000000 -0400
++++ smalltalk-2.1.10.changed/Makefile.am	2005-03-28 20:28:41.000000000 -0400
+@@ -59,9 +59,7 @@ gsticon.o: gsticon.ico
+ 	echo ProgramIcon ICON `cygpath -w $(srcdir)/gsticon.ico` | windres -o gsticon.o
+ 
+ gst.im: $(bin_PROGRAMS) kernel/stamp-classes
+-	SMALLTALK_KERNEL="`cd $(srcdir)/kernel; pwd`" \
+-	SMALLTALK_IMAGE="`pwd`" \
+-	  ./gst -iQ dummy_file
++	SMALLTALK_KERNEL="${D}/usr/share/smalltalk/gst -iQ dummy_file"
+ 
+ gst-mode.el: gst-mode.el.in
+ 	sed "s,@\(bindir\)@,$(bindir)," $(srcdir)/gst-mode.el.in > gst-mode.el
+diff -urwpN smalltalk-2.1.10/Makefile.in smalltalk-2.1.10.changed/Makefile.in
+--- smalltalk-2.1.10/Makefile.in	2005-02-03 04:43:53.000000000 -0400
++++ smalltalk-2.1.10.changed/Makefile.in	2005-03-28 20:28:13.000000000 -0400
+@@ -962,9 +962,7 @@ gsticon.o: gsticon.ico
+ 	echo ProgramIcon ICON `cygpath -w $(srcdir)/gsticon.ico` | windres -o gsticon.o
+ 
+ gst.im: $(bin_PROGRAMS) kernel/stamp-classes
+-	SMALLTALK_KERNEL="`cd $(srcdir)/kernel; pwd`" \
+-	SMALLTALK_IMAGE="`pwd`" \
+-	  ./gst -iQ dummy_file
++	SMALLTALK_KERNEL="${D}/usr/share/smalltalk/gst -iQ dummy_file"
+ 
+ gst-mode.el: gst-mode.el.in
+ 	sed "s,@\(bindir\)@,$(bindir)," $(srcdir)/gst-mode.el.in > gst-mode.el
+diff -urwpN smalltalk-2.1.10/gst-package.in smalltalk-2.1.10.changed/gst-package.in
+--- smalltalk-2.1.10/gst-package.in	2004-11-25 10:19:17.000000000 -0400
++++ smalltalk-2.1.10.changed/gst-package.in	2005-03-28 19:22:51.000000000 -0400
+@@ -138,8 +138,13 @@ fi
+ 
+ echo "Merging $files and $IMAGE_PATH/packages.xml..."
+ $dry_run || {
+-  sed -e '$i\' -e '</packages>' -e '/<.packages>/,/<packages>/d' $files > $IMAGE_PATH/packages.tmp
+-  mv $IMAGE_PATH/packages.tmp $IMAGE_PATH/packages.xml
++       tmpfile=$(mktemp)
++       sed -e '$i\' -e '</packages>' -e '/<.packages>/,/<packages>/d' $files > $tmpfile
++       if [ -n ${EBUILD_PHASE} ]; then
++               mv $tmpfile ${D}/usr/share/smalltalk/packages.xml
++       else
++               mv $tmpfile $IMAGE_PATH/packages.xml
++       fi
+ }
diff --git a/dev-lang/gnu-smalltalk/files/digest-gnu-smalltalk-2.1.10 b/dev-lang/gnu-smalltalk/files/digest-gnu-smalltalk-2.1.10
new file mode 100644
index 000000000000..af322f3669f5
--- /dev/null
+++ b/dev-lang/gnu-smalltalk/files/digest-gnu-smalltalk-2.1.10
@@ -0,0 +1 @@
+MD5 707a3c2d76bbf6c70629a3ef4c53d818 smalltalk-2.1.10.tar.gz 3312154
diff --git a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.10.ebuild b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.10.ebuild
new file mode 100644
index 000000000000..88f788418c64
--- /dev/null
+++ b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.10.ebuild,v 1.1 2005/03/31 05:27:19 mkennedy Exp $
+
+inherit elisp-common flag-o-matic eutils gcc
+
+DESCRIPTION="GNU Smalltalk"
+HOMEPAGE="http://www.gnu.org/software/smalltalk/smalltalk.html"
+SRC_URI="http://ftp.gnu.org/gnu/smalltalk/smalltalk-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="tcltk readline emacs gtk gmp"
+
+DEPEND="dev-libs/gmp
+	sys-libs/gdbm
+	sys-apps/debianutils
+	emacs? ( virtual/emacs )
+	readline? ( sys-libs/readline )
+	tcltk? ( dev-lang/tcl dev-lang/tk )
+	gtk? ( =x11-libs/gtk+-2* )
+	gmp? ( dev-libs/gmp )"
+
+S=${WORKDIR}/smalltalk-${PV}
+
+SITEFILE=50gnu-smalltalk-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-gst-image-temp.patch
+	if has_version '>=dev-lang/gnu-smalltalk-2.1.8'; then
+		einfo "You already have a gnu-smalltalk version installed"
+		einfo "We set correct values for SMALLTALKIMAGE and SMALLTALKKERNEL during compilation"
+		sed -i "s:getenv\ (\"SMALLTALK_KERNEL\"):\"${D}/usr/share/smalltalk\":" ${S}/libgst/lib.c
+		sed -i "s:getenv\ (\"SMALLTALK_IMAGE\"):\"${D}/usr/share/smalltalk\":" ${S}/libgst/lib.c
+	fi
+}
+
+src_compile() {
+	local myconf=""
+	if use tclk; then
+		myconf="
+		`use_with tcltk tcl=/usr/lib` \
+		`use_with tcltk tk=/usr/lib`"
+	fi
+	replace-flags '-O3' '-O2'
+	econf \
+		`use_with emacs emacs` \
+		`use_with readline readline` \
+		`use_with gmp gmp` \
+		`use_enable gtk gtk` \
+		${myconf} \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} lispdir=${D}/usr/share/emacs/site-lisp/gnu-smalltalk install || die
+	rm -rf ${D}/usr/include/sigsegv.h \
+		${D}/usr/include/snprintfv \
+		${D}/usr/share/aclocal/snprintfv.m4
+	dodoc AUTHORS COPYING* ChangeLog NEWS PATCHES README THANKS TODO
+	use emacs && elisp-site-file-install ${FILESDIR}/${SITEFILE}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/gnu-smalltalk/metadata.xml b/dev-lang/gnu-smalltalk/metadata.xml
index 7ea302df6fe0..42f65c4d2405 100644
--- a/dev-lang/gnu-smalltalk/metadata.xml
+++ b/dev-lang/gnu-smalltalk/metadata.xml
@@ -5,6 +5,9 @@
   <maintainer>
     <email>mkennedy@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>araujo@gentoo.org</email>
+  </maintainer>
   <longdescription>
     GNU Smalltalk is a free implementation of the Smalltalk-80
     language which runs on most versions on Unix and, in general,