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

15 files changed, 54 insertions, 222 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index e059e9f3e1d7..4966e6ce6db0 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
index 5f774265a8e6..2a94bab11c76 100644
--- a/dev-scheme/guile-lib/Manifest
+++ b/dev-scheme/guile-lib/Manifest
@@ -1,3 +1,3 @@
 DIST guile-lib-0.2.7.tar.gz 451202 BLAKE2B d8420a718697611443a40af089aad6e1d48390e5bef764f84955beeec8d6346066547d73c30898b96e727d4f470df6a032438067240bba8b25058bc65b85d9fa SHA512 d27d1398f81172e4488c5ac5c2d076baeeeaa12fa19d83a87faf0767c255b79f8eb24438950da3865e797299be90f7dc1dcc964076d53df9cab5925a61ad0d1f
 EBUILD guile-lib-0.2.7.ebuild 700 BLAKE2B cb6516946c1661b411a9d06007f716db055b7ec0a109e622a7ba5b1d0c5ef8460311d99192cbee351f885ec46652c862c10e1e5cbd682c8636523c9a38bb50d8 SHA512 b7b0e196ba7956b0b99f00bc7285d67203d3c273fbfc1e7039cbf54d4f1b19606b7eaa5c2c45b9665af516337aa7a37cd69103d7537979d7d7e7447daf1da9aa
-MISC metadata.xml 549 BLAKE2B 89c7b27010442ad8a785a1131687ef08e003f57a746f979cb0a7830ea514a1526ece108970f9d9d7737192a7d28622f179eeb7a3d1e683b50cdb64450e6d542c SHA512 a1d05f58fa0b97ccd796a85084aeeb7ab494f74f8f5a0e90b55ffe37eeecfa496d8ff5a20361152ed5b108c43c86e16e1a2e1f4d6ec7ef2009b813319ddcd7d7
+MISC metadata.xml 635 BLAKE2B f0f88e15dc93a28612644bc4de79e5fd8e50493a8fe82103d945c336c2f3a78bfad3fc176b1929b868809e3b7c79161db3e909b2224f93d4459bf044091bd65e SHA512 e839b41b146fc0a2ecf03559e886c15daeca4518ff887175877690456d82b1971d30bbf6dcc1dc33df8e7393f9f79b4b58391764070d7ad50018fa26a6cdda3b
diff --git a/dev-scheme/guile-lib/metadata.xml b/dev-scheme/guile-lib/metadata.xml
index af704cda2400..1baf3419e74b 100644
--- a/dev-scheme/guile-lib/metadata.xml
+++ b/dev-scheme/guile-lib/metadata.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -12,4 +11,7 @@
     modules into a coherent library. Think "a down-scaled, limited-scope CPAN
     for Guile".
   </longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">guile-lib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/guile-ncurses/Manifest b/dev-scheme/guile-ncurses/Manifest
index 2f704c14ce15..de50d5625bee 100644
--- a/dev-scheme/guile-ncurses/Manifest
+++ b/dev-scheme/guile-ncurses/Manifest
@@ -1,4 +1,4 @@
 AUX guile-ncurses-3.0-slibtool.patch 1593 BLAKE2B ffabe52966b527e6d27da9a7d5518d48db875b5cf1dbbb1c435d990ced5011c41a2d81e9c0a8dc1dc7e2cb042643989777262e9c856c02aaaa8887494859b4c1 SHA512 9c7b1419c21525c6abc91d5b9c9b00ad3ae64a97fd6f1f1bc05dd80f77603706f702def71af5f0bbc85cd5eb4beed4c35b14cadbb289c726d14aedb4e2bda897
 DIST guile-ncurses-3.0.tar.gz 910030 BLAKE2B e7bfa1e7c7ff8fd4e8b653a5bcada99f8f047142322e4abb946cd42b27bd1d2014f904b5a73d5356ad95bec1c394d0b76ad06204a7d117ab4c2e9a3181633fa2 SHA512 6f36ec57b1835dc90f6691243e3b627e067522c78ea620fc109bf270016034842a933c2d9e09c1a3998a740ae17cb1b7ae291d3e4c578c54128eae4c88a450ac
 EBUILD guile-ncurses-3.0-r3.ebuild 1522 BLAKE2B 880d6941a01babcb35ce3f2294eb4696fb85f196968d089a4e8792b14f0c41fb2927c2791aebe1cf487445054c22a3815e1461dd0f49775ee08a7e51c514448f SHA512 d252196876f0e432c8e83effcc291a89bb8c2c3db6addd28598e06583cb418afdaefb32b80bbde2fe0c8489107799d0f98ff8db8bd24a7e4f428803a1ffccf8e
-MISC metadata.xml 547 BLAKE2B 6607b13dbae6f4aa4364cb8227c49bc96ab5bccd739af9c8c6731974132be80f9ef891c642c58cb0591678fdca5902df765f35a56df33faefd9833e695d950cf SHA512 a1fed1ceed50336ecdca1b6f8e17ea85bf81808fc2230215e52e654a3a7c8f10890978f057972f501d72d798b1e75b114fac4c6f53621120c205fdea1bf39057
+MISC metadata.xml 630 BLAKE2B b0867d55ccfe84db33d8dc2675a4a8928d253f1e616d0a8d3836130c466dcc822bd78a432d3ba11257e0c77d3281dbb9e6db41a5a5f34056ce3f086da47d207b SHA512 4471f1852f73f9bc1654c333092e1e230c3395e705cc5cbb5a3a3c1eb3db1ddfa124f4efe020cd1eaef168150a9de6f8c2b35585d7c13de7d4d76717c6c0f4f2
diff --git a/dev-scheme/guile-ncurses/metadata.xml b/dev-scheme/guile-ncurses/metadata.xml
index 8619d62c721c..4b46b92b4643 100644
--- a/dev-scheme/guile-ncurses/metadata.xml
+++ b/dev-scheme/guile-ncurses/metadata.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -12,4 +11,7 @@
     interface functionality is built on the ncurses libraries: curses, form,
     panel, and menu.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah">guile-ncurses</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/guile-reader/Manifest b/dev-scheme/guile-reader/Manifest
index 8842880a0b66..5ad63996874f 100644
--- a/dev-scheme/guile-reader/Manifest
+++ b/dev-scheme/guile-reader/Manifest
@@ -1,3 +1,3 @@
 DIST guile-reader-0.6.3.tar.gz 691612 BLAKE2B 504152d3a194705435efa4e2d2b51fd1bc22a998161b09ef0157c13bf46ef593be0101d6b72e197818a8ba18406db0de518423a168d36f54616dfcd4e807f3b9 SHA512 0f9f47ee5f24ebb79894863ac96d63b0c7d2801020a212c59d11c7685ff4006a646be988a696a9b623dc0e0605f46d4a9a8680bfabd299878e41eab92e75efd5
 EBUILD guile-reader-0.6.3-r2.ebuild 764 BLAKE2B 2294e8e060d91fecc9e72666c6fdc23b0427f7212924f45d38da28ba90b9cb5c691eb80ffc3b20372291dc2a893ba7da552b4bd8b10784f6addc7dd32329ea95 SHA512 83e660e00c4fd7940d53d06a4d8cb30dc7a3c64351d28a3da1eb08ceac7c98ad9c0040195f28d4ff893b7bf1d19afb87470f8c5098e622eb27c7de35db53cb67
-MISC metadata.xml 885 BLAKE2B 25f338ee36a7e294668db31c6f676b1137d8538a24fe22738b9afbe6417992fa1045166e255047b625b96f060094fa597d875c88d91ad6e7ccc8fd207e01d111 SHA512 fbe036926ce498cf2d3626962e5e178d9251fd708416ccd2e5873de9713185dfb68ea6b45a92d7d8687b95e729e07c64c328cb5926dafc0b35db7db24adaaa6d
+MISC metadata.xml 974 BLAKE2B 1ae5959d148b9110d539b6399d77b5c54d873423ea79e33533353133c2d4c4adccc63213ad22c15ea0d4bbee47e82f8f5ac507757f6de903f2b6305dab42c46b SHA512 eb374317ab6b7b81f34241f454ece70defe34c319c1266b7eaf03502f96f77b4200cf1762a035c26f67d86bea43db633c6375528c49d7260c3114ff469709c44
diff --git a/dev-scheme/guile-reader/metadata.xml b/dev-scheme/guile-reader/metadata.xml
index c3ad052549f5..118c6ab5a22f 100644
--- a/dev-scheme/guile-reader/metadata.xml
+++ b/dev-scheme/guile-reader/metadata.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -17,4 +16,7 @@
     hopefully more powerful and flexible (for instance, one may instantiate as
     many readers as needed).
   </longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">guile-reader</remote-id>
+  </upstream>
 </pkgmetadata>
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>
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index bb59c87e125a..b09a0b8c3f8b 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -5,4 +5,4 @@ DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819b
 DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
 EBUILD kawa-1.14-r2.ebuild 2534 BLAKE2B fa3cc1865cf3dd81cb12fa3c8b779e0b1639d3d4a36b18348c61089fb13eaf523a9cee28027770d6a8314bb60ac1b2de1794a061d8546265cd78ef4f5e06c6d5 SHA512 7bf8197e38e2548d64005be55b3321c7518306dc43bc816b5a5df8057bc7767025b4615d0bb9367c9c7810ebf0873110997819d0fa296f76184d48db0c553f4d
 EBUILD kawa-3.1.1-r2.ebuild 2083 BLAKE2B e60d221bbd3ad4ff76091de0d1f3741cb5a1af42c90d3a519aeeaf1960def524d4ee3c3d2b57e84522b1b69e09c9e46acfe9bf420068a55b7ad043503b36dc5f SHA512 59417528b06f6899a5ecffccddec173fa5fe8024d36b65e3b792cbe7a5c751b1a52b68d1fa2e1ee445dd78ca4de9b06291170289eab235848a19dcba8ddd9b6e
-MISC metadata.xml 1178 BLAKE2B 5a7b5ef1369023679f8227368b53f9a5f18307ff19bd2d34c50e42ec5529c53cc74d462ecdcf0ad117ee0d6f7b2d8651e184e154b3cb40ed9eea91ddd4966e57 SHA512 137a0aa387493f4977a4b5ae7855360a858d0c33417f3b6473cc9354745bff5386c7c15598cafa874021c3027588d66e50c1c50aa2d5c1937b0a14e1875faecf
+MISC metadata.xml 1282 BLAKE2B 3b8367cab14c4f88b83c39f7176ec3d558a03ca180f0399bb82263c45f9085a0b51ab78ed205fbefd2b39d04cb6ed1d19e2740b100f1fa3309ce917048ec41fa SHA512 fd40f62e5453aa75899734ee39cae7668325fbb4d2edb1a38eea704e2be2142d57eb49e5b68b2287e10cd21a27d43257c53b05b9cf18a90ab45b63c9050f1822
diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index e615c19cca90..ca065e85243e 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -1,27 +1,30 @@
 <?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">
   Kawa is a full Scheme implementation. It implements almost all of R5RS,
   plus some extensions. By default, symbols are case sensitive. It is
   completely written in Java. Scheme functions and files are automatically
   compiled into Java byte-codes. Kawa does some optimizations, and the
   compiled code runs at reasonable speed.
 </longdescription>
-<use>
-  <flag name="awt">Assume AWT is available</flag>
-  <flag name="frontend">Build "kawa" front-end program using
-    <pkg>sys-libs/readline</pkg></flag> 
-  <flag name="jemacs">Build JEmacs</flag>
-  <flag name="krl">Build BRL emulation and KRL</flag>
-  <flag name="sax">Assume SAX2 is available with <pkg>dev-java/sax</pkg></flag>
-  <flag name="servlets">Build support for generating servlets with
+  <use>
+    <flag name="awt">Assume AWT is available</flag>
+    <flag name="frontend">Build "kawa" front-end program using
+    <pkg>sys-libs/readline</pkg></flag>
+    <flag name="jemacs">Build JEmacs</flag>
+    <flag name="krl">Build BRL emulation and KRL</flag>
+    <flag name="sax">Assume SAX2 is available with <pkg>dev-java/sax</pkg></flag>
+    <flag name="servlets">Build support for generating servlets with
     Java servletapi</flag>
-  <flag name="swing">Assume Swing is available</flag>
-  <flag name="xqtests">Support XQuery Test Suite</flag>
-</use>
+    <flag name="swing">Assume Swing is available</flag>
+    <flag name="xqtests">Support XQuery Test Suite</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">kawa</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/skribilo/Manifest b/dev-scheme/skribilo/Manifest
index e8605103d902..6ec87a2eae6d 100644
--- a/dev-scheme/skribilo/Manifest
+++ b/dev-scheme/skribilo/Manifest
@@ -1,4 +1,4 @@
 AUX 50skribilo-gentoo.el 116 BLAKE2B 1b699d8a6965131650d6d46cd5d2f0280a6cb0c781194adf48b708fd826cc8f94c8d3e1109766e3966e26f161cd12e89f2cc61bd7a3cb0bdbf74051866cfa467 SHA512 f8cb01127dfcdf8f5c88a4c928f2f80db70a40f03166744d3a7989b34a6d4cf92e1815da329f64dccf7ea6fa1d489744a786f04e7f34fbee654bb80294e81356
 DIST skribilo-0.9.5.tar.gz 1520763 BLAKE2B c624174a29cb7eb7236b8de506ade00c58fdd895807bd3e052872b7d950be9106daef6015c34ff8b5e7888b43383cbfa5c29c62835d02121cac19062985c6032 SHA512 22dff4523039792bd3662f9f1302569bfb83d92b7106ae22b8926e264b00932ea50ab753bb83aed499d0aa651d0fe99fdfd28b83956ec3ad84b81078391fe014
 EBUILD skribilo-0.9.5.ebuild 1505 BLAKE2B b6c84dd3e5c5e33b14bf8e7d86222959af418c6a83d5f1c493106db3e9600fe1d0ceb06ab331ee30edb319f1e0ef9a59eca1c30fe30a0da17a045cf73982c019 SHA512 3660956df88e8a50f4c889b11c6f959dd2aca665823f7a71776bb763dea4fed47fa970565793684c9f21a46130da87ac495f1e3c7179e34c71ef4487497b3e12
-MISC metadata.xml 968 BLAKE2B d503b255bcca3c11002b1a09dafb983742b0e9610be1c4361c764fbe3edcd5c85ba60a9157825ce7f8e95bf73066bb8204d45d4fad372c36cadb14d9b237da3f SHA512 254374cdbc550ab09b684670adedc14dbdb29c95741d030959a3b07d830056561be40b4874def164688a2d7d2afa0474eb27ec17348717363e08351ad4660cfa
+MISC metadata.xml 1053 BLAKE2B 452f296854af714d4ad057767f6736532d03e79fdee2c36b6f7bb6e4c0e3dc37d3855455f964ee006f312e641b393964f987db4a102629c220445bd46d7757fa SHA512 234d00b57d14a7c4efb063ae78f590a695f2bb5cdab60cd5020fc4561d87f4f09e40fdc1ecf41527f9a8c491b22fdd62c8969f236b2227a04da7f40448022608
diff --git a/dev-scheme/skribilo/metadata.xml b/dev-scheme/skribilo/metadata.xml
index 24602493b44a..40b5bcb1eb93 100644
--- a/dev-scheme/skribilo/metadata.xml
+++ b/dev-scheme/skribilo/metadata.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -18,4 +17,7 @@
     conventions used in emails, Usenet and text.
     Lastly, Skribilo provides Guile Scheme APIs.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">skribilo</remote-id>
+  </upstream>
 </pkgmetadata>