bump (fixes bug 378497)

(Portage version: 2.1.11.26/cvs/Linux x86_64)

3 files changed, 25 insertions, 43 deletions

diff --git a/dev-lang/mlton/ChangeLog b/dev-lang/mlton/ChangeLog
index a8e5db9be14b..ab485dd91593 100644
--- a/dev-lang/mlton/ChangeLog
+++ b/dev-lang/mlton/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mlton
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/ChangeLog,v 1.11 2010/07/11 22:01:52 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/ChangeLog,v 1.12 2012/10/16 09:07:05 hkbst Exp $
+
+*mlton-20100608 (16 Oct 2012)
+
+  16 Oct 2012; Marijn Schouten <hkBst@gentoo.org>
+  -files/mlton-20040227-obsolete-flags.patch, -mlton-20070826-r1.ebuild,
+  +mlton-20100608.ebuild:
+  bump (fixes bug 378497)
 
   11 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
   mlton-20070826-r1.ebuild:
diff --git a/dev-lang/mlton/files/mlton-20040227-obsolete-flags.patch b/dev-lang/mlton/files/mlton-20040227-obsolete-flags.patch
deleted file mode 100644
index c6904b6379fd..000000000000
--- a/dev-lang/mlton/files/mlton-20040227-obsolete-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru mlton-20040227.orig/bin/mlton mlton-20040227/bin/mlton
---- mlton-20040227.orig/bin/mlton	2004-06-09 17:43:13.388827848 +0200
-+++ mlton-20040227/bin/mlton	2004-06-09 17:43:39.256895304 +0200
-@@ -58,9 +58,9 @@
- 		'-fno-strength-reduce
- 		-fschedule-insns
- 		-fschedule-insns2
--		-malign-functions=5
--		-malign-jumps=2
--		-malign-loops=2
-+		-falign-functions=5
-+		-falign-jumps=2
-+		-falign-loops=2
- 		-mcpu=pentiumpro'				\
- 	-target-cc-opt sparc 					\
- 		'-Wa,-xarch=v8plusa
-diff -Nru mlton-20040227.orig/runtime/Makefile mlton-20040227/runtime/Makefile
---- mlton-20040227.orig/runtime/Makefile	2004-06-09 17:43:13.689782096 +0200
-+++ mlton-20040227/runtime/Makefile	2004-06-09 17:43:39.258895000 +0200
-@@ -4,7 +4,7 @@
- FLAGS = -fomit-frame-pointer
- 
- ifeq ($(TARGET_ARCH), x86)
--FLAGS += -mcpu=pentiumpro -malign-loops=2 -malign-jumps=2 -malign-functions=5
-+FLAGS += -mcpu=pentiumpro -falign-loops=2 -falign-jumps=2 -falign-functions=5
- endif
- ifeq ($(TARGET_ARCH), sparc)
- FLAGS += -Wa,-xarch=v8plusa -fcall-used-g5 -fcall-used-g7 -funroll-all-loops -m32 -mv8 -mcpu=ultrasparc
diff --git a/dev-lang/mlton/mlton-20070826-r1.ebuild b/dev-lang/mlton/mlton-20100608.ebuild
index d5491ff5cac6..905e52282cd0 100644
--- a/dev-lang/mlton/mlton-20070826-r1.ebuild
+++ b/dev-lang/mlton/mlton-20100608.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20070826-r1.ebuild,v 1.2 2010/07/11 22:01:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20100608.ebuild,v 1.1 2012/10/16 09:07:05 hkbst Exp $
 
 inherit eutils
 
 DESCRIPTION="Standard ML optimizing compiler and libraries"
-BASE_URI="http://mlton.org/pages/Download/attachments/"
-SRC_URI="!binary? ( ${BASE_URI}/${P}-1.src.tgz )
-		  binary? ( amd64? ( ${BASE_URI}/${P}-1.amd64-linux.tgz )
-					x86?   ( ${BASE_URI}/${P}-1.x86-linux.tgz ) )"
+BASE_URI="mirror://sourceforge/${PN}"
+SRC_URI="!binary? ( ${BASE_URI}/${P}.src.tgz )
+		  binary? ( amd64? ( ${BASE_URI}/${P}-1.amd64-linux.static.tgz )
+					x86?   ( ${BASE_URI}/${P}-1.x86-linux.static.tgz ) )"
 
 HOMEPAGE="http://www.mlton.org"
 
 LICENSE="as-is"
 SLOT="0"
+# there is support for ppc64 and ia64, but no
+# binaries are provided and there is no native
+# code generation for these platforms
 KEYWORDS="-* ~amd64 ~x86"
 
 IUSE="binary doc"
 
-#block mlton-bin until it has been removed
 DEPEND="dev-libs/gmp
-		!dev-lang/mlton-bin
 		doc? ( virtual/latex-base )"
+RDEPEND="dev-libs/gmp"
 
-QA_PRESTRIPPED="
+QA_PRESTRIPPED="binary? (
 	usr/bin/mlnlffigen
- 	usr/bin/mllex
-  	usr/bin/mlprof
-   	usr/bin/mlyacc
-	usr/lib/mlton/mlton-compile"
+	usr/bin/mllex
+	usr/bin/mlprof
+	usr/bin/mlyacc
+	usr/lib/mlton/mlton-compile
+)"
 
 src_compile() {
 	if use !binary; then