commit: 706230328a6742f57734281faebd50eccd8a60dd Author: Kacper Słomiński <kacper.slominski72 <AT> gmail <DOT> com> AuthorDate: Mon Sep 23 04:05:12 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 24 03:59:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70623032
dev-scheme/guile: add 1.8.8-r100 Bug: https://bugs.gentoo.org/689408 Signed-off-by: Kacper Słomiński <kacper.slominski72 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> app-office/texmacs/texmacs-2.1-r1.ebuild | 4 +- dev-scheme/guile/guile-1.8.8-r100.ebuild | 152 +++++++++++++++++++++++++++++++ profiles/package.mask | 1 + 3 files changed, 155 insertions(+), 2 deletions(-) diff --git a/app-office/texmacs/texmacs-2.1-r1.ebuild b/app-office/texmacs/texmacs-2.1-r1.ebuild index c6414ad9d123..882a51c9116f 100644 --- a/app-office/texmacs/texmacs-2.1-r1.ebuild +++ b/app-office/texmacs/texmacs-2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" RDEPEND=" app-text/ghostscript-gpl - <dev-scheme/guile-1.9[debug?,deprecated] + <dev-scheme/guile-1.9:12[debug?,deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext diff --git a/dev-scheme/guile/guile-1.8.8-r100.ebuild b/dev-scheme/guile/guile-1.8.8-r100.ebuild new file mode 100644 index 000000000000..86d059372f29 --- /dev/null +++ b/dev-scheme/guile/guile-1.8.8-r100.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic elisp-common + +DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" +HOMEPAGE="https://www.gnu.org/software/guile/" +SRC_URI="mirror://gnu/guile/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads" +RESTRICT="!regex? ( test )" + +RDEPEND=" + >=dev-libs/gmp-4.1:0= + dev-libs/libltdl:0= + sys-devel/gettext + sys-libs/ncurses:0= + virtual/libcrypt:= + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/texinfo + dev-build/libtool + emacs? ( >=app-editors/emacs-23.1:* ) +" + +PATCHES=( + "${FILESDIR}"/${P}-fix_guile-config.patch + "${FILESDIR}"/${P}-gcc46.patch + "${FILESDIR}"/${P}-gcc5.patch + "${FILESDIR}"/${P}-makeinfo-5.patch + "${FILESDIR}"/${P}-gtexinfo-5.patch + "${FILESDIR}"/${P}-readline.patch + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-sandbox.patch + "${FILESDIR}"/${P}-mkdir-mask.patch + "${FILESDIR}"/${PN}-1.8.8-texinfo-6.7.patch +) + +DOCS=( AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS ) + +# Where to install data files. +GUILE_DATA="${EPREFIX}/usr/share/guile-data/${SLOT}" +GUILE_PCDIR="${EPREFIX}/usr/share/guile-data/${SLOT}/pkgconfig" + +src_prepare() { + default + + sed \ + -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \ + -e "/AM_PROG_CC_STDC/d" \ + -i guile-readline/configure.in || die + + mv "${S}"/configure.{in,ac} || die + mv "${S}"/guile-readline/configure.{in,ac} || die + + eautoreconf +} + +src_configure() { + # See bug #178499. filter-flags no longer works since the compiler + # will vectorize by default when optimizing. + append-flags -fno-tree-vectorize -fno-strict-aliasing + + #will fail for me if posix is disabled or without modules -- hkBst + myconf=( + --program-suffix="-${SLOT}" + --infodir="${GUILE_DATA}/info" + --includedir="${EPREFIX}/usr/include/guile/${SLOT}" + + --disable-error-on-warning + --disable-static + --enable-posix + $(use_enable networking) + $(use_enable readline) + $(use_enable regex) + $(use deprecated || use_enable discouraged) + $(use_enable deprecated) + $(use_enable emacs elisp) + $(use_enable nls) + --disable-rpath + $(use_enable debug-freelist) + $(use_enable debug-malloc) + $(use_enable debug guile-debug) + $(use_with threads) + --with-modules + ) + econf "${myconf[@]}" EMACS=no +} + +src_compile() { + emake + + # Above we have disabled the build system's Emacs support; + # for USE=emacs we compile (and install) the files manually + if use emacs; then + cd emacs || die + elisp-compile *.el || die + fi +} + +src_install() { + default + + dodir "${GUILE_PCDIR}" + sed -e "/libdir/i bindir=${ESYSROOT}/usr/bin" \ + -e "/libguileinterface/a guile=\${bindir}/guile-${SLOT}" \ + -i "${ED}"/usr/$(get_libdir)/pkgconfig/guile-1.8.pc || die + mv "${ED}"/usr/$(get_libdir)/pkgconfig/guile-1.8.pc "${D}/${GUILE_PCDIR}"/guile-1.8.pc || die + + sed -i "1s/guile/guile-1.8/" "${ED}"/usr/bin/guile-config-1.8 || die + + for script in PROGRAM autofrisk doc-snarf generate-autoload punify \ + read-scheme-source scan-api snarf-guile-m4-docs use2dot \ + api-diff display-commentary frisk lint read-rfc822 \ + read-text-outline snarf-check-and-output-texi summarize-guile-TODO; do + sed "s/GUILE-guile/GUILE-guile-1.8/" \ + -i "${ED}"/usr/share/guile/1.8/scripts/${script}-1.8 || die + mv "${ED}"/usr/share/guile/1.8/scripts/${script}{-1.8,} || die + done + + mv "${ED}"/usr/share/aclocal/guile{,-"${SLOT}"}.m4 || die + find "${ED}" -name '*.la' -delete || die + + # GUILE_LOAD_PATH for TeXmacs (bug #23493) + newenvd - "50guile${SLOT}" <<-EOF + PKG_CONFIG_PATH="${GUILE_PCDIR}" + GUILE_LOAD_PATH="${EPREFIX}/usr/share/guile/${SLOT}" + EOF + + # necessary for registering slib, see bug 206896 + keepdir /usr/share/guile/site + + if use emacs; then + elisp-install ${PN}-${SLOT} emacs/*.{el,elc} + elisp-make-site-file "50${PN}-${SLOT}-gentoo.el" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/profiles/package.mask b/profiles/package.mask index a36c889f57a9..48c2244bd05b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -266,6 +266,7 @@ kde-misc/latte-dock www-apps/haunt dev-scheme/guile-commonmark >=dev-scheme/guile-reader-0.6.3-r100 +dev-scheme/guile:1.8 dev-scheme/guile:2.2 dev-scheme/guile:3.0 >=dev-build/make-4.4.1-r100