gentoo resync : 19.05.2018

4 files changed, 13 insertions, 9 deletions

diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index 4fb9e010007d..4d3ae19905ef 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -1,10 +1,10 @@
 AUX 13.5.1-gc74.patch 1985 BLAKE2B 9b1d45468acd1da5f6b6607e2538855f2e3182d095845a1e0132d8e8e1b755d25569b93d4d1c1ffbc840ec56109295e322c8667045d0ce409771ebb5d85423f2 SHA512 59c5e23773273d84f896373d58d57c251644130a6da8d8a8bcbf7d2a56de1e58339bbd9937806aa054b0334489ff4670dc11e5005f6f86182802d684d86c6f3f
 AUX 13.5.1-headers-gentoo.patch 365 BLAKE2B 85b0f0dd98835d5f4e625a390e92d7e8db48a61cd8d732cdd353babf6d806353e07b72ed7cfac688aef3299a28e7ce35e068db5844a37fa827da68786a202913 SHA512 e3e8c2b871420bf35b0e887b291203f882818e688392f99f22d18dc6da0710d23d38d2f4a02a92bf9a1eda2c3b7fd05b0e4d57d7e885896369ed89c10b0730ad
-AUX 16.1.3-build.patch 341 BLAKE2B 6a3b588010b66b6e060dfa29642bacea08e77e64cb9674c5677da69c3f3d7668e7893a16c67980b6ea87642c9961b475a29aafdf786afb3903ac4a6552164f30 SHA512 0af8f0704e79197a4d7857ae11f20f0086f2e1c3d2578ec613c6ce5df742e35b9676399d8f724528781a530426425a977646ec75b317f01609d17d3a98b04ef4
-AUX 16.1.3-headers-gentoo.patch 446 BLAKE2B db2adc332867435e799e2779fbad5ebb175b247db5de7ab436da6631d31dc8d6059736dbb41be6fd91b0fd8116ee84e361772ae5da29c1448627bbeb07212646 SHA512 a58b39deb9f8577da66216fd6902803019751171e4415149a89bdb72f13a006e5f6d9bede2312521162a0895340c1a1ce756b09bc0a18dccceca3e4c0950a7cb
 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 2418 BLAKE2B 31b225c1e1a462040de11ae342a330d9519b88507bb157edb39a1cbb1b80954a50cb129113f1f23a3a62ef51f2dd9a0c57810704fe28b8577679cee43058f2bb SHA512 e4ba51270ce279f09fc29574435ddee475d76c4d66b4a57d51a2235eb32da7aae1fbeadf946dcc1af6b67fbde6276b33a82d155ce38ae1213a2aadb55cf7519a
+EBUILD ecls-16.1.3.ebuild 2403 BLAKE2B 0299730c6924ca8167c18172e48c3424dcf26396cf0bb41ac6df700178715cb9799d1e6abdb8e7f18a0cc60c882f61c6c8ec05fe33e153d0cec26416c9fc9556 SHA512 2ec7914ed505ca8955f038c5c3158b33790080915bf3c08583509184ff299dcb63375081e438a9179aa585438141bc913a8cfabe82e8d85c8a3586ad016f8e60
 MISC metadata.xml 901 BLAKE2B 96892af45b0d5c6b7c0e0ee20010ce7ac068a25d024d31f2dae1acd730aaa62f7589f322d7ad0ade27a03cdae7eeef5297adcd9fb821ca67d4e1ba88de1c2a17 SHA512 15403f25533646601eb454946599d1d97353038286df0d075f923b598fe44047e525745a33f7e3dbc15fee717d6311abbe546371ecbc4c9df347771dd5c007e9
diff --git a/dev-lisp/ecls/ecls-16.1.3.ebuild b/dev-lisp/ecls/ecls-16.1.3.ebuild
index 129d07b53568..6b3789c3ed9b 100644
--- a/dev-lisp/ecls/ecls-16.1.3.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit eutils multilib
 
 # test phase only works if ecls already installed #516876
@@ -30,6 +31,11 @@ RDEPEND="${CDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}/${P}-headers-gentoo.patch"
+	"${FILESDIR}/${P}-build.patch"
+)
+
 pkg_setup () {
 	if use gengc || use precisegc ; then
 		ewarn "You have enabled the generational garbage collector or"
@@ -40,8 +46,7 @@ pkg_setup () {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	epatch "${FILESDIR}"/${PV}-build.patch
+	default
 	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
 }
 
@@ -61,8 +66,7 @@ src_configure() {
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
 		$(use_with unicode unicode-names) \
-		$(use_with X x) \
-		$(use_with X clx)
+		$(use_with X x)
 }
 
 src_compile() {
diff --git a/dev-lisp/ecls/files/16.1.3-build.patch b/dev-lisp/ecls/files/ecls-16.1.3-build.patch
index ff7d6cd74d8b..ff7d6cd74d8b 100644
--- a/dev-lisp/ecls/files/16.1.3-build.patch
+++ b/dev-lisp/ecls/files/ecls-16.1.3-build.patch
diff --git a/dev-lisp/ecls/files/16.1.3-headers-gentoo.patch b/dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch
index 10802aa48803..10802aa48803 100644
--- a/dev-lisp/ecls/files/16.1.3-headers-gentoo.patch
+++ b/dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch