gentoo auto-resync : 18:10:2022 - 07:56:02

4 files changed, 18 insertions, 197 deletions

diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index acbbd962d3bd..4fd6d71d545c 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -16,15 +16,10 @@ AUX guile-2.2.3-gentoo-sandbox.patch 361 BLAKE2B 997d4cec108f302f34b42c59c78d420
 AUX guile-2.2.7-stack-up.patch 568 BLAKE2B 11f19c9e657b9b23c033e0edac9d06fcaa2f56f69230d526fc42eed6050022395599855015539c32ed83b6e3f5c8a94744ff6ef50b3c9284818d0d8f725f18b6 SHA512 f312e4e5d8d3781efb6fe65f4ec94431d8b19a7ac3e3e9e461748c60643088237e570314e74b5253418a01b129586465ed43107463d8de182e362393f75073bd
 DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533ea8db15e6d1b759c33edec094a1a4bdc3e09ccae61f1b271d63565063746feea242a90c18cd575775444a42ef SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0
 DIST guile-2.0.14.tar.xz 4615196 BLAKE2B 97e26635c941309b713b632371bc9df7361d3d7d524af3d2c67275f3151dc9c51bd774155bd3c1caf6950d4e839afe8b019f553b5a7223c447bb19c8a97d608c SHA512 2cad60ab8aa77be44bc4988eaa3a2f0652637f315322abd6011c18f1800c3a461eefa15a14fd54d0d48031b093bc56dfc6cd15dc0a8260b97b40521bff793db6
-DIST guile-2.2.6.tar.xz 10875692 BLAKE2B b5602e74ee62886bea5b9dc2606cefdac6de254cf1da6ae79d6d6f651a8cf5b27422bf66883a5ac44337130dad0bd8e250e82b83907a440c122d42085a34fc23 SHA512 68c31e47786838f4f1dda63bfa99428a0092383f1045e836b742ccd8021fbdd83ef910ba35858c2855b3d748f228d356536496742feba5b00e07fdcc0c5a5628
 DIST guile-2.2.7.tar.xz 10881984 BLAKE2B e2b1fe7cb010371beaaf32f8f173397c90fd291ed7d5835b9d976f37fd133254841b4179bd1e1cd02e604c7befcab6c25f85d20ba0850f96978f7c32ca1fe6d8 SHA512 6f60b3489e26f5ff32b55c89316cdcdbf3ec1f4344726006e445f24098c922c50becdc748f1b66d2b271dc002e409ee6210bf85da779cee1f68c9111b3b5c543
-DIST guile-3.0.7-gnulib-glibc-2.34.patch.bz2 60359 BLAKE2B b21adb981d4242c62b3038f14cf2048fdd5fd1aa00aae937cab6e9b6dfa1331adff1291484bb7f39ddf8e93159fd0c424dc6e4d83fce0083daa6eb661b651cfe SHA512 be2985b41cd567a549ba96dedda2a24355be40a5aad408a7f0593b6e6c02c9719ead27463a786736501ed26c01c65f9a403160b2bd1660d60d6fd4932c92f095
-DIST guile-3.0.7.tar.xz 13208808 BLAKE2B 074ecf118a9638351464a57e7124ffad6acbeffada25191f5f9ffeabb956a3fe5c1e877fcbbbab601fbfc908a6a87692ba332f558f46dd9bbbe29c84e8455ffe SHA512 b89a3856009794c009ae3529b6a73dae565173e9c839272668f0985029d353178ac009507062a2737ad7d95f5715f3af2a6aee098ff94a7c6cd747cc6782a062
 DIST guile-3.0.8.tar.xz 6200072 BLAKE2B 6ab6bfd18889d0d263e5e06ff1284ec025437e53541eb8e9632bd345fda34e394b2228661e9319e8a4e87fd8c675605184b290d875c5c1bbc20bf8c4d32a92b7 SHA512 5d1d93e3e22c524ea3c2fe28cf3c343ab8ba99bf5c7b8750c4ebcaf556ae21485fb99e5ccc50c4b07037cdc678552557753d67ef2c93d8c1b62603e1809418f6
 EBUILD guile-1.8.8-r4.ebuild 3108 BLAKE2B 6cdae9c84f0696c792b2c8a13856853e700ffc5d4ebf123d2ea50d8a03a42d8ee671da91c21e652da878dd404a95a7b6e0904622717369696724f1afc1029375 SHA512 42a2b19d45dd284877b4f88f487eaaf45997c6df9d0a007d2832215b9d25a34ffda9f51c3ad72d2d8df10cd6085179845ef18e04712e32ecb098d3153fc9525b
 EBUILD guile-2.0.14-r4.ebuild 2369 BLAKE2B c4ff72e68e661d60acb144445bcd7eb5a1d6bf44be42134e1d882e72d47ec91e521f6b9a711256a22f1aa725220d7c7fbbe8bd1eec143894b2ece4769526e733 SHA512 ccf99867f719607702e5d24bffc1c21af1ddfca0c3d662e8ed3f97f31c13392cde84fa882efb81c3ede24533059e40e0acba81f322a96a330a814e08c4ebbe02
-EBUILD guile-2.2.6.ebuild 2256 BLAKE2B cc76cd57484e689fe9f2fddf5672698b5d11794b974ae8cfcf963f5f5c2341bccf92ad3aded25d5127bb7b46232eb5f94d5358ce98aaad3ed62c3689d5511fe3 SHA512 45515f0a378ed521302b5f1565f769d253ca82890e38da70d5fc8e5f95edc0836024265db00a46b723dd5e054d7dadd2fb5a87c3153afbd598c42ab34fbbd6fe
 EBUILD guile-2.2.7-r1.ebuild 2153 BLAKE2B c89758d4351f7259ec7d711de043741687ef6f7ebe32e64676d2d259226816daa941d23b438eb4e43b2cf02472b67a1514e08f81385f128a82281c8dab64a6b0 SHA512 9d076d43e33ef88c28855e86e6a170fb32ed177252f402602dbc3a97f28276bb4c378ffd0e4db59f3b480edde7dfbf5cf1d92dd8e69cf6245c4a392305f09a77
-EBUILD guile-3.0.7-r1.ebuild 2353 BLAKE2B 1fc8f5aba2b9fefc9be56ace97ef6999d2925ed1b3bd0a3a77eeb9062a0a7793fbac123ab0ec5f71bc7ff052920c0d45c1e8376fc4f6db42722312f6e9406e50 SHA512 cb863c4d5f58e4f091cda7fdbdf162cee9d9df0a42af2147ef91162b6f70a69313a25eaad1a1656fc3035b3b93f0f14dff1bd890a368892136c5bfb107076e45
 EBUILD guile-3.0.8.ebuild 2109 BLAKE2B fb5bed8658610a7abbcffa6325a0e97b8575521719b9b70cee031fea89abf49e60cb19e99734dc6d2460ff72c0d8cd6177f58b976bec740df02388d5c0161dbe SHA512 5ded209512cd8c7624e04a08bd5d6c134080395449e52ba4bbf057f5298e17efbb8d91802f5b0ba3677cfa2c15a4554c8d2fbbe66555ce90e6e34de3e00e4e09
-MISC metadata.xml 1041 BLAKE2B d01e2b55f3618fa4056f46d0a3cd2e2c5e006374a8c9fbc28adca37f4b4e5978e65c968762e5675e0f98ba2ce686e09f2997481c1365eb0787e979d9bfd012fb SHA512 ace5d0cea917c980c1958c174b869692d7a407132be9e9b223ac970ef3d9323c76a23e009e45990583993de0bb3c423243931cfeb9de7c3383d6b4b5efda4b3a
+MISC metadata.xml 1137 BLAKE2B a7804962f0827541dd7e1d10d962700f32734d5dd4f04688c1f07838109ecf68f68d3601f86786a893c6c68c1f8d5144e254d4c82fcad53f6edc12bba9f6cc51 SHA512 5bb0ed15c972f967899c24e290550fb10bb830222dce3890413d9978870d0f00942ebfec738372418958ee99048017ebd25e8fc4c6d175027eef1448bc12384a
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
deleted file mode 100644
index 492e1bc0873d..000000000000
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MAJOR="2.2"
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="https://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="12/2.2-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 +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:=
-	dev-libs/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" )
-
-# 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
-
-	econf \
-		--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
-
-	# 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-3.0.7-r1.ebuild b/dev-scheme/guile/guile-3.0.7-r1.ebuild
deleted file mode 100644
index d2e5f9f431f3..000000000000
--- a/dev-scheme/guile/guile-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MAJOR="3.0"
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="https://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.xz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gnulib-glibc-2.34.patch.bz2"
-
-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/gmp:=
-	dev-libs/libffi:=
-	dev-libs/libunistring:0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	virtual/libcrypt:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/libtool
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
-	"${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() {
-	default
-
-	# Needed for the glibc-2.34 gnulib patch, can drop later
-	eautoreconf
-}
-
-src_configure() {
-	# see bug #676468
-	mv prebuilt/32-bit-big-endian{,.broken} || die
-
-	econf \
-		--disable-error-on-warning \
-		--disable-rpath \
-		--disable-static \
-		--enable-posix \
-		--without-libgmp-prefix \
-		--without-libiconv-prefix \
-		--without-libintl-prefix \
-		--without-libreadline-prefix \
-		--without-libunistring-prefix \
-		$(use_enable debug guile-debug) \
-		$(use_enable debug-malloc) \
-		$(use_enable deprecated) \
-		$(use_enable jit) \
-		$(use_enable networking) \
-		$(use_enable nls) \
-		$(use_enable regex) \
-		$(use_with threads)
-}
-
-src_install() {
-	default
-
-	# 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/metadata.xml b/dev-scheme/guile/metadata.xml
index 907cea272f0c..eb3a100fb5dd 100644
--- a/dev-scheme/guile/metadata.xml
+++ b/dev-scheme/guile/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
 Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs.
-	</longdescription>
-	<use>
-		<flag name="debug-freelist">Include garbage collector freelist debugging
-	code</flag>
-		<flag name="debug-malloc">Include malloc debugging code</flag>
-		<flag name="deprecated">Enable deprecated features</flag>
-		<flag name="discouraged"> (implied by deprecated) enable merely discouraged
-	features</flag>
-		<flag name="networking">Include networking interfaces</flag>
-		<flag name="regex"> Include regular expression interfaces</flag>
-	</use>
+  </longdescription>
+  <use>
+    <flag name="debug-freelist">Include garbage collector freelist debugging code</flag>
+    <flag name="debug-malloc">Include malloc debugging code</flag>
+    <flag name="deprecated">Enable deprecated features</flag>
+    <flag name="discouraged"> (implied by deprecated) enable merely discouraged features</flag>
+    <flag name="networking">Include networking interfaces</flag>
+    <flag name="regex"> Include regular expression interfaces</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">guile</remote-id>
+  </upstream>
 </pkgmetadata>