[gentoo-commits] proj/lisp:master commit in: dev-lisp/ecls/files/, dev-lisp/ecls/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "José María Alonso" <nimiux@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/lisp:master commit in: dev-lisp/ecls/files/, dev-lisp/ecls/
Date: Thu,  5 Oct 2017 21:18:44 +0000 (UTC)	[thread overview]
Message-ID: <1507238317.c731ffd61d59117e633b646840611fa5023d4b0d.nimiux@gentoo> (raw)

commit:     c731ffd61d59117e633b646840611fa5023d4b0d
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  5 21:18:37 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu Oct  5 21:18:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=c731ffd6

dev-lisp/ecls: Syncs with gentoo repository

 ...cls-12.12.1-r4.ebuild => ecls-13.5.1-r1.ebuild} | 25 +++++-----
 .../{ecls-12.12.1-r4.ebuild => ecls-15.3.7.ebuild} | 24 +++++----
 ...cls-12.12.1-r4.ebuild => ecls-16.0.0-r1.ebuild} | 31 +++++++-----
 .../{ecls-12.12.1-r4.ebuild => ecls-16.0.0.ebuild} | 30 +++++++-----
 ...cls-12.12.1-r4.ebuild => ecls-16.1.2-r1.ebuild} | 31 +++++++-----
 .../{ecls-12.12.1-r4.ebuild => ecls-16.1.2.ebuild} | 30 +++++++-----
 .../{ecls-12.12.1-r4.ebuild => ecls-16.1.3.ebuild} | 32 +++++++-----
 dev-lisp/ecls/files/12.12.1-headers-gentoo.patch   | 17 -------
 dev-lisp/ecls/files/13.5.1-gc74.patch              | 57 ++++++++++++++++++++++
 dev-lisp/ecls/files/13.5.1-headers-gentoo.patch    | 13 +++++
 dev-lisp/ecls/files/15.3.7-headers-gentoo.patch    | 13 +++++
 dev-lisp/ecls/files/16.0.0-headers-gentoo.patch    | 13 +++++
 dev-lisp/ecls/files/16.1.2-headers-gentoo.patch    | 13 +++++
 dev-lisp/ecls/files/16.1.3-build.patch             | 10 ++++
 dev-lisp/ecls/files/16.1.3-headers-gentoo.patch    | 15 ++++++
 dev-lisp/ecls/files/README.Gentoo                  |  6 ++-
 dev-lisp/ecls/metadata.xml                         | 22 +++++++++
 17 files changed, 278 insertions(+), 104 deletions(-)

diff --git a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild b/dev-lisp/ecls/ecls-13.5.1-r1.ebuild
similarity index 77%
copy from dev-lisp/ecls/ecls-12.12.1-r4.ebuild
copy to dev-lisp/ecls/ecls-13.5.1-r1.ebuild
index 0455a830..19c50b0e 100644
--- a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild
+++ b/dev-lisp/ecls/ecls-13.5.1-r1.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+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."
+DESCRIPTION="ECL is an embeddable Common Lisp implementation"
 HOMEPAGE="http://ecls.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-RESTRICT="mirror"
 
 LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug emacs gengc precisegc sse +threads +unicode X"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
 
-CDEPEND="dev-libs/gmp:0
+CDEPEND="dev-libs/gmp
 		virtual/libffi
 		>=dev-libs/boehm-gc-7.1[threads?]
 		>=dev-lisp/asdf-2.33-r3:="
@@ -39,7 +40,9 @@ pkg_setup () {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# bug #496780
+	epatch "${FILESDIR}"/${PV}-gc74.patch
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
 }
 
 src_configure() {
@@ -51,7 +54,7 @@ src_configure() {
 		$(use_enable gengc) \
 		$(use_enable precisegc) \
 		$(use_with debug debug-cflags) \
-		$(use_with sse) \
+		$(use_with cpu_flags_x86_sse sse) \
 		$(use_enable threads) \
 		$(use_with threads __thread) \
 		$(use_enable unicode) \

diff --git a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild b/dev-lisp/ecls/ecls-15.3.7.ebuild
similarity index 75%
copy from dev-lisp/ecls/ecls-12.12.1-r4.ebuild
copy to dev-lisp/ecls/ecls-15.3.7.ebuild
index 0455a830..d8991988 100644
--- a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild
+++ b/dev-lisp/ecls/ecls-15.3.7.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+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."
+DESCRIPTION="ECL is an embeddable Common Lisp implementation"
 HOMEPAGE="http://ecls.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-RESTRICT="mirror"
 
 LICENSE="BSD LGPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug emacs gengc precisegc sse +threads +unicode X"
+IUSE="debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
 		virtual/libffi
+		libatomic? ( dev-libs/libatomic_ops )
 		>=dev-libs/boehm-gc-7.1[threads?]
 		>=dev-lisp/asdf-2.33-r3:="
 DEPEND="${CDEPEND}
@@ -39,22 +41,24 @@ pkg_setup () {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	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 \
+		--enable-longdouble=yes \
 		--with-dffi \
 		$(use_enable gengc) \
 		$(use_enable precisegc) \
 		$(use_with debug debug-cflags) \
-		$(use_with sse) \
+		$(use_enable libatomic libatomic system) \
+		$(use_with cpu_flags_x86_sse sse) \
 		$(use_enable threads) \
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
+		$(use_with unicode unicode-names) \
 		$(use_with X x) \
 		$(use_with X clx)
 }

diff --git a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild b/dev-lisp/ecls/ecls-16.0.0-r1.ebuild
similarity index 69%
copy from dev-lisp/ecls/ecls-12.12.1-r4.ebuild
copy to dev-lisp/ecls/ecls-16.0.0-r1.ebuild
index 0455a830..27b77ccd 100644
--- a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild
+++ b/dev-lisp/ecls/ecls-16.0.0-r1.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+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"
-RESTRICT="mirror"
+DESCRIPTION="ECL is an embeddable Common Lisp implementation"
+HOMEPAGE="https://common-lisp.net/project/ecl/"
+SRC_URI="https://common-lisp.net/project/ecl/files/${MY_P}.tgz"
 
 LICENSE="BSD LGPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug emacs gengc precisegc sse +threads +unicode X"
+IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
 		virtual/libffi
+		libatomic? ( dev-libs/libatomic_ops )
 		>=dev-libs/boehm-gc-7.1[threads?]
 		>=dev-lisp/asdf-2.33-r3:="
 DEPEND="${CDEPEND}
@@ -39,22 +41,25 @@ pkg_setup () {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	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 \
+		--enable-longdouble=yes \
 		--with-dffi \
+		$(use_with cxx) \
 		$(use_enable gengc) \
 		$(use_enable precisegc) \
 		$(use_with debug debug-cflags) \
-		$(use_with sse) \
+		$(use_enable libatomic libatomic system) \
+		$(use_with cpu_flags_x86_sse sse) \
 		$(use_enable threads) \
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
+		$(use_with unicode unicode-names) \
 		$(use_with X x) \
 		$(use_with X clx)
 }
@@ -77,7 +82,7 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "Installation failed"
 
-	dodoc ANNOUNCEMENT Copyright
+	dodoc README CHANGELOG Copyright
 	dodoc "${FILESDIR}"/README.Gentoo
 	pushd build/doc
 	newman ecl.man ecl.1

diff --git a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild b/dev-lisp/ecls/ecls-16.0.0.ebuild
similarity index 69%
copy from dev-lisp/ecls/ecls-12.12.1-r4.ebuild
copy to dev-lisp/ecls/ecls-16.0.0.ebuild
index 0455a830..93421df5 100644
--- a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild
+++ b/dev-lisp/ecls/ecls-16.0.0.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+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"
-RESTRICT="mirror"
+DESCRIPTION="ECL is an embeddable Common Lisp implementation"
+HOMEPAGE="https://common-lisp.net/project/ecl/"
+SRC_URI="https://common-lisp.net/project/ecl/files/${MY_P}.tgz"
 
 LICENSE="BSD LGPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug emacs gengc precisegc sse +threads +unicode X"
+IUSE="debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
 		virtual/libffi
+		libatomic? ( dev-libs/libatomic_ops )
 		>=dev-libs/boehm-gc-7.1[threads?]
 		>=dev-lisp/asdf-2.33-r3:="
 DEPEND="${CDEPEND}
@@ -39,22 +41,24 @@ pkg_setup () {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	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 \
+		--enable-longdouble=yes \
 		--with-dffi \
 		$(use_enable gengc) \
 		$(use_enable precisegc) \
 		$(use_with debug debug-cflags) \
-		$(use_with sse) \
+		$(use_enable libatomic libatomic system) \
+		$(use_with cpu_flags_x86_sse sse) \
 		$(use_enable threads) \
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
+		$(use_with unicode unicode-names) \
 		$(use_with X x) \
 		$(use_with X clx)
 }
@@ -77,7 +81,7 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "Installation failed"
 
-	dodoc ANNOUNCEMENT Copyright
+	dodoc README CHANGELOG Copyright
 	dodoc "${FILESDIR}"/README.Gentoo
 	pushd build/doc
 	newman ecl.man ecl.1

diff --git a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild b/dev-lisp/ecls/ecls-16.1.2-r1.ebuild
similarity index 69%
copy from dev-lisp/ecls/ecls-12.12.1-r4.ebuild
copy to dev-lisp/ecls/ecls-16.1.2-r1.ebuild
index 0455a830..9184abff 100644
--- a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.2-r1.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+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"
-RESTRICT="mirror"
+DESCRIPTION="ECL is an embeddable Common Lisp implementation"
+HOMEPAGE="https://common-lisp.net/project/ecl/"
+SRC_URI="https://common-lisp.net/project/ecl/files/release/${PV}/${MY_P}.tgz"
 
 LICENSE="BSD LGPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug emacs gengc precisegc sse +threads +unicode X"
+IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
 		virtual/libffi
+		libatomic? ( dev-libs/libatomic_ops )
 		>=dev-libs/boehm-gc-7.1[threads?]
 		>=dev-lisp/asdf-2.33-r3:="
 DEPEND="${CDEPEND}
@@ -39,22 +41,25 @@ pkg_setup () {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	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 \
+		--enable-longdouble=yes \
 		--with-dffi \
+		$(use_with cxx) \
 		$(use_enable gengc) \
 		$(use_enable precisegc) \
 		$(use_with debug debug-cflags) \
-		$(use_with sse) \
+		$(use_enable libatomic libatomic system) \
+		$(use_with cpu_flags_x86_sse sse) \
 		$(use_enable threads) \
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
+		$(use_with unicode unicode-names) \
 		$(use_with X x) \
 		$(use_with X clx)
 }
@@ -77,7 +82,7 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "Installation failed"
 
-	dodoc ANNOUNCEMENT Copyright
+	dodoc README.md CHANGELOG
 	dodoc "${FILESDIR}"/README.Gentoo
 	pushd build/doc
 	newman ecl.man ecl.1

diff --git a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild b/dev-lisp/ecls/ecls-16.1.2.ebuild
similarity index 69%
copy from dev-lisp/ecls/ecls-12.12.1-r4.ebuild
copy to dev-lisp/ecls/ecls-16.1.2.ebuild
index 0455a830..2b621d2b 100644
--- a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.2.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+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"
-RESTRICT="mirror"
+DESCRIPTION="ECL is an embeddable Common Lisp implementation"
+HOMEPAGE="https://common-lisp.net/project/ecl/"
+SRC_URI="https://common-lisp.net/project/ecl/files/release/${PV}/${MY_P}.tgz"
 
 LICENSE="BSD LGPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug emacs gengc precisegc sse +threads +unicode X"
+IUSE="debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
 		virtual/libffi
+		libatomic? ( dev-libs/libatomic_ops )
 		>=dev-libs/boehm-gc-7.1[threads?]
 		>=dev-lisp/asdf-2.33-r3:="
 DEPEND="${CDEPEND}
@@ -39,22 +41,24 @@ pkg_setup () {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	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 \
+		--enable-longdouble=yes \
 		--with-dffi \
 		$(use_enable gengc) \
 		$(use_enable precisegc) \
 		$(use_with debug debug-cflags) \
-		$(use_with sse) \
+		$(use_enable libatomic libatomic system) \
+		$(use_with cpu_flags_x86_sse sse) \
 		$(use_enable threads) \
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
+		$(use_with unicode unicode-names) \
 		$(use_with X x) \
 		$(use_with X clx)
 }
@@ -77,7 +81,7 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "Installation failed"
 
-	dodoc ANNOUNCEMENT Copyright
+	dodoc README.md CHANGELOG
 	dodoc "${FILESDIR}"/README.Gentoo
 	pushd build/doc
 	newman ecl.man ecl.1

diff --git a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild b/dev-lisp/ecls/ecls-16.1.3.ebuild
similarity index 67%
rename from dev-lisp/ecls/ecls-12.12.1-r4.ebuild
rename to dev-lisp/ecls/ecls-16.1.3.ebuild
index 0455a830..129d07b5 100644
--- a/dev-lisp/ecls/ecls-12.12.1-r4.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.3.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+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"
-RESTRICT="mirror"
+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"
 
 LICENSE="BSD LGPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug emacs gengc precisegc sse +threads +unicode X"
+IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
 		virtual/libffi
+		libatomic? ( dev-libs/libatomic_ops )
 		>=dev-libs/boehm-gc-7.1[threads?]
 		>=dev-lisp/asdf-2.33-r3:="
 DEPEND="${CDEPEND}
@@ -39,22 +41,26 @@ pkg_setup () {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	epatch "${FILESDIR}"/${PV}-build.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 \
+		--enable-longdouble=yes \
 		--with-dffi \
+		$(use_with cxx) \
 		$(use_enable gengc) \
 		$(use_enable precisegc) \
 		$(use_with debug debug-cflags) \
-		$(use_with sse) \
+		$(use_enable libatomic libatomic system) \
+		$(use_with cpu_flags_x86_sse sse) \
 		$(use_enable threads) \
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
+		$(use_with unicode unicode-names) \
 		$(use_with X x) \
 		$(use_with X clx)
 }
@@ -77,7 +83,7 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "Installation failed"
 
-	dodoc ANNOUNCEMENT Copyright
+	dodoc README.md CHANGELOG
 	dodoc "${FILESDIR}"/README.Gentoo
 	pushd build/doc
 	newman ecl.man ecl.1

diff --git a/dev-lisp/ecls/files/12.12.1-headers-gentoo.patch b/dev-lisp/ecls/files/12.12.1-headers-gentoo.patch
deleted file mode 100644
index 635fc5d4..00000000
--- a/dev-lisp/ecls/files/12.12.1-headers-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur ecl-8.12.0.orig/src/h/object.h ecl-8.12.0/src/h/object.h
---- ecl.orig/src/h/object.h	2008-12-17 16:41:53.000000000 +0100
-+++ ecl/src/h/object.h	2008-12-17 19:35:05.000000000 +0100
-@@ -23,8 +23,13 @@
- 	Integer and boolean types (see config.h)
- */
- 
-+#ifndef TRUE
- #define	TRUE		1	/*  boolean true value  */
-+#endif
-+
-+#ifndef FALSE
- #define	FALSE		0	/*  boolean false value  */
-+#endif
- 
- #if !defined(__cplusplus) && !defined(bool)
- typedef int bool;

diff --git a/dev-lisp/ecls/files/13.5.1-gc74.patch b/dev-lisp/ecls/files/13.5.1-gc74.patch
new file mode 100644
index 00000000..a1069b21
--- /dev/null
+++ b/dev-lisp/ecls/files/13.5.1-gc74.patch
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 00000000..958b948b
--- /dev/null
+++ b/dev-lisp/ecls/files/13.5.1-headers-gentoo.patch
@@ -0,0 +1,13 @@
+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
+ 

diff --git a/dev-lisp/ecls/files/15.3.7-headers-gentoo.patch b/dev-lisp/ecls/files/15.3.7-headers-gentoo.patch
new file mode 100644
index 00000000..958b948b
--- /dev/null
+++ b/dev-lisp/ecls/files/15.3.7-headers-gentoo.patch
@@ -0,0 +1,13 @@
+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
+ 

diff --git a/dev-lisp/ecls/files/16.0.0-headers-gentoo.patch b/dev-lisp/ecls/files/16.0.0-headers-gentoo.patch
new file mode 100644
index 00000000..1c08bc57
--- /dev/null
+++ b/dev-lisp/ecls/files/16.0.0-headers-gentoo.patch
@@ -0,0 +1,13 @@
+diff -r -U1 ecl-16.0.0.orig/src/h/object.h ecl-16.0.0/src/h/object.h
+--- ecl-16.0.0.orig/src/h/object.h	2015-08-24 12:41:27.000000000 +0600
++++ ecl-16.0.0/src/h/object.h	2015-08-29 12:04:58.249594669 +0600
+@@ -25,4 +25,9 @@
+ 
++#ifndef TRUE
+ #define TRUE            1       /*  boolean true value  */
++#endif
++
++#ifndef FALSE
+ #define FALSE           0       /*  boolean false value  */
++#endif
+ 

diff --git a/dev-lisp/ecls/files/16.1.2-headers-gentoo.patch b/dev-lisp/ecls/files/16.1.2-headers-gentoo.patch
new file mode 100644
index 00000000..193822a8
--- /dev/null
+++ b/dev-lisp/ecls/files/16.1.2-headers-gentoo.patch
@@ -0,0 +1,13 @@
+diff -r -U1 ecl-16.1.2.orig/src/h/object.h ecl-16.1.2/src/h/object.h
+--- ecl-16.1.2.orig/src/h/object.h	2016-02-25 08:06:19.000000000 +0100
++++ ecl-16.1.2/src/h/object.h	2016-02-29 12:46:56.846308964 +0100
+@@ -27,4 +27,9 @@
+ 
++#ifndef TRUE
+ #define TRUE            1       /*  boolean true value  */
++#endif
++
++#ifndef FALSE
+ #define FALSE           0       /*  boolean false value  */
++#endif
+ 

diff --git a/dev-lisp/ecls/files/16.1.3-build.patch b/dev-lisp/ecls/files/16.1.3-build.patch
new file mode 100644
index 00000000..ff7d6cd7
--- /dev/null
+++ b/dev-lisp/ecls/files/16.1.3-build.patch
@@ -0,0 +1,10 @@
+diff -r -U2 ecl-16.1.3.orig/src/c/printer/write_sse.d ecl-16.1.3/src/c/printer/write_sse.d
+--- ecl-16.1.3.orig/src/c/printer/write_sse.d	2016-12-19 17:25:00.000000000 +0700
++++ ecl-16.1.3/src/c/printer/write_sse.d	2016-12-19 19:20:01.863563607 +0700
+@@ -13,4 +13,6 @@
+  */
+ 
++#include <ecl/config.h>
++
+ #ifdef ECL_SSE2
+ #include <ecl/ecl.h>

diff --git a/dev-lisp/ecls/files/16.1.3-headers-gentoo.patch b/dev-lisp/ecls/files/16.1.3-headers-gentoo.patch
new file mode 100644
index 00000000..10802aa4
--- /dev/null
+++ b/dev-lisp/ecls/files/16.1.3-headers-gentoo.patch
@@ -0,0 +1,15 @@
+diff -r -U2 ecl-16.1.3.orig/src/h/object.h ecl-16.1.3/src/h/object.h
+--- ecl-16.1.3.orig/src/h/object.h	2016-12-19 17:25:00.000000000 +0700
++++ ecl-16.1.3/src/h/object.h	2016-12-19 19:22:21.147557750 +0700
+@@ -26,6 +26,11 @@
+ */
+ 
++#ifndef TRUE
+ #define TRUE            1       /*  boolean true value  */
++#endif
++
++#ifndef FALSE
+ #define FALSE           0       /*  boolean false value  */
++#endif
+ 
+ #if !defined(__cplusplus) && !defined(bool)

diff --git a/dev-lisp/ecls/files/README.Gentoo b/dev-lisp/ecls/files/README.Gentoo
index fa211e64..9bb82f22 100644
--- a/dev-lisp/ecls/files/README.Gentoo
+++ b/dev-lisp/ecls/files/README.Gentoo
@@ -1,11 +1,15 @@
+-*- outline -*-
+
 Gentoo GNU/Linux specific notes for ECL
 ---------------------------------------
 
+This is the README.Gentoo file from /usr/share/doc/@PF@/ directory.
+
   * The Gentoo port includes a patch to ECL's installed header file (ech.h) so
     that TRUE and FALSE are not redefined if they're already included from
     elsewhere. This makes it easier to use ECL with other software which defines
     those C preprocesser symbols (eg. glib-2.0).
 
-If you encounter any problems or have suggestions, use http://bugs.gentoo.org .
+If you encounter any problems or have suggestions, use http://bugs.gentoo.org.
 Please don't bother the upstream authors unless you are absolutely certain it is
 not Gentoo-related.

diff --git a/dev-lisp/ecls/metadata.xml b/dev-lisp/ecls/metadata.xml
new file mode 100644
index 00000000..8b14211e
--- /dev/null
+++ b/dev-lisp/ecls/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
+	<longdescription>
+ECL (Embeddable Common Lisp) is an implementation of the Common Lisp language as
+described in the X3J13 Ansi specification, featuring CLOS (Common Lisp Object
+System), conditions, loops, etc, plus a translator to C, which can produce
+standalone executables.
+</longdescription>
+	<use>
+		<flag name="gengc">Use generational garbage collection (experimental)</flag>
+		<flag name="precisegc">Use type information during garbage collection (experimental)</flag>
+		<flag name="libatomic">Use <pkg>dev-libs/libatomic_ops</pkg> library</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ecls</remote-id>
+	</upstream>
+</pkgmetadata>

next             reply	other threads:[~2017-10-05 21:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-05 21:18 José María Alonso [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-04-11 17:46 [gentoo-commits] proj/lisp:master commit in: dev-lisp/ecls/files/, dev-lisp/ecls/ José María Alonso

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:0455a83 dfblob:19c50b0 dfblob:0455a83 dfblob:d899198
dfblob:0455a83 dfblob:27b77cc dfblob:0455a83 dfblob:93421df
dfblob:0455a83 dfblob:9184abf dfblob:0455a83 dfblob:2b621d2
dfblob:0455a83 dfblob:129d07b dfblob:635fc5d dfblob:a1069b2
dfblob:958b948 dfblob:958b948 dfblob:1c08bc5 dfblob:193822a
dfblob:ff7d6cd dfblob:10802aa dfblob:fa211e6 dfblob:9bb82f2
dfblob:8b14211 )
 OR (
bs:"[gentoo-commits] proj/lisp:master commit in: dev-lisp/ecls/files/, dev-lisp/ecls/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1507238317.c731ffd61d59117e633b646840611fa5023d4b0d.nimiux@gentoo \
    --to=nimiux@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox