Bump

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

4 files changed, 116 insertions, 7 deletions

diff --git a/dev-lang/opendylan/ChangeLog b/dev-lang/opendylan/ChangeLog
index 15fef74544ca..dbdf3350aed3 100644
--- a/dev-lang/opendylan/ChangeLog
+++ b/dev-lang/opendylan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/opendylan
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/ChangeLog,v 1.6 2012/10/22 05:18:32 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/ChangeLog,v 1.7 2013/02/08 09:21:39 patrick Exp $
+
+*opendylan-2012.1 (08 Feb 2013)
+
+  08 Feb 2013; Patrick Lauer <patrick@gentoo.org> +opendylan-2012.1.ebuild,
+  opendylan-2011.1-r1.ebuild:
+  Bump
 
   22 Oct 2012; Patrick Lauer <patrick@gentoo.org> opendylan-2011.1-r1.ebuild:
   Restricting mps dep
diff --git a/dev-lang/opendylan/Manifest b/dev-lang/opendylan/Manifest
index f0aa61074771..1451d7509980 100644
--- a/dev-lang/opendylan/Manifest
+++ b/dev-lang/opendylan/Manifest
@@ -1,5 +1,7 @@
 DIST opendylan-2011.1.zip 12228195 SHA256 5031ea08cc99093eb7187a1dcff766090ba47a2ffaed01fc8115167eb2ff8084 SHA512 5262dee4d854ff83ac738e5301844431a73019bc152aba47206fafd6e25c2e377e883a65228f3d4b2827ece19a55365c05876cb8d0f86d621d9274560ff541b5 WHIRLPOOL edb960dc4e12c6b442b5a8eb47fd2cdb717770fb6aa20a6e743cd1b4afb6a4c383de65c4260d685b8ad441de38443d10be72f049687a5a0e9a9795ab516a247a
-EBUILD opendylan-2011.1-r1.ebuild 3043 SHA256 cc4a717c47ffa4ee4fce7c95be54a30067969d75b679467f8f683911c6bf8f05 SHA512 556d76380092f8b1b77ff43f068a52bd6e12a77930f1c65dc1533926c8cf61c1eb02931c2f5e493bcaa62fc6e3080fb75ee72c192752593898454898651396ab WHIRLPOOL badf5a81f1b867e622a12d06179cc316e65b65f4a02641e98e28c810985099ca6a5875b8397100de2c19ecab0dfd6d8fabcd75f29ce37a256a72aa5543cc33b8
+DIST opendylan-2012.1.tar.bz2 8935516 SHA256 d842f591b321cea9f62da5b3342977e546327a597710f002cb0867551b9e4ce8 SHA512 fa3cbee9be2eb635848641e58e31d85f8fc2c0b0ac537fe67be3eb45ffa1ec09c4b9825bca41d857133219e5df97cfd3af1ac14e880e07d88524a24d7c1cdab1 WHIRLPOOL 6769f4b1f3e3e732fcad4a732705370764eadfb154d4c0b2509633faea2f16ffa2de0e791fbed35e34848a7c4142030727f0b5e4b0cad68731e4b56cfc21a0cb
+EBUILD opendylan-2011.1-r1.ebuild 3051 SHA256 f65e3bd6405d6e482d87233830b6ab07de15cba6b5da9f7f0f103713d53fc349 SHA512 7f0aa2052c93a878ca52a74e31df569f5c1a7a7d6cc286c6571c35b8eb9d0410b0336114e957a1c2ad2217480cbdd3542b960eddd53a8ebac549aeea8952c3de WHIRLPOOL cab2380c449fa54106e4a79942b62d6e1bc9f4ddc27145d5277f02065d345b8773b2eb722ff42b050aceb6a6780f5a1a0d1b273cff6b06cf7c01e54def381fef
+EBUILD opendylan-2012.1.ebuild 3244 SHA256 a510c5791aadb97d5a925899043a19fab5b189f4628b00f59fcd8492625ce1bd SHA512 39a7bcea9bf8650e9a4ef363288205c7645371d8069ea5343a71a2caee6d9b107f99cf5fd566cf85e297986ebd2f096cb9320e33b84f879e3878a3175818f790 WHIRLPOOL b04cc0762b883bb75acec0baa5f14ea7c829290ebbc9b4169291f57b611445d8b25903e6ea7eea60a34a6b21f8d1f9c053a4a2d49900863b36346d755b098a2f
 EBUILD opendylan-9999.ebuild 1436 SHA256 3eb2bb8212982d9834646a5107ef3c80f35c74bf498f777f305a07bf436be716 SHA512 6bcbddbf758512d7ba9b4121679044283ec6e8b0adcb004cd06a54b0ba8d2e064dc4b73c6ccb4ea07c01dcd7cb6790258c297265b4b6455cffe8cb64684da60f WHIRLPOOL 952f18068c4ea2785154b5737847ed930a57766fff7c4f8613cf34a76948da689d6320687218e56517c69b210c8c64682c9b55288b48b4ffb844979be022fc98
-MISC ChangeLog 1096 SHA256 89259a2a1d5a9c10cf06a811b09987e9618df2bdfd4bd2f044e9181a0a28a98a SHA512 29d0089847fb8db8ff0d5cd39cd1f8e8426a6c177f26943804d74ef69250fdefd88db8ddca43c45a9971808b4df7c6a4ec556434b96b805ba3d68318d001d30e WHIRLPOOL 3b28e5ecf5ccb7f515ce657a04ab9adb5ee9add1b1d8590a5b536c3d9a905697c2c264b89e4b6d7923ae87c4016265bf03cbd4b614fa4feab939021e8173fa9f
+MISC ChangeLog 1243 SHA256 31e0369a219575a40551da8427c947c0a9df48a79c7cade8c68796f1b2c42b9c SHA512 36420578866e940e209de9e11103ab9aaa05a0f9345f8015451ae06cac9b5c73331d961534dad8cfd6b29d68104aec40e61d127a7b0c8f2e53f703e772b16582 WHIRLPOOL 984f0e241c64893c466d90c966bedd9e824a3d85764dd2aef92a43b5a708790d56884dc2211b58e8be7e714dc83389f1a10f807b5bb7647999ec291983b43875
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
diff --git a/dev-lang/opendylan/opendylan-2011.1-r1.ebuild b/dev-lang/opendylan/opendylan-2011.1-r1.ebuild
index 5027fd955391..2d3e3cd3acc1 100644
--- a/dev-lang/opendylan/opendylan-2011.1-r1.ebuild
+++ b/dev-lang/opendylan/opendylan-2011.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-2011.1-r1.ebuild,v 1.5 2012/10/22 05:18:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-2011.1-r1.ebuild,v 1.6 2013/02/08 09:21:39 patrick Exp $
 EAPI=4
 
 inherit autotools
@@ -27,7 +27,7 @@ DEPEND="app-arch/unzip
 	dev-libs/boehm-gc
 	dev-lang/perl
 	dev-perl/XML-Parser
-	|| ( dev-lang/opendylan-bin dev-lang/opendylan )
+	|| ( =dev-lang/opendylan-bin-2011.1 dev-lang/opendylan )
 	x86? ( <dev-libs/mps-1.108 )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-lang/opendylan/opendylan-2012.1.ebuild b/dev-lang/opendylan/opendylan-2012.1.ebuild
new file mode 100644
index 000000000000..38185a5dfdf3
--- /dev/null
+++ b/dev-lang/opendylan/opendylan-2012.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-2012.1.ebuild,v 1.1 2013/02/08 09:21:39 patrick Exp $
+EAPI=4
+
+inherit autotools
+
+RESTRICT="test"
+
+DESCRIPTION="OpenDylan language runtime environment"
+
+HOMEPAGE="http://opendylan.org"
+# stupid ... submodules don't get tarballed in? Thanks github.
+SRC_URI="http://dev.gentooexperimental.org/~dreeevil/opendylan-2012.1.tar.bz2"
+
+LICENSE="Opendylan"
+SLOT="0"
+
+# not tested on x86
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+# the boehm-gc check is "wrong" and reported upstream
+# but for now static-libs useflag is needed
+DEPEND="app-arch/unzip
+	dev-libs/boehm-gc[static-libs]
+	dev-lang/perl
+	dev-perl/XML-Parser
+	|| ( dev-lang/opendylan-bin dev-lang/opendylan )
+	x86? ( <dev-libs/mps-1.108 )"
+RDEPEND="${DEPEND}"
+
+# on x86 there's a dependency on mps, but the build system is a bit ... hmm ...
+# let's give it more of a chance to survive then
+NAUGHTY_FILES=(
+	sources/lib/run-time/collector.c.malloc
+	sources/lib/run-time/collector.c
+	sources/lib/run-time/pentium-win32/buffalo-collector.c
+	sources/lib/run-time/pentium-win32/heap-stats.c
+	sources/lib/run-time/heap-utils.h
+	)
+
+NAUGHTY_HEADERS=(
+	mps.h
+	mpscmv.h
+	mpscamc.h
+	mpsavm.h
+	)
+
+src_prepare() {
+	mkdir -p build-aux
+	elibtoolize && eaclocal || die "Fail"
+	automake --foreign --add-missing # this one dies wrongfully
+	eautoconf || die "Fail"
+	# mps headers, included wrong
+	if use x86; then
+	for i in ${NAUGHTY_FILES[@]}; do
+		for header in ${NAUGHTY_HEADERS[@]}; do
+			sed -i -e "s:\"${header}\":<${header}>:" $i
+		done
+	done
+	fi
+}
+
+src_configure() {
+	if has_version =dev-lang/opendylan-bin-2012.1; then
+		PATH=/opt/opendylan-2012.1/bin/:$PATH
+	elif has_version =dev-lang/opendylan-bin-2011.1; then
+		PATH=/opt/opendylan-2011.1/bin/:$PATH
+	else
+		PATH=/opt/opendylan/bin:$PATH
+	fi
+	if use amd64; then
+		econf --prefix=/opt/opendylan || die
+	else
+		econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ || die
+	fi
+	if use x86; then
+        # Includedir, pointing at something wrong
+        sed -i -e 's:-I$(MPS)/code:-I$(MPS):'  sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps path"
+	sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mmdw.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building"
+	sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mpsplan.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building"
+	sed -i -e 's~$(MPS_LIB)/mpsplan.a~/usr/lib/mpsplan.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone"
+	sed -i -e 's~$(MPS_LIB)/mmdw.a~/usr/lib/mmdw.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone"
+	fi
+}
+
+src_compile() {
+	ulimit -s 32000 # this is naughty build system
+	emake DESTDIR=${D} -j1 3-stage-bootstrap || die
+}
+
+src_install() {
+	ulimit -s 32000 # this is naughty build system
+	# because of Makefile weirdness it rebuilds quite a bit here
+	# upstream has been notified
+	emake -j1 DESTDIR=${D} install
+	mkdir -p "${D}/etc/env.d/opendylan/"
+	echo "export PATH=/opt/opendylan/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan" || die "Failed to add env settings"
+}