diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-scheme/guile | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'dev-scheme/guile')
-rw-r--r-- | dev-scheme/guile/Manifest | 15 | ||||
-rw-r--r-- | dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch | 4 | ||||
-rw-r--r-- | dev-scheme/guile/guile-1.8.8-r4.ebuild (renamed from dev-scheme/guile/guile-1.8.8-r3.ebuild) | 110 | ||||
-rw-r--r-- | dev-scheme/guile/guile-2.0.14-r4.ebuild | 16 | ||||
-rw-r--r-- | dev-scheme/guile/guile-2.2.6.ebuild | 19 | ||||
-rw-r--r-- | dev-scheme/guile/guile-2.2.7-r1.ebuild | 6 | ||||
-rw-r--r-- | dev-scheme/guile/guile-3.0.7-r1.ebuild | 6 | ||||
-rw-r--r-- | dev-scheme/guile/guile-3.0.8.ebuild (renamed from dev-scheme/guile/guile-3.0.7.ebuild) | 29 |
8 files changed, 125 insertions, 80 deletions
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest index f4d34c8c5f74..a2dfa7cff7f3 100644 --- a/dev-scheme/guile/Manifest +++ b/dev-scheme/guile/Manifest @@ -2,7 +2,7 @@ AUX 50guile-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b569 AUX guile-1.8.8-fix_guile-config.patch 494 BLAKE2B e7cf0fe161b83e0561c0eac26889c407ed7fba41a79944a1fe060881e31217c40554f1bcc708940102b80dbf27edf3ba8de58850889bb9e3707166e04195f01d SHA512 3ef2bcb31d5b80dfa2f23b8802b98af713230e59aafe773ca3fd847fbdc7759ebb2d19cead1b6b362a6fa504dfff0c2036d5359aa82b601d664eb2a49a98c970 AUX guile-1.8.8-gcc46.patch 1004 BLAKE2B 6680d9f6a5207078dac634d4504c0b4b7502a2f49dac089d8f5251d8d8cdcc37e408d0f446389ad0fc908ce7ea801ae3c1af59d7b03dd19f3ce7d1175e97ea68 SHA512 0ace93548dde387c344e13f083d79227cd09506e0cf58ac0892f25c43bfcefe9071e83912b921fba120262884fa92aaabe4d07f8337d89b6da73f0f2c077dcfa AUX guile-1.8.8-gcc5.patch 575 BLAKE2B a8766ca3eaf808ad4547312a11d203422be21e647a0b089c5709e5f747e6c5136a80dc521c118506086b4a7808aa3301e315420262923604a2bf5819a6d637ef SHA512 844a585679f8d1cbdbe9c4c7c5feb21ebca095a522d75db264c0f4c244153a1435a01647955fc98a0743fec48aeac28c1570dbce78bfd026544addba945a1cee -AUX guile-1.8.8-gtexinfo-5.patch 460 BLAKE2B 895480608683caf27dda3d4e92b4c82ecde1a6d27e9e37de445fdf9665cbb432759d75b5cb0340ed9a15d2c3175b48647989bdaebe659c1a1104c221bb43c07e SHA512 19185a96bb6dcf7f1cac1908633d65d8cb673148469553cce4099256d05a94688834a61ddc0a18957f9fe253fffb2821817b4b29a4a604e8c152debb6e3323a6 +AUX guile-1.8.8-gtexinfo-5.patch 464 BLAKE2B e4bbe69136208f445b929d16b4ebc42dd22f503bb61485d1ee0b8d07aca6e45305b2bd07438d2a6ef482021ad60bc1f83983dcdaf98ea2aa06e05abb4dbf2974 SHA512 313c12aeb718fd8f0d5cd586a5b9aa1653ce108906299809695f5ef70b9c010098d993e677e469bf1bc062d0d7c1eb07a17a523f9af31f8306f0d2f48c21c744 AUX guile-1.8.8-makeinfo-5.patch 2361 BLAKE2B 3720979563cba33c9d5058d070717e6c433b1c1e3e0e41a34d83179f1c2ae5bb5cb8a1a445d0da52f714aea18418d492a482d1dcf11ffe689c092a50d8f0191a SHA512 a69ed6cf2fd87c6f3d61cc914eed960fcdebaa151778b1ecf04f1774e6dddf07d17bf90fb3243a08e8c231e391843201d0ba26debedef33199d8dd75f8cbcd09 AUX guile-1.8.8-mkdir-mask.patch 1300 BLAKE2B 941f4fdeafc769fe6d41b2303f7dc3f7972d5c40cae6c09bf1532171827ac3e284bf812276e0d9b7c276fe8312b306fcef9010b69d3d2dd5d13593e11be904e0 SHA512 e02fa50af16fb545b26560064cc7adb19caf523691dfb22044c1e01fe9c98c42804c3d13ac28d65cb61bf7667fb0f1d4aa703949cea321d382b871abd083454e AUX guile-1.8.8-readline.patch 953 BLAKE2B e08c20d919b3659f8f4b2bcee26b12d43f2b942c1b12859cacb5ab813fe2aa8790b29cbb694b9c75851d28a7c96e3296345d8c2261175ce6b71a4bd65eec6f1a SHA512 e86e6e7f035f9ff9d541b44987d7cb0e5a1f80f62b7b4a112dc933f5831b90a33b506c6601165e957a3973c38ca56d0e84eafaa76c78ae5db26d7887669f1443 @@ -20,10 +20,11 @@ DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381 DIST guile-2.2.7.tar.gz 18129833 BLAKE2B 03c88d753f83e5a797f12808b7b053c9cf6c51f87fb8f3c3db89e54528aafb0e54de2eb951cc622e98fada82a558932bb074a8e739f4175144d4b06ba42f7d60 SHA512 ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773 DIST guile-3.0.7-gnulib-glibc-2.34.patch.bz2 60359 BLAKE2B b21adb981d4242c62b3038f14cf2048fdd5fd1aa00aae937cab6e9b6dfa1331adff1291484bb7f39ddf8e93159fd0c424dc6e4d83fce0083daa6eb661b651cfe SHA512 be2985b41cd567a549ba96dedda2a24355be40a5aad408a7f0593b6e6c02c9719ead27463a786736501ed26c01c65f9a403160b2bd1660d60d6fd4932c92f095 DIST guile-3.0.7.tar.gz 21878396 BLAKE2B 4fae35e21e7f7b47ae9b4cdbafd3b2f660ec4844f838c7eef023b307963b8e92bc30698bd85954523f8fb67edee8de44d19004eb288d3d6656c962e5cb57dc8b SHA512 d7b159e109fd4a08231ef9b961376e71c2872f08d47d82896d96ccac250f5677b35be9a8ce3b9a758bd2ed78d6451e4fdd844408a1baf684256d9bfa09999f3f -EBUILD guile-1.8.8-r3.ebuild 3131 BLAKE2B 0da1627c6e5e8d3106911e19e1777b2fb2be2a5c684dbc71cb8cd9b4e8992b00ca2a101e933b226f0ae847a1e81453e91a5e0b87a4c4036af5fd554475b83b08 SHA512 5e3d788486e7be9d637dfdc669b4599f2c3a605b28802dceb82b4d8a414d4631a538775085b696725b03f3929fc646c0168f357b2cf76cde94da3a96d77b2410 -EBUILD guile-2.0.14-r4.ebuild 2222 BLAKE2B 78995d180b00fde3caa157ef93310964281dce34044f3b09f01fe4c2cdebbdbc5d648cdfc02ec5b4a0ff026ea422f7b8831bb935ffa6c2d353f33304bd5ed1b6 SHA512 73b9e384f5338325631aaef90f320ddd4ae1031ad41df15b570110bde955e34d27f9d6b5dd7af17599818c8800aa6686b37bac2d7598ef5e2756e1680f27aa58 -EBUILD guile-2.2.6.ebuild 1953 BLAKE2B 99ae78d4ed8c6a0a05b709df1237ca9b6bbca61df809c1f4cadd06147207e1abb90f0ef82ccf16c8e6aad4e653f0778f2c54eb965525d543139ba668341ce01b SHA512 ee2877ec48fb3e4f9e81859add46d4e0817627532b183faeb5f81cfd9b0a891084d5ee8e2c21256425c60f5c8166b64b910dceda0506e2fc14e8328f25ba01e6 -EBUILD guile-2.2.7-r1.ebuild 2016 BLAKE2B e8ac5c088e46c582c21014e7f3b1b290cdcd1e8d740ab91485d0231eeec426b28265efdf43f713ae4ff0ce43d95be432fc88ec03b08d7513e1d3f9dea9ebb99f SHA512 9376a9f2e2d0bcb718368d65ee6783067c5c4cc3658059e231321c17fa2a6d1a0f62c16af692ad9fd5aa0d36f332106c739ccd1453a2e90aeff8d84da9977059 -EBUILD guile-3.0.7-r1.ebuild 2223 BLAKE2B 8672f3a181f2ac1c698227dfb99870cdcd03e68e95eec47618e2aa485c84bd90e4f41cac6472c0df1b114ae776a3baa75781391275a1d7cfcb31de1628a154b1 SHA512 541ae15a4401aba1e3b235e493f899d0baedc41e4876f58bb71e2dd9ee3d548a3e36aaa172c0e57bb33c92181276d05d4fffbf7bfef5c3c2ed69fc109dbbafd1 -EBUILD guile-3.0.7.ebuild 1958 BLAKE2B 65898252823811c21d592d7adac205b8056e41658379a01e38dc39c1d9ee4c3d9862295db4e2c752bd53bba17b7f97f37fe92aa3867c51134e42fda3a4b60fd9 SHA512 b5f968df80cf50b92f3b18bf8ae5d28adfc646230d80f585752137836f7d17252b2180095d1e451e5decf36da1f96367970718806766c473cb04836161c9e119 +DIST guile-3.0.8.tar.gz 10438342 BLAKE2B 79e96216fcb75bc198b53ce2b2389a93fa1590cd4ff93e0c5750bea2997b7eebb0736de57459e56356ee8b5a31aacec2121d180e98c4d779ed118c9c858b32b7 SHA512 7b2728e849a3ee482fe9a167dd76cc4835e911cc94ca0724dd51e8a813a240c6b5d2de84de16b46469ab24305b5b153a3c812fec942e007d3310bba4d1cf947d +EBUILD guile-1.8.8-r4.ebuild 3108 BLAKE2B 6cdae9c84f0696c792b2c8a13856853e700ffc5d4ebf123d2ea50d8a03a42d8ee671da91c21e652da878dd404a95a7b6e0904622717369696724f1afc1029375 SHA512 42a2b19d45dd284877b4f88f487eaaf45997c6df9d0a007d2832215b9d25a34ffda9f51c3ad72d2d8df10cd6085179845ef18e04712e32ecb098d3153fc9525b +EBUILD guile-2.0.14-r4.ebuild 2369 BLAKE2B 1c832e3d0da104c01d87c947f425b8cacbf2ae9acda6d92938d7034bdbe819ef821d4c8175e502a62eda722bf39833fceb40b3cd923fba0ab81efba88c5c6f27 SHA512 f0707b30ddbd395e9526b7ff5f679b92a1d606b57ffb983dfe60c0d78585ac9d27db5c1ef2bd317994115f0ed947d388b8490b049f17f13008b8d156cdcc0cf9 +EBUILD guile-2.2.6.ebuild 2256 BLAKE2B 3ca340b1e73bf1e67bec3cd2db3580f37a9eced2b5f8e5d855a6e8e463de6893e8b6973f1f7e042853975aa467a679aaefdb80a1f30cdfc7fb79cac6f0a9c792 SHA512 ee0f86afa7bc96cf09d65c736e4b0afbca4b63e7f9cadaa1b945407bf60b885af994092866c5baec7a8eb5e64bd42dbf38f5a63be552f3706ac8e7c5d12506ee +EBUILD guile-2.2.7-r1.ebuild 2146 BLAKE2B 689318685e8f9af607276df084248e456d173c3a31efb94e2222dbf4f5ae1a1ecc475065db79501e444902d9cfbcc9c7425a6ab6ce76d6fce5d3c267b8aa9b24 SHA512 bc9970dc9c3d608a74cfe51d77efc45c41dff9613cdc7547f5bcf76cf91a862571c134dd9c816f82d553443a373ebbbcaaf5ff4eecd26a996bbbbc39430c1418 +EBUILD guile-3.0.7-r1.ebuild 2353 BLAKE2B af5db762cdb39d55a8d883e608f90fc5e57ae92644a175b4395f89a268efefda786c0f67099be2be8e1438b41b2fec95cc4e28104cf8939ebacbb23181ca7b8f SHA512 98f527cf1e0401955af4224658e75c1a14e69f0901e8ef2f8fa8f042f7f25c9b401c54732bde60506db85badb1d4f10f40c449536330d8f10effb314ab0c7b92 +EBUILD guile-3.0.8.ebuild 2109 BLAKE2B 6f0fb54bd40ffc89e99e6912eab2460723c78b9cbc700605a061c22cc98e5ebd4e8783b51ce2ff5fd7edca6ea13bf0fc2532d53e2d643b328c36d0cbfcb4dc26 SHA512 78f16566980ee6d6347c17bd74f18f3f8cb9ceffcfc4b749aabb72a719a7aa9cc40b503e3669ebfbaddd60868ff5ce6b0ae65fc236aa6c14d5b3acfe205af69e MISC metadata.xml 1041 BLAKE2B d01e2b55f3618fa4056f46d0a3cd2e2c5e006374a8c9fbc28adca37f4b4e5978e65c968762e5675e0f98ba2ce686e09f2997481c1365eb0787e979d9bfd012fb SHA512 ace5d0cea917c980c1958c174b869692d7a407132be9e9b223ac970ef3d9323c76a23e009e45990583993de0bb3c423243931cfeb9de7c3383d6b4b5efda4b3a diff --git a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch index d7fbda15c101..703e1fab9a48 100644 --- a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch +++ b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch @@ -2,8 +2,8 @@ $NetBSD: patch-doc_tutorial_guile-tut.texi,v 1.1 2013/11/30 07:06:25 dsainty Exp Compatibility with gtexinfo 5.2
---- doc/tutorial/guile-tut.texi 2010-12-14 06:24:39.000000000 +1300
-+++ doc/tutorial/guile-tut.texi 2013-11-30 19:44:28.304575529 +1300
+--- a/doc/tutorial/guile-tut.texi 2010-12-14 06:24:39.000000000 +1300
++++ b/doc/tutorial/guile-tut.texi 2013-11-30 19:44:28.304575529 +1300
@@ -446,7 +446,7 @@
Schemer} from that list.}
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r4.ebuild index bd9822080ac9..e4d5e582d1d9 100644 --- a/dev-scheme/guile/guile-1.8.8-r3.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r4.ebuild @@ -1,56 +1,64 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit epatch autotools flag-o-matic elisp-common +EAPI=8 -DESCRIPTION="Scheme interpreter" +MAJOR="1.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" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 )" +# Guile seems to contain some slotting support, /usr/share/guile/ is slotted, +# but there are lots of collisions. Most in /usr/share/libguile. Therefore +# I'm slotting this in the same slot as guile-1.6* for now. +SLOT="12/8" + RDEPEND=" >=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncurses:0= virtual/libcrypt:= - emacs? ( >=app-editors/emacs-23.1:* ) - readline? ( sys-libs/readline:0= )" -DEPEND="${RDEPEND} + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" sys-apps/texinfo - sys-devel/libtool" - -# Guile seems to contain some slotting support, /usr/share/guile/ is slotted, -# but there are lots of collisions. Most in /usr/share/libguile. Therefore -# I'm slotting this in the same slot as guile-1.6* for now. -SLOT="12/8" -MAJOR="1.8" + sys-devel/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 ) src_prepare() { - epatch "${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" + default sed \ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \ -e "/AM_PROG_CC_STDC/d" \ -i guile-readline/configure.in || die - epatch_user - mv "${S}"/configure.{in,ac} || die mv "${S}"/guile-readline/configure.{in,ac} || die @@ -62,24 +70,25 @@ src_configure() { filter-flags -ftree-vectorize #will fail for me if posix is disabled or without modules -- hkBst - econf \ - --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 \ - EMACS=no + myconf=( + --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() { @@ -94,20 +103,19 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS + default # texmacs needs this, closing bug #23493 dodir /etc/env.d - echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile || die + echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" \ + > "${ED}"/etc/env.d/50guile || die # necessary for registering slib, see bug 206896 keepdir /usr/share/guile/site if use emacs; then - elisp-install ${PN} emacs/*.{el,elc} || die - elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die + elisp-install ${PN} emacs/*.{el,elc} + elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" fi } diff --git a/dev-scheme/guile/guile-2.0.14-r4.ebuild b/dev-scheme/guile/guile-2.0.14-r4.ebuild index 50d02983c91f..6cdb67fff567 100644 --- a/dev-scheme/guile/guile-2.0.14-r4.ebuild +++ b/dev-scheme/guile/guile-2.0.14-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,8 +12,8 @@ LICENSE="LGPL-3+" IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls # emacs useflag removal not working -# workaround for bug 596322 -REQUIRED_USE="regex" +REQUIRED_USE="regex" # workaround for bug 596322 +RESTRICT="strip" RDEPEND=" >=dev-libs/boehm-gc-7.0:=[threads?] @@ -33,14 +33,18 @@ DEPEND="${RDEPEND} SLOT="12/22" # subslot is soname version MAJOR="2.0" -DOCS=( GUILE-VERSION HACKING README ) - PATCHES=( "${FILESDIR}/${PN}-2-snarf.patch" "${FILESDIR}/${P}-darwin.patch" "${FILESDIR}/${P}-ia64-fix-crash-thread-context-switch.patch" ) +# guile generates ELF files without use of C or machine code +# It's a portage's false positive. bug #677600 +QA_PREBUILT='*[.]go' + +DOCS=( GUILE-VERSION HACKING README ) + src_prepare() { default eautoreconf @@ -75,7 +79,7 @@ src_install() { find "${ED}" -name '*.la' -delete || die # From Novell - # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0 + # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0 dodir /usr/share/gdb/auto-load/$(get_libdir) mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild index 7e08347d859f..ab320b7a78ec 100644 --- a/dev-scheme/guile/guile-2.2.6.ebuild +++ b/dev-scheme/guile/guile-2.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,8 +30,23 @@ BDEPEND=" sys-devel/gettext" PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" ) + +# guile generates ELF files without use of C or machine code +# It's a portage's false positive. bug #677600 +QA_PREBUILT='*[.]go' + DOCS=( GUILE-VERSION HACKING README ) +src_prepare() { + # Remove tests that require network + local bad_test + for bad_test in test-suite/tests/web-*.test ; do + echo "#t" > "${bad_test}" || die + done + + default +} + src_configure() { # see bug #676468 mv prebuilt/32-bit-big-endian{,.broken} || die @@ -60,7 +75,7 @@ src_install() { default # From Novell - # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0 + # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0 dodir /usr/share/gdb/auto-load/$(get_libdir) mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die diff --git a/dev-scheme/guile/guile-2.2.7-r1.ebuild b/dev-scheme/guile/guile-2.2.7-r1.ebuild index 78619a6cc767..5ae0864f86fc 100644 --- a/dev-scheme/guile/guile-2.2.7-r1.ebuild +++ b/dev-scheme/guile/guile-2.2.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,6 +35,10 @@ PATCHES=( "${FILESDIR}/${PN}-2.2.7-stack-up.patch" ) +# guile generates ELF files without use of C or machine code +# It's a portage's false positive. bug #677600 +QA_PREBUILT='*[.]go' + DOCS=( GUILE-VERSION HACKING README ) src_configure() { diff --git a/dev-scheme/guile/guile-3.0.7-r1.ebuild b/dev-scheme/guile/guile-3.0.7-r1.ebuild index 2bd3be08275a..0e90037860ba 100644 --- a/dev-scheme/guile/guile-3.0.7-r1.ebuild +++ b/dev-scheme/guile/guile-3.0.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,6 +37,10 @@ PATCHES=( "${WORKDIR}/${P}-gnulib-glibc-2.34.patch" ) +# guile generates ELF files without use of C or machine code +# It's a portage's false positive. bug #677600 +QA_PREBUILT='*[.]go' + DOCS=( GUILE-VERSION HACKING README ) src_prepare() { diff --git a/dev-scheme/guile/guile-3.0.7.ebuild b/dev-scheme/guile/guile-3.0.8.ebuild index 2ae15278035a..efd31ce2549f 100644 --- a/dev-scheme/guile/guile-3.0.7.ebuild +++ b/dev-scheme/guile/guile-3.0.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MAJOR="3.0" DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" @@ -11,17 +11,19 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz" LICENSE="LGPL-3+" SLOT="12/3.0-1" # libguile-2.2.so.1 => 2.2-1 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + IUSE="debug debug-malloc +deprecated +jit +networking +nls +regex +threads" # upstream recommended +networking +nls REQUIRED_USE="regex" # workaround for bug 596322 RESTRICT="strip" RDEPEND=" - >=dev-libs/boehm-gc-7.0:=[threads?] + >=dev-libs/boehm-gc-7.0[threads?] dev-libs/gmp:= dev-libs/libffi:= - dev-libs/libunistring:0= - sys-libs/ncurses:0= - sys-libs/readline:0= + dev-libs/libatomic_ops + dev-libs/libunistring:= + sys-libs/ncurses:= + sys-libs/readline:= virtual/libcrypt:=" DEPEND="${RDEPEND}" BDEPEND=" @@ -29,7 +31,14 @@ BDEPEND=" sys-devel/libtool sys-devel/gettext" -PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" +) + +# guile generates ELF files without use of C or machine code +# It's a portage's false positive. bug #677600 +QA_PREBUILT='*[.]go' + DOCS=( GUILE-VERSION HACKING README ) src_configure() { @@ -39,7 +48,7 @@ src_configure() { econf \ --disable-error-on-warning \ --disable-rpath \ - --disable-static \ + --disable-lto \ --enable-posix \ --without-libgmp-prefix \ --without-libiconv-prefix \ @@ -64,8 +73,8 @@ src_install() { dodir /usr/share/gdb/auto-load/$(get_libdir) mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die - # necessary for registering slib, see bug 206896 + # necessary for registering slib, see bug #206896 keepdir /usr/share/guile/site - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } |