Package move dev-lisp/ecls to dev-lisp/ecl

Closes: https://bugs.gentoo.org/586230
Signed-off-by: Ulrich Müller <ulm@gentoo.org>

25 files changed, 34 insertions, 37 deletions

diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecl/Manifest
index 6cb34002d034..6cb34002d034 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecl/Manifest
diff --git a/dev-lisp/ecls/ecls-21.2.1-r4.ebuild b/dev-lisp/ecl/ecl-21.2.1-r5.ebuild
index 9a65ec277840..a12f59e6b270 100644
--- a/dev-lisp/ecls/ecls-21.2.1-r4.ebuild
+++ b/dev-lisp/ecl/ecl-21.2.1-r5.ebuild
@@ -5,17 +5,15 @@ EAPI=7
 
 inherit readme.gentoo-r1
 
-MY_P=ecl-${PV}
 DESCRIPTION="ECL is an embeddable Common Lisp implementation"
 HOMEPAGE="https://common-lisp.net/project/ecl/"
-SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${MY_P}.tgz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~ppc ppc64 ~sparc x86 ~amd64-linux"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
-# test phase only works if ecls already installed #516876
+# test phase only works if ecl already installed #516876
 RESTRICT="test"
 
 RDEPEND="dev-libs/gmp:0=
diff --git a/dev-lisp/ecls/ecls-23.9.9.ebuild b/dev-lisp/ecl/ecl-23.9.9-r1.ebuild
index d547a6fc1135..37c1e50a8e0d 100644
--- a/dev-lisp/ecls/ecls-23.9.9.ebuild
+++ b/dev-lisp/ecl/ecl-23.9.9-r1.ebuild
@@ -5,17 +5,15 @@ EAPI=7
 
 inherit readme.gentoo-r1
 
-MY_P=ecl-${PV}
 DESCRIPTION="ECL is an embeddable Common Lisp implementation"
 HOMEPAGE="https://common-lisp.net/project/ecl/"
-SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${MY_P}.tgz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
-# test phase only works if ecls already installed #516876
+# test phase only works if ecl already installed #516876
 RESTRICT="test"
 
 RDEPEND="dev-libs/gmp:0=
diff --git a/dev-lisp/ecls/files/README.gentoo b/dev-lisp/ecl/files/README.gentoo
index c95b6cb75167..c95b6cb75167 100644
--- a/dev-lisp/ecls/files/README.gentoo
+++ b/dev-lisp/ecl/files/README.gentoo
diff --git a/dev-lisp/ecls/files/ecls-16.1.3-build.patch b/dev-lisp/ecl/files/ecl-16.1.3-build.patch
index ff7d6cd74d8b..ff7d6cd74d8b 100644
--- a/dev-lisp/ecls/files/ecls-16.1.3-build.patch
+++ b/dev-lisp/ecl/files/ecl-16.1.3-build.patch
diff --git a/dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch b/dev-lisp/ecl/files/ecl-16.1.3-headers-gentoo.patch
index 10802aa48803..10802aa48803 100644
--- a/dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch
+++ b/dev-lisp/ecl/files/ecl-16.1.3-headers-gentoo.patch
diff --git a/dev-lisp/ecls/files/ecls-21.2.1-donotcompressinfo.patch b/dev-lisp/ecl/files/ecl-21.2.1-donotcompressinfo.patch
index 722e5dc7483f..722e5dc7483f 100644
--- a/dev-lisp/ecls/files/ecls-21.2.1-donotcompressinfo.patch
+++ b/dev-lisp/ecl/files/ecl-21.2.1-donotcompressinfo.patch
diff --git a/dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch b/dev-lisp/ecl/files/ecl-21.2.1-ldflags.patch
index 5ac4cc5ea793..5ac4cc5ea793 100644
--- a/dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch
+++ b/dev-lisp/ecl/files/ecl-21.2.1-ldflags.patch
diff --git a/dev-lisp/ecls/metadata.xml b/dev-lisp/ecl/metadata.xml
index ec56a70b425e..ec56a70b425e 100644
--- a/dev-lisp/ecls/metadata.xml
+++ b/dev-lisp/ecl/metadata.xml
diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
index b2dbff3513de..26d31268a598 100644
--- a/eclass/common-lisp-3.eclass
+++ b/eclass/common-lisp-3.eclass
@@ -21,7 +21,7 @@ _COMMON_LISP_3_ECLASS=1
 # @ECLASS_VARIABLE: CLIMPLEMENTATIONS
 # @DESCRIPTION:
 # Common Lisp implementations
-CLIMPLEMENTATIONS="sbcl clisp clozurecl cmucl ecls gcl abcl"
+CLIMPLEMENTATIONS="sbcl clisp clozurecl cmucl ecl gcl abcl"
 
 # @ECLASS_VARIABLE: CLSOURCEROOT
 # @DESCRIPTION:
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 40cc5b1b0035..3e17c184e946 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -69,7 +69,7 @@
 # keyworded on amd64
 -clisp
 -clozurecl64
--ecls
+-ecl
 -gcl
 -sbcl
 
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 3a6a556ad04d..fea25523e4a2 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -208,7 +208,7 @@ clisp
 clozurecl
 clozurecl64
 cmucl
-ecls
+ecl
 gcl
 sbcl
 
diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index 4c5e74f34a9e..53d3dbf8f248 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -37,5 +37,5 @@ java
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # keyworded on ppc
 -clisp
--ecls
+-ecl
 -sbcl
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index f37bb699d2a5..2cedd7b5ce8f 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -37,7 +37,7 @@ aria2
 
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # no stable versions on ppc
-ecls
+ecl
 sbcl
 
 # Chí-Thanh Christopher Nguyễn (2014-03-25)
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index fefe54675310..1414ed37ec1a 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -66,7 +66,7 @@ physfs
 
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # keyworded on sparc
--ecls
+-ecl
 -sbcl
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 868e5ba4559f..ea9608db6100 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -25,7 +25,7 @@ clamav
 
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # no stable version on sparc
-ecls
+ecl
 sbcl
 
 # Pacho Ramos <pacho@gentoo.org> (2014-04-17)
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index bb3406faf4cc..b33814159e81 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -61,7 +61,7 @@ webengine
 -clisp
 -clozurecl
 -cmucl
--ecls
+-ecl
 -gcl
 -sbcl
 
diff --git a/profiles/updates/3Q-2023 b/profiles/updates/3Q-2023
index a21ee95c6270..ef8e5fcc232e 100644
--- a/profiles/updates/3Q-2023
+++ b/profiles/updates/3Q-2023
@@ -15,3 +15,4 @@ move dev-python/rapidfuzz_capi dev-python/rapidfuzz-capi
 move dev-python/line_profiler dev-python/line-profiler
 move dev-python/memory_profiler dev-python/memory-profiler
 move dev-libs/paho-mqtt-c net-libs/paho-mqtt-c
+move dev-lisp/ecls dev-lisp/ecl
diff --git a/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild b/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild
index d3898d2d8e64..de065478169c 100644
--- a/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild
@@ -14,11 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl gcl ecls clisp clozurecl )
+LISPS=( sbcl cmucl gcl ecl clisp clozurecl )
 # Version restrictions, . means no restrictions
-REST=(  .    .     .   .    .     . )
+REST=(  .    .     .   .   .     . )
 # command name: . means just ${LISP}
-COMS=(  .    lisp  .   ecl  .     ccl )
+COMS=(  .    lisp  .   .   .     ccl )
 
 IUSE="${LISPS[*]} X emacs gmp"
 RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
diff --git a/sci-mathematics/fricas/fricas-1.3.9.ebuild b/sci-mathematics/fricas/fricas-1.3.9.ebuild
index 7d21f5311d26..f64df558213a 100644
--- a/sci-mathematics/fricas/fricas-1.3.9.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.9.ebuild
@@ -15,11 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl gcl ecls clisp clozurecl )
+LISPS=( sbcl cmucl gcl ecl clisp clozurecl )
 # Version restrictions, . means no restrictions
-REST=(  .    .     .   .    .     . )
+REST=(  .    .     .   .   .     . )
 # command name: . means just ${LISP}
-COMS=(  .    lisp  .   ecl  .     ccl )
+COMS=(  .    lisp  .   .   .     ccl )
 
 IUSE="${LISPS[*]} X emacs gmp"
 RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
diff --git a/sci-mathematics/fricas/metadata.xml b/sci-mathematics/fricas/metadata.xml
index 5f547acf8a41..1b9f80f6162c 100644
--- a/sci-mathematics/fricas/metadata.xml
+++ b/sci-mathematics/fricas/metadata.xml
@@ -18,8 +18,8 @@
     (<pkg>dev-lisp/gcl</pkg>)</flag>
     <flag name="sbcl">Add support for Steel Bank Common Lisp
     (<pkg>dev-lisp/sbcl</pkg>)</flag>
-    <flag name="ecls">Add support for Embeddable Common Lisp
-    (<pkg>dev-lisp/ecls</pkg>)</flag>
+    <flag name="ecl">Add support for Embeddable Common Lisp
+    (<pkg>dev-lisp/ecl</pkg>)</flag>
     <flag name="clozurecl">Add support for Clozure Common Lisp
     (<pkg>dev-lisp/clozurecl</pkg>)</flag>
   </use>
diff --git a/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
index f7a15f268d76..2b78de101a0f 100644
--- a/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test"
+IUSE="clisp clozurecl clozurecl64 cmucl ecl emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
 
 # Languages
@@ -29,7 +29,7 @@ LISP_DEPEND="
 	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
 	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
 	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
-	ecls? ( dev-lisp/ecls:= app-misc/rlwrap )
+	ecl? ( dev-lisp/ecl:= app-misc/rlwrap )
 	gcl? ( <dev-lisp/gcl-2.6.14[ansi,readline] )
 	sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap )
 "
@@ -82,7 +82,7 @@ RDEPEND="
 # viewer) from the console, but you can't use the xmaxima GUI without X.
 REQUIRED_USE="
 	vtk? ( ${PYTHON_REQUIRED_USE} )
-	|| ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
+	|| ( clisp clozurecl clozurecl64 cmucl ecl gcl sbcl )
 	gui? ( X )"
 
 TEXMF="${EPREFIX}"/usr/share/texmf-site
@@ -151,7 +151,7 @@ src_configure() {
 		$(use_enable clozurecl64 ccl64) \
 		$(usex clozurecl64 "--with-ccl64=ccl" "") \
 		$(use_enable cmucl) \
-		$(use_enable ecls ecl) \
+		$(use_enable ecl) \
 		$(use_enable emacs) \
 		$(use_enable gcl) \
 		$(use_with gui wish) \
@@ -203,7 +203,7 @@ src_install() {
 		fi
 	fi
 
-	if use ecls; then
+	if use ecl; then
 		# Use ECL to find the path where it expects to load packages from.
 		ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
 		insinto "${ECLLIB#${EPREFIX}}"
diff --git a/sci-mathematics/maxima/maxima-5.47.0.ebuild b/sci-mathematics/maxima/maxima-5.47.0.ebuild
index 783f1b57f66f..8e34da83b705 100644
--- a/sci-mathematics/maxima/maxima-5.47.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.47.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test"
+IUSE="clisp clozurecl clozurecl64 cmucl ecl emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
 
 # Languages
@@ -29,7 +29,7 @@ LISP_DEPEND="
 	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
 	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
 	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
-	ecls? ( dev-lisp/ecls:= app-misc/rlwrap )
+	ecl? ( dev-lisp/ecl:= app-misc/rlwrap )
 	gcl? ( >=dev-lisp/gcl-2.6.14[ansi,readline] )
 	sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap )
 "
@@ -82,7 +82,7 @@ RDEPEND="
 # viewer) from the console, but you can't use the xmaxima GUI without X.
 REQUIRED_USE="
 	vtk? ( ${PYTHON_REQUIRED_USE} )
-	|| ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
+	|| ( clisp clozurecl clozurecl64 cmucl ecl gcl sbcl )
 	gui? ( X )"
 
 TEXMF="${EPREFIX}"/usr/share/texmf-site
@@ -151,7 +151,7 @@ src_configure() {
 		$(use_enable clozurecl64 ccl64) \
 		$(usex clozurecl64 "--with-ccl64=ccl" "") \
 		$(use_enable cmucl) \
-		$(use_enable ecls ecl) \
+		$(use_enable ecl) \
 		$(use_enable emacs) \
 		$(use_enable gcl) \
 		$(use_with gui wish) \
@@ -203,7 +203,7 @@ src_install() {
 		fi
 	fi
 
-	if use ecls; then
+	if use ecl; then
 		# Use ECL to find the path where it expects to load packages from.
 		ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
 		insinto "${ECLLIB#${EPREFIX}}"
diff --git a/sci-mathematics/maxima/metadata.xml b/sci-mathematics/maxima/metadata.xml
index 8c7e1e80faa5..5e2cf6968da4 100644
--- a/sci-mathematics/maxima/metadata.xml
+++ b/sci-mathematics/maxima/metadata.xml
@@ -28,8 +28,8 @@
     (<pkg>dev-lisp/clozurecl</pkg>)</flag>
     <flag name="cmucl">Compile maxima with CMU Common Lisp
     (<pkg>dev-lisp/cmucl</pkg>)</flag>
-    <flag name="ecls">Compile maxima with Embeddable Common Lisp
-    (<pkg>dev-lisp/ecls</pkg>)</flag>
+    <flag name="ecl">Compile maxima with Embeddable Common Lisp
+    (<pkg>dev-lisp/ecl</pkg>)</flag>
     <flag name="gcl">Compile maxima with GNU Common Lisp
     (<pkg>dev-lisp/gcl</pkg>)</flag>
     <flag name="sbcl">Compile maxima with Steel Bank Common Lisp
diff --git a/virtual/commonlisp/commonlisp-0-r1.ebuild b/virtual/commonlisp/commonlisp-0-r1.ebuild
index 2084b937bf12..86f35e255f4f 100644
--- a/virtual/commonlisp/commonlisp-0-r1.ebuild
+++ b/virtual/commonlisp/commonlisp-0-r1.ebuild
@@ -13,7 +13,7 @@ RDEPEND="
 		dev-lisp/clisp
 		dev-lisp/clozurecl
 		dev-lisp/cmucl
-		dev-lisp/ecls
+		dev-lisp/ecl
 		dev-lisp/gcl
 		dev-lisp/abcl
 	)"