Bump polyml to 5.5.0 (also called 5.5, the tarball calls it 5.5, poly -v says it is 5.5.0)

Package-Manager: portage-2.1.11.18/cvs/Linux x86_64

6 files changed, 236 insertions, 5 deletions

diff --git a/dev-lang/polyml/ChangeLog b/dev-lang/polyml/ChangeLog
index cc6339d51e43..bf11d4729bab 100644
--- a/dev-lang/polyml/ChangeLog
+++ b/dev-lang/polyml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/polyml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/ChangeLog,v 1.7 2012/09/19 12:48:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/ChangeLog,v 1.8 2012/09/20 13:16:34 gienah Exp $
+
+*polyml-5.5.0 (20 Sep 2012)
+
+  20 Sep 2012; Mark Wright <gienah@gentoo.org> +files/polyml-5.5.0-asm.patch,
+  +files/polyml-5.5.0-configure.patch, +files/polyml-5.5.0-x-it-basis.patch,
+  +polyml-5.5.0.ebuild:
+  Bump polyml to 5.5.0 (also called 5.5, the tarball calls it 5.5, poly -v says
+  it is 5.5.0)
 
   19 Sep 2012; Mark Wright <gienah@gentoo.org> polyml-5.4.1.ebuild:
   Thanks to Richard Yao for the fix to bug #398841 and #395009
diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index 90d3b6c7fbe2..e6c339099d96 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -3,16 +3,21 @@ Hash: SHA256
 
 AUX polyml-5.4.1-asm.patch 1026 SHA256 9879c43c7e82e53ff6d15b838b159df3336b791c46e9f80a38f21c4180500bed SHA512 bf19cedff74b11feba72c0ba2f5a9b6ee8169b5bb1b783d3559640070025ca0e7627d751bc703c41d812025d6909cba56101e49f0199f2aee310bc95ca4f2d6d WHIRLPOOL 4e0fda223b89b12801b06be970c98b8c0caece7bc8fb6994e8cebfe8ebf25d1efc8fec0311b360c5665f45279b0bd72ada9199041ad2245ecf4849118ef034ca
 AUX polyml-5.4.1-configure.patch 459 SHA256 89e712f53a08386505d8a503f23d6e29310ae1b1ce39e3acaa024ab47ab3b20d SHA512 4e3a5e6651c8b6b9cb018f72f100755eee0265ad7dd0ba57030b7bce95670ff35e7191661be469b59206266f5eb51042d98504601311629bc2e83ed36a0cef8f WHIRLPOOL fa3b63cc9ecb46fe099d9a3e7ce050018c7384c269ceb9359dd9f5bfc02dc36317e79acad6dd728758a89486ac0020b00733ddadd43ced831576961f6708289c
+AUX polyml-5.5.0-asm.patch 351 SHA256 2cf50de0e1401e84c30558f141d781bce8aabeea06ae1790d8d273d5a2f66c32 SHA512 92a14615483aaac76e708ae19fccab132f80223ebaad7a390482af164335199a7d2e52be8726cc96d7971efae73a9cdf0284ec96f014af606edce2024d5b3996 WHIRLPOOL 6f4be3a701cc23c03a0b21055633f6ab2bf55c5f8f1ae29ba78bd7d09c3e56d98c268e0b16f1b0a62abcd4d6b10d4cbd5bba2e7b8e0d51876d2d4e089c95c926
+AUX polyml-5.5.0-configure.patch 4658 SHA256 97a22b91138bba455e846cc3bfc7eb4db2ef851e5165513d9ca1a93bda5991d7 SHA512 d4a8ee5d41469d958d7f61a6608c5d4bd50e5497fadcd5333b2a94cd253c65d27f493bd743574eb3ccab37a39fdb2182e25106443f1855b30be1a70c9d450cc6 WHIRLPOOL 0ec51689a392a9d85bba2617af34704dc119ba0d3a9e9b969061b1609b568a4898dbb4ceb561c8a5ae1aaadb181ea2e94e0f25e2161be1dc7b8b46a9350b621c
+AUX polyml-5.5.0-x-it-basis.patch 562 SHA256 114c8b973ec601a616700c5301d09aa74da90a2a1e62cf9e697e1d856dc4bfe3 SHA512 ed5864b7ce5767133a47d914b5b439177e5c841669870292f90a73edee2e505aff6883b9a80baf0036d87bf728038ffa4609f9bacde4a704bfca291aa9cf50a4 WHIRLPOOL d2cdd33be477faa4d1e66c4a033390505bc7e7a47376c977a6e8d563353fabf10afdbda26801d66e91c22ba650bbfc713118e3f68ce4ccbc595bfdd67028bdfb
 DIST polyml.5.2.1.tar.gz 4114551 SHA256 c84148ae9a28e782f48208bcb8c5b82ee7bfdc178784fe81694cf1f0789ae62e SHA512 c3971eb7765712acfe19a48c91183eb1a93b537cdcf479bc70b47676f1a5d93a1cb966839298607274d077df3419c74dcaed319e4b4c0f79e3e78c36f2af428e WHIRLPOOL e02aa5e4995b9f70a04c700bb53306ed712aaf99a8cf2ff9f0a1dd465ccbe905348b7dcad3c6b9528c1b62293f62fb917e5fa9409bd72852897a933776a2fb51
 DIST polyml.5.4.1.tar.gz 6107319 SHA256 514d1d07be487b783d4dfa29dbd550b3396640579ce135a9eb5a61f08e7f9cac SHA512 4a7b404ed648b5a9fd9d52917214688d15f4f9a5f4570ba13b52a8304bde1cc4b534f539ffc3c9554283816ae130e4c898a179d776df6d3220fba9743a19b175 WHIRLPOOL 048db0b2210d699c0a86940daaafd24bfc81debae412f7e7dcad2585cd5514253f6c47e0006277ef00b640ab971a031d74e64c78c4abcc09712fa9e8593d1720
+DIST polyml.5.5.tar.gz 5504389 SHA256 2b20e597e6fe43df1b0ed01e78e410c6b51d0ac7911833e91d94fcc9eb05d831 SHA512 4725c2e4a786b8c63bc6fc1cadad0de818ed935014d51040af43defa07b03ba7bedb2185bfb2e39a0db7284479e79e698b31ec7fe8463c306b668de1eda69b89 WHIRLPOOL 166c7d0037dff771251c95e17d86a6208d926a5adbbac0188426dfe09b7cdbab1b620919068a722f34377fbc59966145ebd1cba5dcb0664943cc82c10d3b5688
 EBUILD polyml-5.2.1.ebuild 599 SHA256 ae47586ab5cf84d8d23e59fc3d0a4a1611ab8a6d4abfe60ad0aad71acb69ff08 SHA512 ce51e98c6eadd9ab2406e62a50015f692a4ed2bf9e7a272523cbadf8adde51e9740d035c2744106cd7816fc3908b301aa6efb238a35a8051e0be1ad11860814d WHIRLPOOL e46e45d05868210ce158d07ae3b6f6e2bd4f5a704f8be11766ec204c8c04186cd6be818027185f5f13552e580ed42ff5a906141cf6705cb1e6f2fb3f320ebef6
 EBUILD polyml-5.4.1.ebuild 987 SHA256 5cdbb1d847756597fea73323f5bf6f9435119e539635d777770f5dd7412dbcf0 SHA512 a12b924b96d210d9fe224f2baa15f6853d4377f1a264875a98809eba03ef40d262f13ff34203ac0f778d9149b80db385d828c96981cab5feab22c2d3ac54e78e WHIRLPOOL eb00456d4b34562483b4e18ee71291b83316756dd73f78b2e24be1a7fc9ebac4c190f9d6c47524594fa1abd4d6d79f58e771703e1b8a3f889eeb31cd2a479b82
-MISC ChangeLog 1453 SHA256 3d0b7276e0925f15ccd89d6ee0a643b4739e62b1ac7b9548b9a7dbc1fdcd4e13 SHA512 a20c3b081608140b211d4be317c153ce1f7d0012921063c9a891bff51dc4b3fd00949f2776bdb9c4f229c382adf6e2d09fbb40e4944c5cec24def926cc683a7e WHIRLPOOL f173666287662c1bfd455611c3f6f074b24f7cfb64ae4b5731265febcc7838030cd853fe55480a1aa7907dcfd92cc04aeed8931e4b36412fba95c3ae69dadbe7
+EBUILD polyml-5.5.0.ebuild 1184 SHA256 0e76465f2d4315701d29fbb8b00fed637739eec41dba76973755a78e2d02f05e SHA512 4ee31938c8783f4d9df96facca180761dd028b00e14a6758c286370dcdbc86c86bbba3e74d0733a6daed06fe917731b7c6962c7266002b211d7aaef561075734 WHIRLPOOL 82305aa4a7254599677aa8f2391d13d947eb194c132074a969653860c1aef43bc9bd095808edaf0565d74a507ae9ae7cdba2038a7a3c9bddb8838e94dd8bc60b
+MISC ChangeLog 1757 SHA256 6eb21ba2c5fafe5214ed1e797135e9f3d6e1eee964af6d973c15571976ffa380 SHA512 b9b220cf562ac7a062608b9c9b2201384d49fcbe3bfde2b6e191d5429fe0654e025f6dbfca6f441088bb7881dd8979254c75e5854396c3c9be2e1867064be0d2 WHIRLPOOL 4d9a46082bdf03c86188f7f1241adf6bc1e68d0eb12d241f0805435692d0c4d42d863cce49eb7b54844d430a8d917c66828d7afe3d20c2795a372bc799682834
 MISC metadata.xml 391 SHA256 12fb15a5275bb291c63724d6dd56864a60f465835698701d5798b50688337c5b SHA512 41ba04ec1384db3fb01430115cb89a18b11a191830ee19ce50c0c0c9adcd6a5b5099f21cc52e6d3df836dac722770cb0c1d9057c703af4f8d3250d7a727661f8 WHIRLPOOL 6d9e1dee3484c62a905604650f55f3217a17109adf1845f92a83922961416fa5fafe222a44be9768f998402f5592b1032144a10b22b6c6c2201af90a7d1b8618
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBZvwwACgkQoBEVQmGOlx8F3gEAqmO7+T0k0vMSHFfFr1/EY3UU
-XB4j7tQ+6XZ5v01RO28A/iFI0WB14ksy4DiP9yBa2yg/6diMS7hZ9KyNpxdRCZw7
-=VxqX
+iF4EAREIAAYFAlBbFz0ACgkQoBEVQmGOlx90eAEAwa8PV6z7DtERqCGDyB6WiPpk
+IbgRKWopR0KWw2qlYy4A/jbNKmMLsQh2Cp4y0eZIClxNjVLXLoZ6mbyYvjFYjMuk
+=AoMe
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/polyml/files/polyml-5.5.0-asm.patch b/dev-lang/polyml/files/polyml-5.5.0-asm.patch
new file mode 100644
index 000000000000..cffa627b9f32
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.5.0-asm.patch
@@ -0,0 +1,10 @@
+--- polyml.5.5-orig/libpolyml/x86asm.asm	2012-05-03 21:07:59.000000000 +1000
++++ polyml.5.5/libpolyml/x86asm.asm	2012-09-19 17:41:51.767737295 +1000
+@@ -3003,4 +3003,7 @@
+     dd  Mask_assign_byte         ;# 254
+     dd  Mask_assign_word         ;# 255
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+ END
diff --git a/dev-lang/polyml/files/polyml-5.5.0-configure.patch b/dev-lang/polyml/files/polyml-5.5.0-configure.patch
new file mode 100644
index 000000000000..1a2e114e6503
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.5.0-configure.patch
@@ -0,0 +1,138 @@
+Index: polyml/configure
+===================================================================
+--- polyml/configure	(revision 1599)
++++ polyml/configure	(revision 1600)
+@@ -20870,10 +20870,8 @@
+ # Check whether --with-portable was given.
+ if test "${with_portable+set}" = set; then :
+   withval=$with_portable;
+-    ac_cv_with_portable=yes
+ else
+-
+-    ac_cv_with_portable=no
++  with_portable=check
+ fi
+ 
+ 
+@@ -20894,36 +20892,46 @@
+ 
+ $as_echo "#define HOSTARCHITECTURE_SPARC 1" >>confdefs.h
+ 
+-            ac_cv_with_portable=yes
++            polyarch=interpret
+             ;;
+       power* | ppc*)
+ 
+ $as_echo "#define HOSTARCHITECTURE_PPC 1" >>confdefs.h
+ 
+-            ac_cv_with_portable=yes
++            polyarch=interpret
+             ;;
+       arm*)
+ 
+ $as_echo "#define HOSTARCHITECTURE_ARM 1" >>confdefs.h
+ 
+-            ac_cv_with_portable=yes
++            polyarch=interpret
+             ;;
+       ia64*)
+ 
+ $as_echo "#define HOSTARCHITECTURE_IA64 1" >>confdefs.h
+ 
+-            ac_cv_with_portable=yes
++            polyarch=interpret
+         ;;
+       *) as_fn_error $? "Poly/ML is not supported for this architecture" "$LINENO" 5 ;;
+ esac
+ 
+-# If we have explicitly set --with-portable or we are on a machine without
+-# a code-generator set to use the interpreter.
+-if test "$ac_cv_with_portable" = "yes"; then
++# If we explicitly asked to use the interpreter set the architecture to interpreted.
++if test "x$with_portable" = "xyes" ; then
++    polyarch=interpret
++fi
+ 
++# If we asked not to use the interpreter check we have native code support.
++if test "x$with_portable" = "xno" ; then
++    if test "x$polyarch" = "xinterpret" ; then
++        as_fn_error $? "--without-portable was given but native code is not supported on this platform" "$LINENO" 5
++    fi
++fi
++
++# Set the define if this is the interpreter.  This is no longer actually used.
++if test "x$polyarch" = "xinterpret" ; then
++
+ $as_echo "#define INTERPRETED 1" >>confdefs.h
+ 
+-       polyarch=interpret
+ fi
+ 
+ # Put this test at the end where it's less likely to be missed.
+Index: polyml/configure.ac
+===================================================================
+--- polyml/configure.ac	(revision 1599)
++++ polyml/configure.ac	(revision 1600)
+@@ -368,10 +368,10 @@
+ # Test the --with-portable option to build the interpreter even if
+ # we have a code-generator.
+ AC_ARG_WITH([portable],
+-    [AS_HELP_STRING([--with-portable],
+-              [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])], [
+-    ac_cv_with_portable=yes], [
+-    ac_cv_with_portable=no])
++            [AS_HELP_STRING([--with-portable],
++              [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])],
++            [],
++            [with_portable=check])
+ 
+ case "${host_cpu}" in
+       i[[3456]]86*)
+@@ -384,28 +384,39 @@
+             ;;
+       sparc*)
+             AC_DEFINE([HOSTARCHITECTURE_SPARC], [1], [Define if the host is a Sparc (32 bit)])
+-            ac_cv_with_portable=yes
++            polyarch=interpret
+             ;;
+       power* | ppc*)
+             AC_DEFINE([HOSTARCHITECTURE_PPC], [1], [Define if the host is a Power PC (32 bit)])
+-            ac_cv_with_portable=yes
++            polyarch=interpret
+             ;;
+       arm*)
+             AC_DEFINE([HOSTARCHITECTURE_ARM], [1], [Define if the host is an ARM (32 bit)])
+-            ac_cv_with_portable=yes
++            polyarch=interpret
+             ;;
+       ia64*)
+             AC_DEFINE([HOSTARCHITECTURE_IA64], [1], [Define if the host is Itanium])
+-            ac_cv_with_portable=yes
++            polyarch=interpret
+         ;;
+       *) AC_MSG_ERROR([Poly/ML is not supported for this architecture]) ;;
+ esac
+ 
+-# If we have explicitly set --with-portable or we are on a machine without
+-# a code-generator set to use the interpreter.
+-if test "$ac_cv_with_portable" = "yes"; then
++# If we explicitly asked to use the interpreter set the architecture to interpreted.
++if test "x$with_portable" = "xyes" ; then
++    polyarch=interpret
++fi
++
++# If we asked not to use the interpreter check we have native code support.
++if test "x$with_portable" = "xno" ; then
++    if test "x$polyarch" = "xinterpret" ; then
++        AC_MSG_ERROR(
++            [--without-portable was given but native code is not supported on this platform])
++    fi
++fi
++
++# Set the define if this is the interpreter.  This is no longer actually used.
++if test "x$polyarch" = "xinterpret" ; then
+        AC_DEFINE([INTERPRETED], [1], [Define if using the interpreter] )
+-       polyarch=interpret
+ fi
+ 
+ # Put this test at the end where it's less likely to be missed.
diff --git a/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch b/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch
new file mode 100644
index 000000000000..2f6ce7b864bd
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch
@@ -0,0 +1,21 @@
+Index: polyml/mlsource/extra/XWindows/ml_bind.ML
+===================================================================
+--- polyml/mlsource/extra/XWindows/ml_bind.ML	(revision 1600)
++++ polyml/mlsource/extra/XWindows/ml_bind.ML	(revision 1601)
+@@ -2437,7 +2437,7 @@
+ 
+ exception XWindows = XWindows.XWindows;
+ 
+-let
++local
+   open XWindows;
+   
+   fun printRect _ _ (r:XRectangle) =
+@@ -2447,6 +2447,6 @@
+     PolyML.PrettyString ("Rect " ^ PolyML.makestring R)
+   end;
+ in
+-  PolyML.addPrettyPrinter printRect
++  val () = PolyML.addPrettyPrinter printRect
+ end;
+ 
diff --git a/dev-lang/polyml/polyml-5.5.0.ebuild b/dev-lang/polyml/polyml-5.5.0.ebuild
new file mode 100644
index 000000000000..18335afcb914
--- /dev/null
+++ b/dev-lang/polyml/polyml-5.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.5.0.ebuild,v 1.1 2012/09/20 13:16:34 gienah Exp $
+
+EAPI="4"
+
+inherit base autotools versionator
+
+# Although the download is called 5.5, after building it poly -v says
+# it is 5.5.0.
+MY_PV=$(get_version_component_range "1-2" "${PV}")
+MY_P="${PN}.${MY_PV}"
+
+DESCRIPTION="Poly/ML is a full implementation of Standard ML"
+HOMEPAGE="http://www.polyml.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X elibc_glibc +gmp portable test +threads"
+
+RDEPEND="X? ( x11-libs/openmotif )
+		gmp? ( >=dev-libs/gmp-5 )
+		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=("${FILESDIR}/${PN}-5.5.0-configure.patch"
+	"${FILESDIR}/${PN}-5.5.0-x-it-basis.patch"
+	"${FILESDIR}/${PN}-5.5.0-asm.patch")
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with X x) \
+		$(use_with gmp) \
+		$(use_with portable) \
+		$(use_with threads)
+}
+
+src_test() {
+	emake tests || die "tests failed"
+}