Version bump.

(Portage version: 2.1.2-r1)

4 files changed, 249 insertions, 2 deletions

diff --git a/dev-lang/cm3-bin/ChangeLog b/dev-lang/cm3-bin/ChangeLog
index f1df07171073..3b21599edb25 100644
--- a/dev-lang/cm3-bin/ChangeLog
+++ b/dev-lang/cm3-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/cm3-bin
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/ChangeLog,v 1.6 2006/03/03 13:55:52 blubb Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/ChangeLog,v 1.7 2007/01/24 04:47:52 vapier Exp $
+
+*cm3-bin-5.4.0 (24 Jan 2007)
+
+  24 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/cm3-bin-5.4.0-cm3-cfg.patch, +cm3-bin-5.4.0.ebuild:
+  Version bump.
 
   03 Mar 2006; Simon Stelling <blubb@gentoo.org>
   cm3-bin-5.2.7_pre050331.ebuild:
diff --git a/dev-lang/cm3-bin/cm3-bin-5.4.0.ebuild b/dev-lang/cm3-bin/cm3-bin-5.4.0.ebuild
new file mode 100644
index 000000000000..32dcc08d744a
--- /dev/null
+++ b/dev-lang/cm3-bin/cm3-bin-5.4.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/cm3-bin-5.4.0.ebuild,v 1.1 2007/01/24 04:47:52 vapier Exp $
+
+inherit toolchain-funcs eutils
+
+if [[ ${PV} == *_pre* ]] ; then
+	STAMP=${PV/*_pre}
+	MY_PV=d${PV/_pre*}-20${STAMP:0:2}-${STAMP:2:2}-${STAMP:4:2}
+else
+	MY_PV=${PV}
+fi
+DESCRIPTION="Critical Mass Modula-3 compiler (binary version)"
+HOMEPAGE="http://www.elegosoft.com/cm3/"
+SRC_URI="x86? ( http://www.elegosoft.com/cm3/cm3-min-POSIX-LINUXLIBC6-${MY_PV}.tgz )
+	amd64? ( http://www.elegosoft.com/cm3/cm3-min-POSIX-LINUXLIBC6-${MY_PV}.tgz )"
+
+LICENSE="CMASS-M3 DEC-M3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND=""
+PROVIDE="virtual/m3"
+
+S=${WORKDIR}
+
+QA_TEXTRELS="usr/lib32/cm3/pkg/libm3/LINUXLIBC6/libm3.so.5
+	usr/lib32/cm3/pkg/m3core/LINUXLIBC6/libm3core.so.5"
+QA_EXECSTACK="usr/lib32/cm3/bin/cm3
+	usr/lib32/cm3/pkg/m3core/LINUXLIBC6/libm3core.so.5"
+
+src_unpack() {
+	unpack ${A}
+	unpack ./system.tgz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cm3-cfg.patch
+	sed -i \
+		-e "s:@GENTOO_INITIAL_REACTOR_EDITOR@:${EDITOR:-/usr/bin/nano}:" \
+		-e "s:@GENTOO_INSTALL_ROOT@:/usr/$(get_libdir)/cm3/:" \
+		-e "s:@GENTOO_CC@:$(tc-getCC):" \
+		-e "s:@GENTOO_AR@:$(tc-getAR):" \
+		-e "s:@GENTOO_AS@:$(tc-getAS):" \
+		bin/cm3.cfg
+	if [[ -e pkg/m3core/LINUXLIBC6 ]] ; then
+		cd pkg/m3core/LINUXLIBC6
+		rm -f libm3core.so
+		ln -s libm3core.so.5 libm3core.so || die
+		cd "${S}"
+	fi
+	if [[ -e pkg/libm3/LINUXLIBC6 ]] ; then
+		cd pkg/libm3/LINUXLIBC6
+		rm -f libm3.so
+		ln -s libm3.so.5 libm3.so || die
+		cd "${S}"
+	fi
+}
+
+src_install() {
+	use amd64 && export ABI=x86
+	local libdir="/usr/$(get_libdir)/cm3"
+	dodir ${libdir}
+	cp -a pkg bin lib "${D}"${libdir}/ || die "mv lib"
+	dobin "${FILESDIR}"/m3{build,ship}
+	make_wrapper cm3 ./cm3 ${libdir}/bin ${libdir}/lib
+	make_wrapper cm3cg ./cm3cg ${libdir}/bin ${libdir}/lib
+}
diff --git a/dev-lang/cm3-bin/files/cm3-bin-5.4.0-cm3-cfg.patch b/dev-lang/cm3-bin/files/cm3-bin-5.4.0-cm3-cfg.patch
new file mode 100644
index 000000000000..1ea2c52c09ea
--- /dev/null
+++ b/dev-lang/cm3-bin/files/cm3-bin-5.4.0-cm3-cfg.patch
@@ -0,0 +1,170 @@
+--- bin/cm3.cfg
++++ bin/cm3.cfg
+@@ -57,25 +57,7 @@
+ % A World-Wide Web browser.  Reactor passes it an initial URL
+ % its first command-line argument.
+ 
+-INITIAL_REACTOR_EDITOR = BEGIN_CONFIG
+-  "What should be the default text editor for new Reactor users?"
+-    10 "EDITOR"
+-     0 "emacsclient"
+-     0 "emacs"
+-     0 "vi"
+-     0 "textedit"
+-     0 "xedit"
+-     6 "/usr/local/emacs/bin" "emacsclient"
+-     6 "/usr/local/bin"       "emacsclient"
+-     6 "/usr/local/emacs/bin" "emacs"
+-     6 "/usr/local/bin"       "emacs"
+-     6 "/usr/bin"             "vi"
+-     6 "/usr/local/X11R5/bin" "xedit"
+-     6 "/usr/openwin/bin"     "textedit"
+-     6 "/usr/openwin/bin"     "xedit"
+-     6 "/usr/X11/bin"         "xedit"
+-     6 "/usr/bin/X11"         "xedit"
+-END_CONFIG
++INITIAL_REACTOR_EDITOR = "@GENTOO_INITIAL_REACTOR_EDITOR@"
+ % A text editor.  Reactor passes it "<file> +<line>" on the
+ % command-line when it wants to edit <file> initially positioned
+ % at <line>.
+@@ -86,10 +68,7 @@
+ % the installation will fail, but can be restarted after you have 
+ % fixed the permissions.
+ 
+-INSTALL_ROOT = BEGIN_CONFIG
+-  "Where should Reactor be installed?"
+-    7 %-- user specified install root
+-END_CONFIG
++INSTALL_ROOT = "@GENTOO_INSTALL_ROOT@"
+ 
+ BIN_INSTALL   = INSTALL_ROOT & "/bin"        % executables
+ if M3_PROFILING 
+@@ -139,70 +118,12 @@
+ %                      12 "/usr/local/gnu/lib"
+ %                      13 "/usr/lib"
+ %                  END_CONFIG, "-ll" ],
+-  "FLEX-BISON" : [  BEGIN_CONFIG
+-                     "Where are the flex/bison libraries?"
+-                       11 "libfl.a"
+-                       12 "/usr/lib"
+-                       12 "/usr/local/lib"
+-                       12 "/usr/local/gnu/lib"
+-                       13 "/usr/lib"
+-                   END_CONFIG, "-lfl" ],
+-  "POSTGRES95" : [ "-Xlinker", "-Bdynamic", BEGIN_CONFIG
+-                     "Where are the Postgres95 libraries?"
+-                       11 "libpq.so"
+-                       12 "/usr/local/postgres95/lib"
+-                       12 "/usr/local/lib"
+-                       12 "/usr/lib"
+-                       13 "/usr/lib"
+-                   END_CONFIG, "-lpq" ],
+-  "OPENGL"     : [ "-Xlinker", "-Bdynamic", BEGIN_CONFIG
+-                     "Where are the OpenGL libraries?"
+-                       11 "libGLU.so"
+-                       11 "libGL.so"
+-                       12 "/usr/lib"
+-                       12 "/usr/local/lib"
+-                       12 "/usr/local/gnu/lib"
+-                       13 "/usr/lib"
+-                   END_CONFIG, "-lGLU", "-lGL", "-lXext" ],
+-  "ODBC"       : [ "-Xlinker", "-Bdynamic", BEGIN_CONFIG
+-                     "Where are the ODBC libraries?"
+-                       11 "libodbc.so"
+-                       12 "/usr/local/lib"
+-                       12 "/usr/lib"
+-                       12 "/usr/local/pgsql/lib"
+-                       12 "/usr/local/postgres95/lib"
+-                       13 "/usr/local/lib"
+-                   END_CONFIG, "-lodbc" ],
+-  "MOTIF"      : [ "-Xlinker", "-Bdynamic", BEGIN_CONFIG
+-                     "Where are the Motif libraries?"
+-                       11 "libXm.so"
+-                       12 "/usr/X11/lib"
+-                       12 "/usr/X11R6/lib"
+-                       12 "/usr/lib"
+-                       12 "/usr/local/lib"
+-                       12 "/usr/local/gnu/lib"
+-                       13 "/usr/X11/lib"
+-                       13 "/usr/X11R6/lib"
+-                       13 "/usr/lib"
+-                   END_CONFIG, "-lXm" ],
+-  "X11"        : [ "-Xlinker", "-Bdynamic", BEGIN_CONFIG
+-                     "Where are the X11 libraries?"
+-                       11 "libXaw.so"
+-                       11 "libXmu.so"
+-                       11 "libXext.so"
+-                       11 "libXt.so"
+-                       11 "libSM.so"
+-                       11 "libICE.so"
+-                       11 "libX11.so"
+-                       12 "/usr/X11/lib"
+-                       12 "/usr/X11R6/lib"
+-                       12 "/usr/lib"
+-                       12 "/usr/local/lib"
+-                       12 "/usr/local/gnu/lib"
+-                       13 "/usr/X11/lib"
+-                       13 "/usr/X11R6/lib"
+-                       13 "/usr/lib"
+-                   END_CONFIG, "-lXaw", "-lXmu", "-lXext",
++  "FLEX-BISON" : [ "-lfl" ],
++  "POSTGRES95" : [ "-Xlinker", "-Bdynamic", "-lpq" ],
++  "OPENGL"     : [ "-Xlinker", "-Bdynamic", "-lGLU", "-lGL", "-lXext" ],
++  "ODBC"       : [ "-Xlinker", "-Bdynamic", "-lodbc" ],
++  "MOTIF"      : [ "-Xlinker", "-Bdynamic", "-lXm" ],
++  "X11"        : [ "-Xlinker", "-Bdynamic", "-lXaw", "-lXmu", "-lXext",
+                         "-lXt", "-lSM", "-lICE", "-lX11" ],
+   "TCP"        : [ ]
+ }
+@@ -215,39 +136,9 @@
+ 
+ %---------------------------------------------------------- system programs ---
+ 
+-readonly SYSTEM_CC  = BEGIN_CONFIG
+-  "Where is your C compiler?"
+-    0 "gcc"
+-    6 "/bin"           "gcc"
+-    6 "/usr/bin"       "gcc"
+-    6 "/usr/local"     "gcc"
+-    6 "/usr/local/bin" "gcc"
+-    6 "/usr/local/gnu" "gcc"
+-    0 "cc"
+-    6 "/bin"           "cc"
+-    6 "/usr/bin"       "cc"
+-    6 "/usr/local"     "cc"
+-    6 "/usr/local/bin" "cc"
+-    6 "/usr/local/gnu" "cc"
+-END_CONFIG % C compiler
+-readonly SYSTEM_AR  = BEGIN_CONFIG
+-  "Where is your library archiver?"
+-    0 "ar"
+-    6 "/usr/bin"       "ar"
+-    6 "/bin"           "ar"
+-    6 "/usr/local"     "ar"
+-    6 "/usr/local/bin" "ar"
+-    6 "/usr/local/gnu" "ar"
+-END_CONFIG % Archiver
+-readonly SYSTEM_ASM = BEGIN_CONFIG
+-  "Where is your assembler?"
+-    0 "as"
+-    6 "/usr/bin"       "as"
+-    6 "/bin"           "as"
+-    6 "/usr/local"     "as"
+-    6 "/usr/local/bin" "as"
+-    6 "/usr/local/gnu" "as"
+-END_CONFIG % Assembler
++readonly SYSTEM_CC  = "@GENTOO_CC@"
++readonly SYSTEM_AR  = "@GENTOO_AR@"
++readonly SYSTEM_ASM = "@GENTOO_AS@"
+ 
+ %--------------------------------------------------------- Modula-3 backend ---
+ % For platforms without an integrated backend, "m3_backend" is called to
+@@ -456,6 +347,6 @@
+ % To use the GNU defaults for CC and CFLAGS, specify "*".
+ %
+ 
+-GNU_CC     = "gcc"
+-GNU_CFLAGS = "-O"
++GNU_CC     = "*"
++GNU_CFLAGS = "*"
+ GNU_MAKE   = "make"
diff --git a/dev-lang/cm3-bin/files/digest-cm3-bin-5.4.0 b/dev-lang/cm3-bin/files/digest-cm3-bin-5.4.0
new file mode 100644
index 000000000000..1aca49a68461
--- /dev/null
+++ b/dev-lang/cm3-bin/files/digest-cm3-bin-5.4.0
@@ -0,0 +1,3 @@
+MD5 86d1f4b0c1f781a1753b5a4ca49dc63f cm3-min-POSIX-LINUXLIBC6-5.4.0.tgz 6293657
+RMD160 434229ea892ce7384a4a860b5e900e1cac571889 cm3-min-POSIX-LINUXLIBC6-5.4.0.tgz 6293657
+SHA256 a0591bf7e74ba43369c368f01cd631e6e402d05c2188bda6584569bc88e77877 cm3-min-POSIX-LINUXLIBC6-5.4.0.tgz 6293657