From 408fde59e3d343c48c94311bc3f8e8c0c49f9c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Fri, 19 Aug 2016 23:07:35 +0200 Subject: Cleanup --- dev-lang/polyml/Manifest | 1 - dev-lang/polyml/files/polyml-5.4.1-asm.patch | 28 ----- dev-lang/polyml/files/polyml-5.4.1-configure.patch | 11 -- dev-lang/polyml/files/polyml-5.5.0-asm.patch | 10 -- dev-lang/polyml/files/polyml-5.5.0-configure.patch | 138 --------------------- .../polyml/files/polyml-5.5.0-x-it-basis.patch | 21 ---- dev-lang/polyml/polyml-5.5.1.ebuild | 46 ------- 7 files changed, 255 deletions(-) delete mode 100644 dev-lang/polyml/Manifest delete mode 100644 dev-lang/polyml/files/polyml-5.4.1-asm.patch delete mode 100644 dev-lang/polyml/files/polyml-5.4.1-configure.patch delete mode 100644 dev-lang/polyml/files/polyml-5.5.0-asm.patch delete mode 100644 dev-lang/polyml/files/polyml-5.5.0-configure.patch delete mode 100644 dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch delete mode 100644 dev-lang/polyml/polyml-5.5.1.ebuild (limited to 'dev-lang/polyml') diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest deleted file mode 100644 index e3bf7d4..0000000 --- a/dev-lang/polyml/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST polyml.5.5.1.tar.gz 5465794 SHA256 cf8009dabc8b5d308d92e201dcd01f17ce14289d30caa8021a87365f4b8e209a SHA512 283954c8bf5599d83ea69916b827b1acae7137fe4add67537026092da2e6f1a89d71d3a394dbba599bbe9e967ded1446f39f4d81afb90301532db6be949f7a6f WHIRLPOOL 5bfeb8dcedcfe9b0a925ed089abc246d70d1269631ee46e9c78b123d461afb80e68640d6c08d77f47e69b0c244e9c7a27750dd7350741911e007f9dbcb2e7f76 diff --git a/dev-lang/polyml/files/polyml-5.4.1-asm.patch b/dev-lang/polyml/files/polyml-5.4.1-asm.patch deleted file mode 100644 index af8bd8d..0000000 --- a/dev-lang/polyml/files/polyml-5.4.1-asm.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- polyml.5.4.1-orig/libpolyml/x86asm.asm 2011-07-13 00:06:49.000000000 +1000 -+++ polyml.5.4.1/libpolyml/x86asm.asm 2012-01-08 16:00:09.740684843 +1100 -@@ -2714,4 +2714,7 @@ - - - ENDIF -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif - END ---- polyml.5.4.1-orig/libpolyml/power_assembly.S 2010-04-09 01:49:20.000000000 +1000 -+++ polyml.5.4.1/libpolyml/power_assembly.S 2012-01-08 15:46:35.006200143 +1100 -@@ -1735,3 +1735,6 @@ - dd Mask_assign_byte /* 254 */ - dd Mask_assign_word /* 255 */ - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif ---- polyml.5.4.1-orig/libpolyml/sparc_assembly.S 2010-08-13 01:01:36.000000000 +1000 -+++ polyml.5.4.1/libpolyml/sparc_assembly.S 2012-01-08 15:46:12.516642791 +1100 -@@ -1498,3 +1498,6 @@ - .long Mask_assign_byte /* 254 */ - .long Mask_assign_word /* 255 */ - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/dev-lang/polyml/files/polyml-5.4.1-configure.patch b/dev-lang/polyml/files/polyml-5.4.1-configure.patch deleted file mode 100644 index aaaed02..0000000 --- a/dev-lang/polyml/files/polyml-5.4.1-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- polyml.5.4.1-orig/configure.ac 2010-09-03 21:22:40.000000000 +1000 -+++ polyml.5.4.1/configure.ac 2012-01-09 22:44:04.153668402 +1100 -@@ -321,7 +321,7 @@ - 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="$withval"], [ - ac_cv_with_portable=no]) - - case "${host_cpu}" in diff --git a/dev-lang/polyml/files/polyml-5.5.0-asm.patch b/dev-lang/polyml/files/polyml-5.5.0-asm.patch deleted file mode 100644 index cffa627..0000000 --- a/dev-lang/polyml/files/polyml-5.5.0-asm.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 1a2e114..0000000 --- a/dev-lang/polyml/files/polyml-5.5.0-configure.patch +++ /dev/null @@ -1,138 +0,0 @@ -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 deleted file mode 100644 index 2f6ce7b..0000000 --- a/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch +++ /dev/null @@ -1,21 +0,0 @@ -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.1.ebuild b/dev-lang/polyml/polyml-5.5.1.ebuild deleted file mode 100644 index ce344d5..0000000 --- a/dev-lang/polyml/polyml-5.5.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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.3 2012/12/05 09:49:35 gienah Exp $ - -EAPI="5" - -inherit base autotools versionator - -MY_P="${PN}.${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/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="X elibc_glibc +gmp portable test +threads" - -RDEPEND="X? ( x11-libs/motif ) - gmp? ( >=dev-libs/gmp-5 ) - elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) - virtual/libffi" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=("${FILESDIR}/${PN}-5.5.0-asm.patch") - -src_prepare() { - base_src_prepare - eautoreconf -} - -src_configure() { - econf \ - --with-system-libffi \ - $(use_with X x) \ - $(use_with gmp) \ - $(use_with portable) \ - $(use_with threads) -} - -src_test() { - emake tests || die "tests failed" -} -- cgit v1.2.3