gentoo resync : 29.05.2018

5 files changed, 2 insertions, 165 deletions

diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index 9a80db063e88..25c581b0617f 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -1,10 +1,6 @@
-AUX 13.5.1-gc74.patch 1985 BLAKE2B 9b1d45468acd1da5f6b6607e2538855f2e3182d095845a1e0132d8e8e1b755d25569b93d4d1c1ffbc840ec56109295e322c8667045d0ce409771ebb5d85423f2 SHA512 59c5e23773273d84f896373d58d57c251644130a6da8d8a8bcbf7d2a56de1e58339bbd9937806aa054b0334489ff4670dc11e5005f6f86182802d684d86c6f3f
-AUX 13.5.1-headers-gentoo.patch 365 BLAKE2B 85b0f0dd98835d5f4e625a390e92d7e8db48a61cd8d732cdd353babf6d806353e07b72ed7cfac688aef3299a28e7ce35e068db5844a37fa827da68786a202913 SHA512 e3e8c2b871420bf35b0e887b291203f882818e688392f99f22d18dc6da0710d23d38d2f4a02a92bf9a1eda2c3b7fd05b0e4d57d7e885896369ed89c10b0730ad
 AUX README.Gentoo 632 BLAKE2B 3067b3165fb18fb2ef83a70513e73df3a10b94d97920931a15764e1f01d62db5c908fffd9bde06d1cee7b507884470025189aa3e4ab3c2273246071922d95744 SHA512 df0640792271d01f84437645fe8854740b17dd349e36b76711c55f6f4fefa7d2fd810176ece2a25d8cab88192f31a6df38e67dfcb7992857e5d038ad74b11c8a
 AUX ecls-16.1.3-build.patch 341 BLAKE2B 6a3b588010b66b6e060dfa29642bacea08e77e64cb9674c5677da69c3f3d7668e7893a16c67980b6ea87642c9961b475a29aafdf786afb3903ac4a6552164f30 SHA512 0af8f0704e79197a4d7857ae11f20f0086f2e1c3d2578ec613c6ce5df742e35b9676399d8f724528781a530426425a977646ec75b317f01609d17d3a98b04ef4
 AUX ecls-16.1.3-headers-gentoo.patch 446 BLAKE2B db2adc332867435e799e2779fbad5ebb175b247db5de7ab436da6631d31dc8d6059736dbb41be6fd91b0fd8116ee84e361772ae5da29c1448627bbeb07212646 SHA512 a58b39deb9f8577da66216fd6902803019751171e4415149a89bdb72f13a006e5f6d9bede2312521162a0895340c1a1ce756b09bc0a18dccceca3e4c0950a7cb
-DIST ecl-13.5.1.tgz 9401163 BLAKE2B 441f2ed429f9f508d12fec333aeed7178aedab0e2011c57fbf0c6695747de95e5db6818c5cfc6acd1097804a4cd7bf1dd0ec3e79c04a5b4399d61cefb5179ba7 SHA512 a09f8b824aa78e461d700eefb1a8b68b876e15d49124a397e0b5b58ad73b80f818133a7b8e48ddb83505eea2f9c5fb024de8701b527524004e336e456eb07c84
 DIST ecl-16.1.3.tgz 7459212 BLAKE2B 4f9d6ad2bd92ede4b5b20857b95a48bad5002049e83611865d9cf13e7131adfaad147a31f22f9a3f6a2c06e46db1996aa98135c28b97bf5ef16e17b5eba0dc4b SHA512 5d743f422f6bc24671abf4c739cde8273d08f056906a1ef8aed5145c703b6d52c7fa4b5e0be8c125f32240c20ce053007786bb3ae81cc34d47791f6fae0819c1
-EBUILD ecls-13.5.1-r1.ebuild 2231 BLAKE2B 7bb19af668e153b496feffba346c7cb8829d2c82d230f149c24d42a2800ae9ac9df75c1616b01e5c772c3c442070e83c020c870af98dd89c06b8585094f41d5d SHA512 8542ca9bad0122153931dd949006928d63475669b81c3a17f148c3be1ffe8874586965c0a43fa294b492ff210bdae7f302aa92d2cca9e3fef19a6ceef91c0ed7
-EBUILD ecls-16.1.3.ebuild 2407 BLAKE2B 0c576e31849f4f9f774a7e76d6c954899a6a13afcadedc40150ff6dfe844c560a34eb4f5dc7d5f6386dfe62531b9db870979e738fcc536a427f8b095b19a8460 SHA512 c4c4a0da74d12260415ed24f9178b5b62c1b0a0ab9451a8ab2b0409aa6dd00597dcaa4e63f3446ba13ddeab5c4fa01d3908d28b12f0c379da4f56110694cdfdf
+EBUILD ecls-16.1.3.ebuild 2406 BLAKE2B 95287ef8109fd47d030d46fed47bf0205ea4344cca2edeb177220ad751bbbf6be3240089ef49e2f2a5f6e75aea7cfef7a0b96873bf93e1dda17f104032b577d5 SHA512 fd4bfaeed4bb257724e33d105d499fc19f8d760a98ff8989eb08c540553c929ddb7478e644255bb1f1c5f239057d2666f1f6904d470b283d9c0234bf6767b9ed
 MISC metadata.xml 901 BLAKE2B 96892af45b0d5c6b7c0e0ee20010ce7ac068a25d024d31f2dae1acd730aaa62f7589f322d7ad0ade27a03cdae7eeef5297adcd9fb821ca67d4e1ba88de1c2a17 SHA512 15403f25533646601eb454946599d1d97353038286df0d075f923b598fe44047e525745a33f7e3dbc15fee717d6311abbe546371ecbc4c9df347771dd5c007e9
diff --git a/dev-lisp/ecls/ecls-13.5.1-r1.ebuild b/dev-lisp/ecls/ecls-13.5.1-r1.ebuild
deleted file mode 100644
index 19c50b0e32be..000000000000
--- a/dev-lisp/ecls/ecls-13.5.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-
-# test phase only works if ecls already installed #516876
-RESTRICT="test"
-
-MY_P=ecl-${PV}
-
-DESCRIPTION="ECL is an embeddable Common Lisp implementation"
-HOMEPAGE="http://ecls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="BSD LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
-
-CDEPEND="dev-libs/gmp
-		virtual/libffi
-		>=dev-libs/boehm-gc-7.1[threads?]
-		>=dev-lisp/asdf-2.33-r3:="
-DEPEND="${CDEPEND}
-		app-text/texi2html
-		emacs? ( virtual/emacs >=app-eselect/eselect-emacs-1.12 )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup () {
-	if use gengc || use precisegc ; then
-		ewarn "You have enabled the generational garbage collector or"
-		ewarn "the precise collection routines. These features are not very stable"
-		ewarn "at the moment and may cause crashes."
-		ewarn "Don't enable them unless you know what you're doing."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	# bug #496780
-	epatch "${FILESDIR}"/${PV}-gc74.patch
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-}
-
-src_configure() {
-	econf \
-		--with-system-gmp \
-		--enable-boehm=system \
-		--enable-longdouble \
-		--with-dffi \
-		$(use_enable gengc) \
-		$(use_enable precisegc) \
-		$(use_with debug debug-cflags) \
-		$(use_with cpu_flags_x86_sse sse) \
-		$(use_enable threads) \
-		$(use_with threads __thread) \
-		$(use_enable unicode) \
-		$(use_with X x) \
-		$(use_with X clx)
-}
-
-src_compile() {
-	if use emacs; then
-		local ETAGS=$(eselect --brief etags list | sed -ne '/emacs/{p;q}')
-		[[ -n ${ETAGS} ]] || die "No etags implementation found"
-		pushd build > /dev/null || die
-		emake ETAGS=${ETAGS} TAGS
-		popd > /dev/null
-	else
-		touch build/TAGS
-	fi
-
-	#parallel make fails
-	emake -j1 || die "Compilation failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc ANNOUNCEMENT Copyright
-	dodoc "${FILESDIR}"/README.Gentoo
-	pushd build/doc
-	newman ecl.man ecl.1
-	newman ecl-config.man ecl-config.1
-	popd
-}
diff --git a/dev-lisp/ecls/ecls-16.1.3.ebuild b/dev-lisp/ecls/ecls-16.1.3.ebuild
index 6df0adb3ed2e..d0b75dd9dd39 100644
--- a/dev-lisp/ecls/ecls-16.1.3.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${MY_P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
diff --git a/dev-lisp/ecls/files/13.5.1-gc74.patch b/dev-lisp/ecls/files/13.5.1-gc74.patch
deleted file mode 100644
index a1069b214b4b..000000000000
--- a/dev-lisp/ecls/files/13.5.1-gc74.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -r -U1 ecl-13.5.1.orig/src/aclocal.m4 ecl-13.5.1/src/aclocal.m4
---- ecl-13.5.1.orig/src/aclocal.m4	2013-05-28 03:37:36.000000000 +0700
-+++ ecl-13.5.1/src/aclocal.m4	2014-01-12 00:34:36.663129950 +0700
-@@ -942,2 +942,6 @@
-  fi
-+ if test "${system_boehm}" = "yes"; then
-+   AC_CHECK_LIB( [gc], [GC_set_start_callback],
-+                 [AC_DEFINE(HAVE_GC_SET_START_CALLBACK)], [] )
-+ fi
-  AC_MSG_CHECKING( [whether we can use the existing Boehm-Weiser library] )
-diff -r -U1 ecl-13.5.1.orig/src/c/alloc_2.d ecl-13.5.1/src/c/alloc_2.d
---- ecl-13.5.1.orig/src/c/alloc_2.d	2013-05-28 03:37:36.000000000 +0700
-+++ ecl-13.5.1/src/c/alloc_2.d	2014-01-12 00:43:44.177106924 +0700
-@@ -33,2 +33,9 @@
- 
-+static void (*GC_old_start_callback)(void) = NULL;
-+#ifdef HAVE_GC_START_CALLBACK
-+extern void GC_set_start_callback(void *);
-+extern void *GC_get_start_callback(void *);
-+#else
-+extern void *GC_start_call_back(void);
-+#endif
- static void gather_statistics();
-@@ -752,3 +759,2 @@
- extern void (*GC_push_other_roots)();
--extern void (*GC_start_call_back)();
- static void (*old_GC_push_other_roots)();
-@@ -1092,3 +1098,9 @@
- 	GC_push_other_roots = stacks_scanner;
-+#ifdef HAVE_GC_SET_START_CALLBACK
-+	GC_old_start_callback = GC_get_start_callback();
-+	GC_set_start_callback(gather_statistics);
-+#else
-+	GC_old_start_callback = GC_start_call_back;
- 	GC_start_call_back = (void (*)())gather_statistics;
-+#endif
- 	GC_java_finalization = 1;
-@@ -1200,3 +1212,3 @@
-  */
--#if 1 /*GBC_BOEHM == 0*/
-+#if GBC_BOEHM == 0
- extern int GC_print_stats;
-@@ -1279,2 +1291,4 @@
- 	}
-+	if (GC_old_start_callback)
-+		GC_old_start_callback();
- }
-Только в ecl-13.5.1/src/c: alloc_2.d.orig
-diff -r -U1 ecl-13.5.1.orig/src/h/config.h.in ecl-13.5.1/src/h/config.h.in
---- ecl-13.5.1.orig/src/h/config.h.in	2013-05-28 03:37:36.000000000 +0700
-+++ ecl-13.5.1/src/h/config.h.in	2014-01-12 00:34:36.663129950 +0700
-@@ -310,2 +310,5 @@
- 
-+/* GC_set_start_callback						*/
-+#define HAVE_GC_SET_START_CALLBACK
-+
- /*
diff --git a/dev-lisp/ecls/files/13.5.1-headers-gentoo.patch b/dev-lisp/ecls/files/13.5.1-headers-gentoo.patch
deleted file mode 100644
index 958b948bac41..000000000000
--- a/dev-lisp/ecls/files/13.5.1-headers-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -U1 ecl-13.5.1.orig/src/h/object.h ecl-13.5.1/src/h/object.h
---- ecl-13.5.1.orig/src/h/object.h	2013-05-28 03:37:36.000000000 +0700
-+++ ecl-13.5.1/src/h/object.h	2013-05-29 19:23:34.000000000 +0700
-@@ -25,4 +25,9 @@
- 
-+#ifndef TRUE
- #define	TRUE		1	/*  boolean true value  */
-+#endif
-+
-+#ifndef FALSE
- #define	FALSE		0	/*  boolean false value  */
-+#endif
-