From a48c6f3764748222fcc166cb7a1ac5f099f7a2d1 Mon Sep 17 00:00:00 2001 From: "Cyprien Nicolas (fulax)" Date: Sat, 22 Jun 2019 15:28:40 +0200 Subject: dev-scheme/guile: Bump to 2.2.5, add block with guile-2.2:12 --- dev-scheme/guile/Manifest | 4 +- dev-scheme/guile/guile-2.2.4-r1.ebuild | 78 --------------------------------- dev-scheme/guile/guile-2.2.5.ebuild | 79 ++++++++++++++++++++++++++++++++++ profiles/package.mask | 5 +-- 4 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 dev-scheme/guile/guile-2.2.4-r1.ebuild create mode 100644 dev-scheme/guile/guile-2.2.5.ebuild diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest index 29930c03..0659cc72 100644 --- a/dev-scheme/guile/Manifest +++ b/dev-scheme/guile/Manifest @@ -1,7 +1,7 @@ AUX guile-2.2.3-gentoo-sandbox.patch 361 BLAKE2B 997d4cec108f302f34b42c59c78d420c858f964b8587bed523d95fadedbf9981dd9c196934299413db9c23e940a4b88e798e4fff65cdea1507968494338313ba SHA512 450f44cbd2b3f0c7c02963c35e58e8d0e4a7192239993215b69713d8a1109692ab1e153efe685c27681069477a56e7bc52b34ebd8717a2c8695be8c6b8abe673 -DIST guile-2.2.4.tar.gz 18094974 BLAKE2B 36e9219bbe675b7ad8a73607a3acddae244a71cac1aff8dac77433da76ecb9f073df723ca3d22a15cf769b2fe5a981aa968bd0983020b3926f08f0b497bdf80e SHA512 a200b83a02ef23c8256d9bfb14a141bb6dbca01279a0587bfb672060429c49093088e4b765b7ee5c85cd587a1aeed77d9438d300d3e67cdd6cebbb794d88171e +DIST guile-2.2.5.tar.gz 18126413 BLAKE2B 9b52402417ba62236c101b283cc4c1a1cac19d93c96b1df814ab357cb6e1aef2ef086e2181719d747f468841a5dd1c5146c062984280808ac64a5c7dfde85dba SHA512 1c07a6d16e00953d416bd8db5b1e9574c62751f745c203de5a910b9688cf93756fe2303ab084d9e9949bff11e6e14909304ecd1ef671be2a06c7c3f292f6380c DIST guile-2.9.2.tar.gz 21564297 BLAKE2B 23ef2f2036bffe908d2aa6f9c9528d4883a58e9223d30bc8bb9c0159a7c6ca12b2580b6d1c698fba99265731d6fa4b00db141ef64351347348aa9c6d6641c5c3 SHA512 91dfb47bfaa20a53e961cec4f4ea29a81a2da5e5118726c003379e3202a5e5dad6c5dd6f0f4d9e17119c9431f59c0ae61ed2142628b2221029831e7e99d5587b -EBUILD guile-2.2.4-r1.ebuild 2291 BLAKE2B 6942d1f69d5567dbaa48749047aabc92a48a734511c5582e650a835c7147a3f3c89287a954b3057b72030d0eedad01e1bef7ec721521a5e966e8d2534d75e534 SHA512 e172a31c2ec2240036f217d5e6c06ea366c3f4f9361ffc305fc8ce26f8a395616947f4c3c6465e926db335b692e61e5bcf9be9aa632855a87fcb9a0435757cfa +EBUILD guile-2.2.5.ebuild 2319 BLAKE2B dca0573c46a6df154504df316a836aa14761db82db0a38f670dd2423523e40da270f77d48dfb58e6a28ffa2017cc336137815d50c3c1d4d164f0ebddd461ff60 SHA512 57c65ef1ef235d013fc4265538ec1ab8f05fb3c1362dc9e7645dabc36b37ba46505cd11be0a01caba5740c9f97e1671ce9646717981acf746885e388cee9b2a8 EBUILD guile-2.9.2.ebuild 2252 BLAKE2B 6fdf0cfdd2d6642d9f14b4839ef74a6795f1915912d13f275c1a75cdecea1b8a1d9dd88fa087ab3b6551f4f70a8df090562c7158a8e9d5e2e5aa3f90113130b0 SHA512 0211d9cffa819251739ea7e12cb750241374be00911690d298ffd9391596717f38a62350617e7e14923d9debab181212f3dddac416e738679ffcdf0216da049a EBUILD guile-9999.ebuild 2179 BLAKE2B 1520bdf578967de0577b91aeab15df03d3200ffb5bb23ea0c13f9e453cfc2215b337459b1ee3ddab0af76e722107609ff43eb476d21c71d8e7ed59a841a5c2d9 SHA512 354c0493cce1b640bedf3eb4cfbdee3cf8b1580b529bafd87926dec16ef927b96a36e40de2042d8e3da515c4335411d027a763de0561c9bdda6a322d6c89850f MISC metadata.xml 853 BLAKE2B 14e193fda4ff6397d2ab6aedaeab4320883da005e869491072deb1a38a0afab199692466dd7321cf0e6ca79c3f198f64efbb3a611dcd653ce514cc81d78a78e1 SHA512 958758b1ff1a2fc0a4fe9931b74fa38450b52a2081738f2dfc3b6310433ab01ed68752e256ecb9c4f23db7a22d14e0e72da1f99208be012550c62e308b349667 diff --git a/dev-scheme/guile/guile-2.2.4-r1.ebuild b/dev-scheme/guile/guile-2.2.4-r1.ebuild deleted file mode 100644 index 8a2a06f1..00000000 --- a/dev-scheme/guile/guile-2.2.4-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -MAJOR="2.2" -DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" -HOMEPAGE="https://www.gnu.org/software/guile/" -SRC_URI="mirror://gnu/guile/${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="2.2/2.2-1" # libguile-2.2.so.1 => 2.2-1 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug debug-malloc +deprecated +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/gmp:= - virtual/libffi:= - dev-libs/libltdl:= - dev-libs/libunistring:0= - sys-libs/ncurses:0= - sys-libs/readline:0=" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - sys-devel/libtool - sys-devel/gettext" - -PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" ) -DOCS=( GUILE-VERSION HACKING README ) - -src_configure() { - # see bug #178499 - filter-flags -ftree-vectorize - - econf \ - --program-suffix="-${MAJOR}" \ - --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \ - --disable-error-on-warning \ - --disable-rpath \ - --disable-static \ - --enable-posix \ - --without-libgmp-prefix \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --without-libltdl-prefix \ - --without-libreadline-prefix \ - --without-libunistring-prefix \ - $(use_enable debug guile-debug) \ - $(use_enable debug-malloc) \ - $(use_enable deprecated) \ - $(use_enable networking) \ - $(use_enable nls) \ - $(use_enable regex) \ - $(use_with threads) -} - -src_install() { - default - - # Maybe there is a proper way to do this? Symlink handled by eselect - mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed" - - # From Novell - # 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 - - # necessary for registering slib, see bug 206896 - keepdir /usr/share/guile/site - - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-scheme/guile/guile-2.2.5.ebuild b/dev-scheme/guile/guile-2.2.5.ebuild new file mode 100644 index 00000000..4f396476 --- /dev/null +++ b/dev-scheme/guile/guile-2.2.5.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +MAJOR="2.2" +DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" +HOMEPAGE="https://www.gnu.org/software/guile/" +SRC_URI="mirror://gnu/guile/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="2.2/2.2-1" # libguile-2.2.so.1 => 2.2-1 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls +REQUIRED_USE="regex" # workaround for bug 596322 +RESTRICT="strip" + +RDEPEND=" + !>=dev-scheme/guile-2.2:12 + >=dev-libs/boehm-gc-7.0:=[threads?] + dev-libs/gmp:= + virtual/libffi:= + dev-libs/libltdl:= + dev-libs/libunistring:0= + sys-libs/ncurses:0= + sys-libs/readline:0=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + sys-devel/libtool + sys-devel/gettext" + +PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" ) +DOCS=( GUILE-VERSION HACKING README ) + +src_configure() { + # see bug #178499 + filter-flags -ftree-vectorize + + econf \ + --program-suffix="-${MAJOR}" \ + --infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \ + --disable-error-on-warning \ + --disable-rpath \ + --disable-static \ + --enable-posix \ + --without-libgmp-prefix \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-libltdl-prefix \ + --without-libreadline-prefix \ + --without-libunistring-prefix \ + $(use_enable debug guile-debug) \ + $(use_enable debug-malloc) \ + $(use_enable deprecated) \ + $(use_enable networking) \ + $(use_enable nls) \ + $(use_enable regex) \ + $(use_with threads) +} + +src_install() { + default + + # Maybe there is a proper way to do this? Symlink handled by eselect + mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed" + + # From Novell + # 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 + + # necessary for registering slib, see bug 206896 + keepdir /usr/share/guile/site + + find "${D}" -name '*.la' -delete || die +} diff --git a/profiles/package.mask b/profiles/package.mask index e550ad31..ea39d2e4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,6 +1,5 @@ -# Cyprien Nicolas (fulax) (16 Jun 2019) -# Experimental SLOT support -=dev-scheme/guile-2.2.4-r1 +# Cyprien Nicolas (fulax) (22 Jun 2019) +# guile-3 beta releases =dev-scheme/guile-2.9.2 # Cyprien Nicolas (fulax) (26 Jan 2013) -- cgit v1.2.3-65-gdbad