From 738941f9b12d4b56731db5045b9e90a8d5387401 Mon Sep 17 00:00:00 2001
From: Chema Alonso Josa <nimiux@gentoo.org>
Date: Fri, 18 May 2018 23:35:42 +0200
Subject: [PATCH] dev-lisp/ecls: Drop invalid configuration option

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 dev-lisp/ecls/ecls-16.1.3.ebuild                 | 16 ++++++++++------
 ...6.1.3-build.patch => ecls-16.1.3-build.patch} |  0
 ...oo.patch => ecls-16.1.3-headers-gentoo.patch} |  0
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename dev-lisp/ecls/files/{16.1.3-build.patch => ecls-16.1.3-build.patch} (100%)
 rename dev-lisp/ecls/files/{16.1.3-headers-gentoo.patch => ecls-16.1.3-headers-gentoo.patch} (100%)

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
similarity index 100%
rename from dev-lisp/ecls/files/16.1.3-build.patch
rename to 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
similarity index 100%
rename from dev-lisp/ecls/files/16.1.3-headers-gentoo.patch
rename to dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch
-- 
2.26.2