From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- dev-lisp/ecls/Manifest | 12 +-- dev-lisp/ecls/ecls-16.1.3-r1.ebuild | 2 +- dev-lisp/ecls/ecls-20.4.24-r1.ebuild | 2 +- dev-lisp/ecls/ecls-21.2.1-r2.ebuild | 87 ---------------------- dev-lisp/ecls/ecls-21.2.1-r3.ebuild | 2 +- dev-lisp/ecls/ecls-21.2.1-r4.ebuild | 87 ++++++++++++++++++++++ dev-lisp/ecls/files/README.Gentoo | 15 ---- dev-lisp/ecls/files/README.gentoo | 13 ++++ .../ecls/files/ecls-21.2.1-donotcompressinfo.patch | 35 +++++++++ dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch | 13 ++++ 10 files changed, 158 insertions(+), 110 deletions(-) delete mode 100644 dev-lisp/ecls/ecls-21.2.1-r2.ebuild create mode 100644 dev-lisp/ecls/ecls-21.2.1-r4.ebuild delete mode 100644 dev-lisp/ecls/files/README.Gentoo create mode 100644 dev-lisp/ecls/files/README.gentoo create mode 100644 dev-lisp/ecls/files/ecls-21.2.1-donotcompressinfo.patch create mode 100644 dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch (limited to 'dev-lisp/ecls') diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest index 8d6dd501cf60..f842dab04b4e 100644 --- a/dev-lisp/ecls/Manifest +++ b/dev-lisp/ecls/Manifest @@ -1,11 +1,13 @@ -AUX README.Gentoo 632 BLAKE2B 3067b3165fb18fb2ef83a70513e73df3a10b94d97920931a15764e1f01d62db5c908fffd9bde06d1cee7b507884470025189aa3e4ab3c2273246071922d95744 SHA512 df0640792271d01f84437645fe8854740b17dd349e36b76711c55f6f4fefa7d2fd810176ece2a25d8cab88192f31a6df38e67dfcb7992857e5d038ad74b11c8a +AUX README.gentoo 565 BLAKE2B 8e260676fa3c8fab086035116ae6c81cbea821a82a7de7fbc80fac28664deb26c154eb23fe92f704ebe13f0e61a095f063cfefd0100a48f97e40030fa743465e SHA512 57598ef3411fefd766393640e550b704a0e5dca9f808007d34799273fa34858c3e9eb74fcd805611c5aa9914326faaaa78be5fa65bca63a8f7acd717bcf389b2 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 +AUX ecls-21.2.1-donotcompressinfo.patch 1023 BLAKE2B 6a1794bbba48c35ab21976bdfabadfd6baa20adb1e429bd50257add3058af2e0d93ade4307acd29e5a4335a96a728a24ce4ea59cddd3db50af4c963acd04e3a7 SHA512 dae180e0d41bc1e99cd11347625a48e3f55d7565cb269cacaf99b30e3c1bc9d8622dc9f738c900fd217cd5086d7a0f29f0ff05f2ab579af60835a31f5b68dfdd +AUX ecls-21.2.1-ldflags.patch 468 BLAKE2B 78b515f6ca6be7283bc1323d361a49a3712efe1d3de910b99c4c4156117696f19a3e2ca1d90b7613b22b4c67e23391e416b52f0deff7fe4c1bf70fe0c1b74452 SHA512 083da13a5ee67b8951b075f0bde7d90211c81b38bc8cffee3c96b8c3023c4ece157b8f00bcbd0e1be4dcc7075030d98b0d78f22c42412ef2d7b50153bf8cac33 DIST ecl-16.1.3.tgz 7459212 BLAKE2B 4f9d6ad2bd92ede4b5b20857b95a48bad5002049e83611865d9cf13e7131adfaad147a31f22f9a3f6a2c06e46db1996aa98135c28b97bf5ef16e17b5eba0dc4b SHA512 5d743f422f6bc24671abf4c739cde8273d08f056906a1ef8aed5145c703b6d52c7fa4b5e0be8c125f32240c20ce053007786bb3ae81cc34d47791f6fae0819c1 DIST ecl-20.4.24.tgz 7815444 BLAKE2B 11b908b028beaaf9243dc0f2ceaa178918ae4763a907af4424ba21e6bdf3474aaa36c96e9a3ef1ce780e50649c2453b52b7c46b5e9dc1453281dc522417ad78c SHA512 4c127e0d6a99e38f3a926135ae92d92899058c5a5e99b90f28d4a47b58d94ee89a958cfb4bfd2b9e6ad7b3c57867cd13119b2a4dd6bb1aa3bb5ec42a96bfa788 DIST ecl-21.2.1.tgz 7875088 BLAKE2B b8c05fab8ce5892ad9df830e3ad230e1c646bd30bc35243703ace18f1bf963057b132d980c74b364ff30a5b776a8f161e71bfd69d7908970811ab3dddbab1aac SHA512 0849bebe1a8073ea8027cfb172c1d7781d43adb6a8b80585bd08d5674b80422d1648b6fbf718cc17a51c5de6c696514523b4d13a82e8113bf9365c95d3c28648 -EBUILD ecls-16.1.3-r1.ebuild 2354 BLAKE2B dd7686cd0ea827c3afa9acf3ec51f2000f163af1ffbc7cfdb4f1933e89fe736affc72611317ac21629b67e67b6309c7502804fef5cb018dc91a83f51dee501f4 SHA512 ba4b1c237099a66eada955cb030cf30923d82f8a4b7dec5f479ea99b21bf6496827e2e33744a45e722c75a1bc1bfc131729ab8fe5a4189ecc20425f4355c9b1e -EBUILD ecls-20.4.24-r1.ebuild 2385 BLAKE2B 8381b26e42f047356d04e617a134d5df0e6da7ab2ab890378ffdefb9edc4fdf0c640417a6dca70c1c144858500b7770bd79748614c9b7aaf7d7b1908019fa71c SHA512 6aca45cbd7b782da8ee26febba631d618ffe9d08b7197f70cb9f0cc0167b7497a29224e2d8c6f0bc0a7033f0a900a3582166b1bc74607e32cd588fb421bbfc50 -EBUILD ecls-21.2.1-r2.ebuild 2073 BLAKE2B 681720e0a5b5434c3156ba4ef9f30cae8d7c344b61276fb0fccddda67076abda1c4fd9dbe8d55d26907de9f95bb6a5d9c95ebd6f3ef869903fcc50fc67a1df75 SHA512 5affced0ed23eb091eaab59b5c6e004b1ac4bddfdacc6d5871953fafd9c7e8357162d90aed60e4d61274d034b416a5e13824bb9d664aab571b1e10b69afb0b4c -EBUILD ecls-21.2.1-r3.ebuild 2032 BLAKE2B b8ccb00c98f3795e63843b9e1d27ef09ebadcf152796302fff5b11290f124eae9df0934082f2a0ace4d95e4850f1985c03595b19031b84ed8ed4da682a73f6d5 SHA512 55c8925d7f01f78d723358685e4115488f3b176cbee5140e773918e95f55889b66e4464ff2f5c1532cd915119441cb28100b705385f82eea92de32f773d24222 +EBUILD ecls-16.1.3-r1.ebuild 2354 BLAKE2B 96d5b7639e06d1b7b4e8fe5f340cb0f670f0be388c45982eee0db0349ea31e1939aaf7a122b303b3b280c01acc2fad20984a2a2d927c39f7c4a6db184a19cfa8 SHA512 272b1635c3caa74f0d701d37cdbe1da78987e47fb8e80c13f84b6e6aba2875c53fe463f99a0f9b9b9979deffbb039bc11ae252b49f8aa424fab1c3523f76aca2 +EBUILD ecls-20.4.24-r1.ebuild 2385 BLAKE2B 1f9965505be4b5b9fe41115b9fc771952c001ea0a1d74971a820813de7356ef2d6a4d531f3a7342dd26fe9ea8b2187ccb246a040eff2996ee5d84a68e37bc943 SHA512 b0f450e81f50305e15fd8e9e9ac65157efe975982ecbcbb93cc3bc4e759e94aef3e1a86486e88fb26207af6941f2caf1237b096ab0448675bb69da0b236325f8 +EBUILD ecls-21.2.1-r3.ebuild 2032 BLAKE2B a04f61b5fad3270086e20349dd777f1d9db6bcb2d4b0aecf98eae6eba398fc7d404dbc2fe9cf5c299a7c406b94b04df891dc7a72f3ddf8af8147ff4a46234182 SHA512 718df11e0cdfc8dbea9ca2b52f552a50d50086fe12e52ee0d8fa779dbb41bf56205ad88b98c4e12d6127f18c09d326ec2804b3b92f165132666b155db3e39ed6 +EBUILD ecls-21.2.1-r4.ebuild 2072 BLAKE2B 9a8f27f416a0cbdbfa3c10c94668267850d2ccd9f2519a1d763b38f75ed1e2a75d29690867f53be0064fa1db6fe2bb79b2c99bbc16c8831ed2c88a2b81f2fde4 SHA512 984c4632e4848a52a6b9dc9c676f04a490c600345749ae4b74f976c834c1505deaaaa3c8d29ec83fc388d35b7a142b1046b282f1ba6ad9f8a8bfaff9e161d2fa MISC metadata.xml 902 BLAKE2B cab2b4ab8766434eeb2c455b7119f80360dde182e3bfa75fb900d0ea32497a0758474337c5c9b33b68ea2fcd82b8745868c6da50ed79ae0af4a6f287c3d0fa06 SHA512 d1663bde77b96bf708f0cb2b5c71bfc2d6a99e830030c66eba9d097f61a32bae8b5c31cbcc4c6a1654914e662a04c4a9beaf89337372b858329bf349bac5ef97 diff --git a/dev-lisp/ecls/ecls-16.1.3-r1.ebuild b/dev-lisp/ecls/ecls-16.1.3-r1.ebuild index 864fb47fc121..4109b67d44f7 100644 --- a/dev-lisp/ecls/ecls-16.1.3-r1.ebuild +++ b/dev-lisp/ecls/ecls-16.1.3-r1.ebuild @@ -88,7 +88,7 @@ src_install() { emake DESTDIR="${D}" install dodoc README.md CHANGELOG - dodoc "${FILESDIR}"/README.Gentoo + dodoc "${FILESDIR}"/README.gentoo pushd build/doc newman ecl.man ecl.1 newman ecl-config.man ecl-config.1 diff --git a/dev-lisp/ecls/ecls-20.4.24-r1.ebuild b/dev-lisp/ecls/ecls-20.4.24-r1.ebuild index b3ab59498a8c..0c2c641c4ac9 100644 --- a/dev-lisp/ecls/ecls-20.4.24-r1.ebuild +++ b/dev-lisp/ecls/ecls-20.4.24-r1.ebuild @@ -88,7 +88,7 @@ src_install() { emake DESTDIR="${D}" install dodoc README.md CHANGELOG - dodoc "${FILESDIR}"/README.Gentoo + dodoc "${FILESDIR}"/README.gentoo pushd build/doc newman ecl.man ecl.1 newman ecl-config.man ecl-config.1 diff --git a/dev-lisp/ecls/ecls-21.2.1-r2.ebuild b/dev-lisp/ecls/ecls-21.2.1-r2.ebuild deleted file mode 100644 index 2c6120e14edb..000000000000 --- a/dev-lisp/ecls/ecls-21.2.1-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit 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="https://common-lisp.net/project/ecl/" -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 ~amd64-linux" -IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X" - -CDEPEND="dev-libs/gmp:0= - dev-libs/libffi:= - libatomic? ( dev-libs/libatomic_ops ) - >=dev-libs/boehm-gc-7.1[threads?] - >=dev-lisp/asdf-2.33-r3:=" -DEPEND="${CDEPEND} - app-text/texi2html - emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )" -RDEPEND="${CDEPEND}" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}/${PN}-16.1.3-headers-gentoo.patch" - "${FILESDIR}/${PN}-16.1.3-build.patch" -) - -src_prepare() { - default - 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=yes \ - --with-dffi \ - $(use_with cxx) \ - $(use_enable gengc) \ - $(use_enable precisegc) \ - $(use_with debug debug-cflags) \ - $(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) -} - -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 -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc README.md CHANGELOG - 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-21.2.1-r3.ebuild b/dev-lisp/ecls/ecls-21.2.1-r3.ebuild index 87a427e86126..c6913c125b73 100644 --- a/dev-lisp/ecls/ecls-21.2.1-r3.ebuild +++ b/dev-lisp/ecls/ecls-21.2.1-r3.ebuild @@ -79,7 +79,7 @@ src_install() { emake DESTDIR="${D}" install dodoc README.md CHANGELOG - dodoc "${FILESDIR}"/README.Gentoo + dodoc "${FILESDIR}"/README.gentoo pushd build/doc newman ecl.man ecl.1 newman ecl-config.man ecl-config.1 diff --git a/dev-lisp/ecls/ecls-21.2.1-r4.ebuild b/dev-lisp/ecls/ecls-21.2.1-r4.ebuild new file mode 100644 index 000000000000..0f4009c48622 --- /dev/null +++ b/dev-lisp/ecls/ecls-21.2.1-r4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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}" + +LICENSE="BSD-2 LGPL-2.1+" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~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 +RESTRICT="test" + +RDEPEND="dev-libs/gmp:0= + dev-libs/libffi:= + dev-libs/libatomic_ops + >=dev-libs/boehm-gc-7.1[threads?] + >=dev-lisp/asdf-2.33-r3:=" +DEPEND="${RDEPEND} + app-text/texi2html + emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )" + +DOCS=( README.md CHANGELOG ) + +PATCHES=( + "${FILESDIR}/${PN}-16.1.3-headers-gentoo.patch" + "${FILESDIR}/${PN}-16.1.3-build.patch" + "${FILESDIR}/${PN}-21.2.1-donotcompressinfo.patch" + "${FILESDIR}/${PN}-21.2.1-ldflags.patch" +) + +src_prepare() { + default + cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die +} + +src_configure() { + econf \ + --enable-gmp=system \ + --enable-boehm=system \ + --with-dffi \ + --enable-libatomic=system \ + --with-defsystem \ + $(use_with cxx) \ + $(use_enable gengc) \ + $(use_enable precisegc) \ + $(use_with debug debug-cflags) \ + $(use_with cpu_flags_x86_sse sse) \ + $(use_enable threads) \ + $(use_enable unicode) \ + $(use_with X x) +} + +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 || die + else + touch build/TAGS + fi + + emake +} + +src_install() { + default + + readme.gentoo_create_doc + pushd build/doc > /dev/null || die + newman ecl.man ecl.1 + newman ecl-config.man ecl-config.1 + popd > /dev/null || die +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/dev-lisp/ecls/files/README.Gentoo b/dev-lisp/ecls/files/README.Gentoo deleted file mode 100644 index 9bb82f220097..000000000000 --- a/dev-lisp/ecls/files/README.Gentoo +++ /dev/null @@ -1,15 +0,0 @@ --*- 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. -Please don't bother the upstream authors unless you are absolutely certain it is -not Gentoo-related. diff --git a/dev-lisp/ecls/files/README.gentoo b/dev-lisp/ecls/files/README.gentoo new file mode 100644 index 000000000000..c95b6cb75167 --- /dev/null +++ b/dev-lisp/ecls/files/README.gentoo @@ -0,0 +1,13 @@ +-*- outline -*- + +Gentoo GNU/Linux specific notes for ECL +--------------------------------------- + + * 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 https://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/files/ecls-21.2.1-donotcompressinfo.patch b/dev-lisp/ecls/files/ecls-21.2.1-donotcompressinfo.patch new file mode 100644 index 000000000000..722e5dc7483f --- /dev/null +++ b/dev-lisp/ecls/files/ecls-21.2.1-donotcompressinfo.patch @@ -0,0 +1,35 @@ +diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in +index 5660f41..c2aadbe 100644 +--- a/src/doc/Makefile.in ++++ b/src/doc/Makefile.in +@@ -15,7 +15,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_INFO = @INSTALL_INFO@ + mkinstalldirs = $(top_srcdir)/bdwgc/install-sh -d +-INFO_FILE = ecl.info.gz ++INFO_FILE = ecl.info + MAKEINFO = @MAKEINFO@ + MANUAL_MAKE_TARGET = @MANUAL_MAKE_TARGET@ + MANUAL_INSTALL_TARGET = @MANUAL_INSTALL_TARGET@ +diff --git a/src/doc/manual/Makefile b/src/doc/manual/Makefile +index f82c287..2ff67e0 100644 +--- a/src/doc/manual/Makefile ++++ b/src/doc/manual/Makefile +@@ -5,15 +5,14 @@ FILES= *.txi */*.txi figures/* + all: pdf info html + + pdf: manual.pdf +-info: ecl.info.gz ++info: ecl.info + html: html/index.html + + manual.pdf: $(FILES) + texi2pdf manual.txi + +-ecl.info.gz: $(FILES) ++ecl.info: $(FILES) + $(MAKEINFO) --no-split manual.txi +- gzip < ecl.info > ecl.info.gz + + html/index.html: $(FILES) + $(MAKEINFO) --html --css-include=ecl.css --split=section manual.txi diff --git a/dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch b/dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch new file mode 100644 index 000000000000..5ac4cc5ea793 --- /dev/null +++ b/dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/723162 + +--- ecl-21.2.1/src/c/Makefile.in ++++ ecl-21.2.1/src/c/Makefile.in +@@ -104,7 +104,7 @@ + + $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list.h + if test -f ../CROSS-DPP; then touch dpp; else \ +- $(TRUE_CC) -I$(srcdir) -I@true_builddir@ -I./ $(srcdir)/dpp.c @CPPFLAGS@ @CFLAGS@ @ECL_CFLAGS@ -o $@ ; \ ++ $(TRUE_CC) -I$(srcdir) -I@true_builddir@ -I./ $(srcdir)/dpp.c @CPPFLAGS@ @CFLAGS@ @ECL_CFLAGS@ @LDFLAGS@ -o $@ ; \ + fi + + $(OBJS): $(DPP) -- cgit v1.2.3