gentoo resync : 13.10.2019

24 files changed, 11 insertions, 410 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index b6c9b9a631ec..c0e8b3ef27b7 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index 03bc5fd1db4c..9cca62ce1098 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,3 +1,3 @@
 DIST chicken-4.13.0.tar.gz 4244358 BLAKE2B c40a28346fb6cd144e33605235ed022d48103edd1db1ae35e109e266989caaa0bf8fabf75e8b9cb740ac8bf4e3fba74218763573485127acacd001b8767cd088 SHA512 02c2035b4f81da6f4af2d246361ce8debdc9d9c663c3f43b7afb9abbf1ff591a2bb8fa144511b4d747a373dea4dcd9c10cac48466bf97032db76f3830c08709d
 EBUILD chicken-4.13.0-r1.ebuild 1705 BLAKE2B a7a2776b55a6fbdd138c97d19dee33da35c318a702bc5111d7f2cd00ce51092c3d48d4e20d1bb3d73ad312f9ea47e25bde8109c88f9a683cd8681f6dfe05dcd9 SHA512 13ef326edf1f30542962c0c00f45bcab8649fdbc996602113af1494ac0b12c4a10c4a7f23b89163eb44b81fd899432758c75ec3ff1a251f85163f283b7e3a551
-MISC metadata.xml 936 BLAKE2B 96cbe24b66ac44357e600e229b2253fafb8812aa374903295f4eb252c32d5f7db20e18f22fe8cd8e150c9ab5deb9a92b5a8ff5c086e569db4f0f3853a9f8290f SHA512 089503adb17c643f2f28b90102eae6c706e3f187c1cc060bfc86626fc6e5bea03b6ec53c7f799586b61e107ed295a6b416358df12f8434f2e3caf3b0ace061ea
+MISC metadata.xml 723 BLAKE2B 658e75690d9f1bce0d04c97145c23c3ade7008749cdd44d5ad32d38aa838a75cb6de84bcd5df2c9e5ac20b8264e81144aff1417f4b029a9f302df953ef91dbf2 SHA512 84cf5df961464becc05d8e5f4585136d99309b3132db0c4529bcd3e8434de78974a4699ab4e5e2d3e8feb6abfe8b69f2ee9324226e0f0c4b865a323838159c72
diff --git a/dev-scheme/chicken/metadata.xml b/dev-scheme/chicken/metadata.xml
index 0d1a5690eef1..05e1d88e139f 100644
--- a/dev-scheme/chicken/metadata.xml
+++ b/dev-scheme/chicken/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>ewfalor@gmail.com</email>
-	<name>Erik Falor</name>
-</maintainer>
-<maintainer type="person">
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
@@ -13,10 +9,6 @@
 	<email>scheme@gentoo.org</email>
 	<name>Gentoo Scheme Project</name>
 </maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
 <longdescription>
 CHICKEN is a compiler for the Scheme programming language. CHICKEN produces
 portable, efficient C, supports almost all of the current Scheme language
diff --git a/dev-scheme/guile-cairo/Manifest b/dev-scheme/guile-cairo/Manifest
deleted file mode 100644
index 27b0db192875..000000000000
--- a/dev-scheme/guile-cairo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST guile-cairo-1.9.91.tar.gz 578928 BLAKE2B e0b766e1a83ca8d630760b8bdfab0bb0f26cd58bc6e73198f197ae7de7fd53e5a377b64f8b06f69a037caf566d94ce172e6f62a5b0114eedf859ddb6eb9d8021 SHA512 bdade3463bdac2f29519ef3001286e07ca3c57615183f2e5ac121d273f49c4dafaf3125ef7f8630e0695c0d73368c98241c59acdb9c5682be42bddbc4b5a28ac
-EBUILD guile-cairo-1.9.91.ebuild 632 BLAKE2B 95fd2a5ac2a2231a6b2d286a98bef0f4bc42e6db9ea291886c7315ca57c1aca093767a52faee530a585598f36cf8e911eede0e5b9f4924e616c526166e9f4228 SHA512 7972201cefe7ba7d86009e2864f6ff7f97f65c9715e4b9e61900ecd89969d1af995c9b9a5efa75f36978efd3523ca69e0fb308d461d276c820162a1712dda894
-MISC metadata.xml 656 BLAKE2B 6c5e7e33fcbb53fecd80e13d4e66c0a5fa3126ec3a590dd5136490bad12ec64c722701b2ae2ef700a192d3b8135e77b0c8457f531b677a80fd7d1d66f17e3f7e SHA512 25b8b5f5b1ba90a7438c1dafbfe3a9a8ec9e2cea847f7722e33416a96bbc3dd5531d5e2607a803496aa3b71505b8a728e2d30e841e399ed30361853a54917267
diff --git a/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild b/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild
deleted file mode 100644
index 44512e050934..000000000000
--- a/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Wraps the Cairo graphics library for Guile Scheme"
-HOMEPAGE="http://www.nongnu.org/guile-cairo/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	>=dev-scheme/guile-1.8
-	>=x11-libs/cairo-1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-scheme/guile-lib )"
-
-src_configure() {
-	local myeconfargs=( --disable-Werror )
-	autotools-utils_src_configure
-}
diff --git a/dev-scheme/guile-cairo/metadata.xml b/dev-scheme/guile-cairo/metadata.xml
deleted file mode 100644
index 3c835e318c41..000000000000
--- a/dev-scheme/guile-cairo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Guile-Cairo is complete, wrapping almost all of the Cairo API. It is API stable, providing a firm base on which to do graphics work. Finally, and importantly, it is pleasant to use. You get a powerful and well-maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-scheme/guile-gnome-platform/Manifest b/dev-scheme/guile-gnome-platform/Manifest
deleted file mode 100644
index 852ef784d23a..000000000000
--- a/dev-scheme/guile-gnome-platform/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX 2.16.1-conflicting-types.patch 1584 BLAKE2B 06392a5e1c2ee0036d022f9a8acd44e5e63f9ccfe72e6eda9dd186149c183dc01e3cd0f68e603f61e2089768e5012faea9ceabce3a0c38f5ee3f4ebdcd7bdedb SHA512 21ff8196a718d273e0901e70df62b7caf291e1c28988e1f972482302893a1193faa9ccff68378ae75e0aafcfbd9bef57106a30b02433ce3cdb07d14d59d29f86
-AUX 2.16.1-gcc45.patch 343 BLAKE2B 5b050c157845adf0b97d2b53e1795db60feead7bcef4d57c911e813ef6adbb288daea68b1366d0f083fa885bac574919afef6a7c7763d24906047da77c1367dd SHA512 a0412c07376b6e5e701428ca6a0f85b8762506c3fd86a76ca6a5641c4db1cd9be9cc97747f851d95fd6dbad8a02f7f1d5b11b7c649e927888c1e9a0909a8cba2
-AUX 2.16.1-gdk-color.patch 2328 BLAKE2B bbe5837601ac13097832a5488737eaf159ce4bbed0025745d956344c8a7355b1065efaab01af2fd7843a7bd3d1d8a9f9aa0c533315a00dddd0f8e4288864f366 SHA512 40e2b2838c18102c71d3a3132331332aa68bf9e7d202ced159c91444c30648a0c1c8afee106ec0b8b8012dc840eaf3466181887835ea62bff41dc1a7282faf71
-AUX 2.16.1-glib-single-include.patch 944 BLAKE2B 251be62ed49d67a234b5ca321c19febffd54ac3b4b4dfb84a42d84771cc4b17bc33adb19daacb4ac7ba6ea6afef69cb69e62c5f1e15e2911fce6970287dbec9c SHA512 f50eb52f0150a365f79314f1756c6ae78018a18ecbb488e830c27d4e76c3da6ad2bf46c7d44a35d3172c57bf709f5d4614ffba7652a5b459b542a0994ca47dea
-DIST guile-gnome-platform-2.16.1.tar.gz 3494333 BLAKE2B edd5c91a263c9a6bedb884d842f629c7d4fa610f5a4ba277ca374279a5abbcf5c1fb9ff85f7bb5faaed8905ed0eaf711bd469d86062d293930ca885b1aadc271 SHA512 c630e2d67b312fb41c8492f8956902f385faa834094860cac580d1df0329b41790d973f73fd7dd59dc365f5d6cfb6463cde8af90641fbc377680b51616ad8f7a
-DIST guile-gnome-platform-2.16.2.tar.gz 2538191 BLAKE2B e16d3d667996c822401a4e3982728db91dda1f02be5739b7dd0795466f0976f3fbb2692a21918f2f6c2502faf5c90bb0d287de171d80cece41353cccb2715488 SHA512 5acaa96d8caf82864ada8bfcbc4954a19cd5d7e210245f2e8b31082c6a9e4ab9ba7af5f8e1f762a891e1aad640913a7a205f56dfaed6915a9f782c53e042d042
-DIST guile-gnome-platform-2.16.5.tar.gz 2484146 BLAKE2B 27111fec80bf7ec52f0c1fe4ef375bd5dd06b1900d13398c5e91d86c1a65efc7723af91e2896f53d8a69f0df849627993a433a07a98920957dcd33981e5f78cb SHA512 fc6afd4b1034f0ff8165611047928e71db445b81e17ef47e0327a511a3733f14a02d308998f7322375acc2713f8bab4de390df39616f55e586adb25fc3160033
-EBUILD guile-gnome-platform-2.16.1-r1.ebuild 1448 BLAKE2B 51b2633a873f7eaa7797459ddbab32eda473325af35ef00ea26d01cca555a437b0a40ce0d69730dd77814eba48f4e43fe536414922b190263325e4541522cc68 SHA512 4ea5b6c916e2b7fc334e9352fa58f655052663e357222a536b20aff7536482d3386c34a844f68a828117a1adead8d751aa0dae32f11c2a01b26e126a8cb2906f
-EBUILD guile-gnome-platform-2.16.2.ebuild 1235 BLAKE2B dc6a0e0c086c4954adc50928b7d230eb9db0dd52e14bce7de6553a56a0ac6eac44b9285ab4340c95bce3c5e5d3101d0868546edb84757cb80398334eb06755c5 SHA512 16b515053e940e574e2695a25ad089efaead772b3589a8d7c5d12e056bf568541539b57eef958cb704c20d710d941a38d33f6cc91d8c18aafbddbeb3e30d4161
-EBUILD guile-gnome-platform-2.16.5.ebuild 868 BLAKE2B f9d0083611e368ff10263942ad6b5e9b5f77cba952f336aa062e50f70aa181a594524745c9a19fd86726bb4800f9203a1fd64c78e32441b1758072f393ed4971 SHA512 f041ec467ad927a7343465bf579659662928726f65f3c4498f662882128fe0258927c36f8928d043cdc4b39dc5f1a1e49adc77c30dba8d596ce4324875c900f1
-MISC metadata.xml 255 BLAKE2B e964916ff43a4807177c33fdb84eee27b3683571dfc9038e69bb1e2d99a996d8db529a4d894b88c1d9cb8771e0bfa15be4f8411320be05254be0185241649b07 SHA512 39d166e37ab93cad3ab7852f67a51422f3e2c3b23c79227ce1379e833455ac750cd69cba663a693fec0fca564434d56decaef0d03eace2ed9ce871805b537eed
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch
deleted file mode 100644
index e470977acbc8..000000000000
--- a/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/293655
-
---- guile-gnome-platform-2.16.1.orig/gtk/gnome/gw/gtk-support.c	2008-07-03 11:52:27.000000000 -0300
-+++ guile-gnome-platform-2.16.1/gtk/gnome/gw/gtk-support.c	2009-11-27 03:09:28.204506213 -0200
-@@ -1012,7 +1012,7 @@
- }
- 
- GdkRectangle*
--gtk_widget_get_allocation (GtkWidget *widget)
-+guile_gtk_widget_get_allocation (GtkWidget *widget)
- {
-     GdkRectangle *ret = g_new (GdkRectangle, 1);
-     *ret = widget->allocation;
---- guile-gnome-platform-2.16.1.orig/gtk/gnome/gw/gtk-support.h	2008-04-09 19:10:40.000000000 -0300
-+++ guile-gnome-platform-2.16.1/gtk/gnome/gw/gtk-support.h	2009-11-27 03:08:29.385756221 -0200
-@@ -117,6 +117,6 @@
- guint _wrap_gtk_ui_manager_add_ui_from_string (GtkUIManager *ui, const gchar *string, GError **error);
- 
- GdkWindow* gtk_widget_get_window (GtkWidget *widget);
--GdkRectangle* gtk_widget_get_allocation (GtkWidget *widget);
-+GdkRectangle* guile_gtk_widget_get_allocation (GtkWidget *widget);
- void _wrap_gtk_drag_dest_set (GtkWidget *widget, GtkDestDefaults flags, const GList *types, GdkDragAction actions);
- GtkStateType gtk_widget_get_state (GtkWidget *widget);
---- guile-gnome-platform-2.16.1.orig/gtk/gnome/overrides/gtk.defs	2008-04-09 19:12:44.000000000 -0300
-+++ guile-gnome-platform-2.16.1/gtk/gnome/overrides/gtk.defs	2009-11-27 03:13:34.667506321 -0200
-@@ -848,7 +848,7 @@
- 
- (define-method get-allocation
-   (of-object "GtkWidget")
--  (c-name "gtk_widget_get_allocation")
-+  (c-name "guile_gtk_widget_get_allocation")
-   (return-type "GdkRectangle*")) ;; same as GtkAllocation
- 
- (define-method get_state
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
deleted file mode 100644
index 39c7e94760bd..000000000000
--- a/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- common.mk
-+++ common.mk
-@@ -50,7 +50,7 @@
- 	guile-snarf $(GUILE_SNARF_CFLAGS) $< > $@ \
- 	|| { rm $@; false; }
- .c.doc:
--	$(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
-+	$(CPP) -P -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
- 	  | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
- 
- %.scm guile-gnome-gw-%.c: %-spec.scm
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch
deleted file mode 100644
index d7836ac489f9..000000000000
--- a/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: gbenison@gmail.com-20080728153014-9cmh3qp4879910dg
-# target_branch: http://arch.gna.org/guile-gnome/bzr/gtk/
-# testament_sha1: 1dd74795aba452934a0810f47bfe1ad34b958e4b
-# timestamp: 2008-07-28 08:36:30 -0700
-# base_revision_id: wingo@pobox.com-20080703151735-je9a72h0nlq3eere
-# 
-# Begin patch
-=== modified file 'gnome/gw/gdk-support.c'
---- gtk/gnome/gw/gdk-support.c	2008-04-24 11:17:07 +0000
-+++ gtk/gnome/gw/gdk-support.c	2008-07-28 15:30:14 +0000
-@@ -228,11 +228,22 @@
-     return ret;
- }
- 
-+/*
-+ * Allocate a new GdkColor* which must be freed using
-+ * gdk_color_free().
-+ */
-+static GdkColor*
-+gdk_color_new()
-+{
-+  GdkColor tmp;
-+  return gdk_color_copy(&tmp);
-+}
-+
- GdkColor*
- scm_scm_to_gdk_color (SCM scm)
- #define FUNC_NAME "%scm->gdk-rectangle"
- {
--    GdkColor *ret = g_new0 (GdkColor, 1);
-+    GdkColor *ret = gdk_color_new();
-     
-     if (scm_is_string (scm)) {
-         char *chars;
-
-# Begin bundle
-IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZjPJ74AAbHfgEAQUXP//3qA
-AAC////6UAPZV7KKmigbBkSKemTJNjQBMKepo9RkZNGQ00MAAAABoAAAAAEomgmgaCTNBR6NQHpD
-0TTT1GjDAAAAAaAAAAABJIQ0j0TBJ5JiGmAppkZBoZHetMt0dHeL+Zs1essYZwmiipWtmW5noD6t
-JP2bTdtsv1JJPzNyeehztVVSPROr6m0YKZQFaOWu+z06Rud5U/7D6/HzSd7loXjOuOtTyhUB1+CF
-uquimbPJylUSYlaqGEDm3OnfJaLqj2yQ6r3QgKpKtA0pmW2HITLziKOTjm/fVLt6fxQHZtkGFTeB
-FuHcCiRWzsuJDoOcpYPAVFiEB8InMDl4naQHikc4a1XMxmYpaVYnPm2xrL3exYl0MEuEnlJO+JM5
-UFYwKS8BCwsgYhIWS2kuWGPMseMJO8ncXBIuJJ/X3ZRKMVCSIGaSULHRgmhOe9tGooKytZCskgmJ
-VS3QycULqKoxuNQ40lJoxtNxRyHHy7M0nUOE7BicXaUrMD5NrgsTCJtL8C5FPpE4MOJhg9nMJwT3
-DIsLzYUpCYlqPMWnEscKgQYSs2YjyQ6qxhXiYYlgxArte4UW+sCwwi2FpYQLks5oURZypVRHaVFP
-pJwmgV89TYjcTRROinDCUijL3O+eY5U1957/RoOIq5mRPALX3Kin8fYD/w9R85hVuGpzKzOiC8oV
-dPSyI6qB4jHE1b13nz11zltZaFSX1tLIcaRTqymf46deB05hZeUhBjGBqRcFZ2XkTb8hmPQXCMP0
-tfrRiWC4H2BiBEq5zGkSOGJoLiorU6aBWik6E8Rdxl/gYWG3ds790ppnbBuHeVHwr+HA0EfQlKAc
-q/E8AntpuJ1obUmOUEnfKYWm3NSt+oNhgoiNKKE+jOcy30xMx7eHGTLe33vIVOBzpxG8omhwPoNo
-PUmADruvHqaAVsAj5wgV2JksOsiBgWJZJ5ceoZqpB76oTzAbgKgLn8+qwLOWhwi4O5KK3uWHx6y8
-xGhbXvEVnkl2qk3YyJxYRuKNpjChsznCTyZ4PfeDxdm8DFXuCDIZbZWg3Yr6/kuYYAypBkmDrMiE
-4iIZlSOUreq0/wTGBllkoFAYcVIzkYjT/nQq/MW2bYwSTILXX3uG2etAsP61m91rJ9MZK6x94QmG
-YZNAZtZGfFMR1gOijgJD1tiHFaPr3/XjtiadSQ2LOpiSg+seT5OMoANJeQvIZNTBh4134wCOLGE6
-SCzdOZStqOnvfsWpi8GtD3xaP8XckU4UJCYzye+A
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch
deleted file mode 100644
index 84f8c8761fbc..000000000000
--- a/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: guile-gnome-platform-2.16.1/corba/gnome/corba/guile-gnome-corba-generic.c
-===================================================================
---- guile-gnome-platform-2.16.1.orig/corba/gnome/corba/guile-gnome-corba-generic.c
-+++ guile-gnome-platform-2.16.1/corba/gnome/corba/guile-gnome-corba-generic.c
-@@ -24,7 +24,7 @@
- 
- #include <guile-gnome-corba-generic.h>
- #include <guile-gnome-gobject.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <string.h>
- 
- static GQuark quark_corba_typecode = 0;
-Index: guile-gnome-platform-2.16.1/glib/gnome/gobject/guile-support.h
-===================================================================
---- guile-gnome-platform-2.16.1.orig/glib/gnome/gobject/guile-support.h
-+++ guile-gnome-platform-2.16.1/glib/gnome/gobject/guile-support.h
-@@ -24,7 +24,7 @@
- #ifndef __GUILE_SUPPORT_H__
- #define __GUILE_SUPPORT_H__
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- #include <libguile.h>
- 
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
deleted file mode 100644
index cb8d91a9a8d5..000000000000
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils multilib
-
-DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
-HOMEPAGE="https://www.gnu.org/software/guile-gnome/"
-SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/g-wrap
-	dev-libs/glib:2
-	dev-scheme/guile:12
-	dev-scheme/guile-cairo
-	dev-scheme/guile-lib
-	gnome-base/gconf:2
-	gnome-base/gnome-vfs:2
-	gnome-base/libbonobo
-	gnome-base/libglade:2.0
-	gnome-base/libgnomecanvas
-	gnome-base/libgnomeui
-	gnome-base/orbit:2
-	x11-libs/gtk+:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-#needs guile with networking
-RESTRICT=test
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	PATCHES=(
-		"${FILESDIR}/${PV}-conflicting-types.patch"
-		"${FILESDIR}/${PV}-gcc45.patch"
-		"${FILESDIR}/${PV}-gdk-color.patch"
-		"${FILESDIR}/${PV}-glib-single-include.patch"
-		)
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-Werror
-		)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile \
-		guilegnomedir=/usr/share/guile/site \
-		guilegnomelibdir=/usr/$(get_libdir)
-}
-
-src_install() {
-	autotools-utils_src_install \
-		guilegnomedir=/usr/share/guile/site \
-		guilegnomelibdir=/usr/$(get_libdir)
-}
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
deleted file mode 100644
index ee22dd2fc05c..000000000000
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
-HOMEPAGE="https://www.gnu.org/software/guile-gnome/"
-SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/g-wrap-1.9.14
-	dev-libs/glib:2
-	dev-scheme/guile:12
-	dev-scheme/guile-cairo
-	dev-scheme/guile-lib
-	gnome-base/gconf:2
-	gnome-base/gnome-vfs:2
-	gnome-base/libbonobo
-	gnome-base/libglade:2.0
-	gnome-base/libgnomecanvas
-	gnome-base/libgnomeui
-	gnome-base/orbit:2
-	x11-libs/gtk+:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-#needs guile with networking
-RESTRICT=test
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	PATCHES=(
-		"${FILESDIR}/2.16.1-glib-single-include.patch"
-		)
-	autotools-utils_src_prepare
-}
-
-src_compile() {
-	autotools-utils_src_compile \
-		guilegnomedir=/usr/share/guile/site \
-		guilegnomelibdir=/usr/$(get_libdir)
-}
-
-src_install() {
-	autotools-utils_src_install \
-		guilegnomedir=/usr/share/guile/site \
-		guilegnomelibdir=/usr/$(get_libdir)
-}
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.5.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.5.ebuild
deleted file mode 100644
index 8a50cbeef7ce..000000000000
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
-HOMEPAGE="https://www.gnu.org/software/guile-gnome/"
-SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/g-wrap-1.9.15
-	dev-libs/glib:2
-	dev-scheme/guile:12
-	dev-scheme/guile-cairo
-	dev-scheme/guile-lib
-	gnome-base/gconf:2
-	gnome-base/gnome-vfs:2
-	gnome-base/libbonobo
-	gnome-base/libglade:2.0
-	gnome-base/libgnomecanvas
-	gnome-base/libgnomeui
-	gnome-base/orbit:2
-	x11-libs/gtk+:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-#needs guile with networking
-RESTRICT=test
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-scheme/guile-gnome-platform/metadata.xml b/dev-scheme/guile-gnome-platform/metadata.xml
deleted file mode 100644
index aa9967f46fc6..000000000000
--- a/dev-scheme/guile-gnome-platform/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
deleted file mode 100644
index 5f33040779d6..000000000000
--- a/dev-scheme/guile-lib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST guile-lib-0.2.5.1.tar.gz 424124 BLAKE2B 36aaf66f6a1550e24101547203865fb73f60ebe04d04e13a8244d81cd91510288f00f7c77636b86fd4a5c49f6157e187d623eb26d4ad361e7a284d9dd2f017f0 SHA512 500f0a5c973af1594402a4d564be8a6e559f575e10de35368cbda2d24d73c9b781b06b4a61433cf2609f91a7548903dc01718d70796e48a49c6d50988227946a
-EBUILD guile-lib-0.2.5.1.ebuild 571 BLAKE2B 0651605a1707de030edbbd314a5382aa8bc08a55d044a005afdd1383afc4134434a80093127868a8b09fe818aeb6cc5b3dea760d53d75bb8a5cfb22f5dcccc97 SHA512 2f465adaca9be50942c678a6fe029b0ec762e2941bb28b67e0aa469aab52ce02ab992462e5407be55f59c3bb554bf176e1ed1ff56cfa97f4285884148b1da998
-MISC metadata.xml 255 BLAKE2B e964916ff43a4807177c33fdb84eee27b3683571dfc9038e69bb1e2d99a996d8db529a4d894b88c1d9cb8771e0bfa15be4f8411320be05254be0185241649b07 SHA512 39d166e37ab93cad3ab7852f67a51422f3e2c3b23c79227ce1379e833455ac750cd69cba663a693fec0fca564434d56decaef0d03eace2ed9ce871805b537eed
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
deleted file mode 100644
index f0aefb40e8d8..000000000000
--- a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An accumulation place for pure-scheme Guile modules"
-HOMEPAGE="http://www.nongnu.org/guile-lib/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND=">=dev-scheme/guile-2.0.12[regex,deprecated]"
-DEPEND="${RDEPEND} !<dev-libs/g-wrap-1.9.8"
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-}
diff --git a/dev-scheme/guile-lib/metadata.xml b/dev-scheme/guile-lib/metadata.xml
deleted file mode 100644
index aa9967f46fc6..000000000000
--- a/dev-scheme/guile-lib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 10a2abdd2044..5cc322c8f24c 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -17,9 +17,9 @@ DIST guile-2.0.13.tar.gz 7808173 BLAKE2B e1d59356173b54595512c0322ac596ccf46f566
 DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
 DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
 DIST guile-2.2.4.tar.gz 18094974 BLAKE2B 36e9219bbe675b7ad8a73607a3acddae244a71cac1aff8dac77433da76ecb9f073df723ca3d22a15cf769b2fe5a981aa968bd0983020b3926f08f0b497bdf80e SHA512 a200b83a02ef23c8256d9bfb14a141bb6dbca01279a0587bfb672060429c49093088e4b765b7ee5c85cd587a1aeed77d9438d300d3e67cdd6cebbb794d88171e
-EBUILD guile-1.8.8-r3.ebuild 3095 BLAKE2B 49ca14333d66b339e2ff48e5c6524e16d837876be10d28ed47162ddaae7730ccfc98b7d144213a77dac9da9d8c36ba30617658b92aa4eff4ac510a56a8a1c1dd SHA512 10a4e219a91a2359b789d3fe59dda73a811f7aceda66c5d68e3236a878fb748b6b2ac92bdf8bfba277f9fbd9f90e631635b0bd753eb47c83a0c3d19ba0e19c7a
-EBUILD guile-2.0.13-r2.ebuild 2095 BLAKE2B 70468ad087d4294a7d144bea9c515d2c9b9f106a4dbdf323c6df12e4e7216574bbfaceb9fb19d321503a72957ffefa26a37ec9a26daeab6fe4d17265b2deffe8 SHA512 63fc7096d372812cec81ab5f095277fc8133aeb2ecf8a8dcc7d53249aef3198fc8a0db9231a4494cccd1e31ac81b8a0e3062236540470d4762c3e4396e752e9e
-EBUILD guile-2.0.14-r3.ebuild 2229 BLAKE2B a131c9dcd285ac0758d4661d945969e0ad3d6212b56a1958274aa639f2a28f6e5d31df6e04cc3083c3b13b03f083acd46942a05e794a476da6abe478bd06b7ed SHA512 3d64eb50c0276686105d9d74671ba960982da0641505866b3aca0a60a7484578506b051a6397677274024696b32d2576de1645400107dc18a2a6184abe13060c
-EBUILD guile-2.2.3.ebuild 2011 BLAKE2B d9638074bd6d60a06a5231ff3d7c69be896ffd845aef362b44c4581e0a19bdd839884ccc9f57ec81403d355809ddf98d9ed448d8750ff69809019f45aeb91ea2 SHA512 d568c8481d5f07d7811080702e82a968e0b1968458e0c86e33f8eee5a6e083c89675f3a32ec62519b7179913bc51fb57bfdfce756d21cf2adbb5c7e5ac893ab7
-EBUILD guile-2.2.4.ebuild 2011 BLAKE2B b73868e377fd2a498382d2fd3ce8a467db642629f3a0ae6746ba2948e7037e5f3b4d0f1ca61d9f3f2921ab73e6080ebe89a8272de07e2d5c85f6f51830db5e89 SHA512 72cf9dd3df542bd50ce7a5bcbabf1ecda88748a68915850e3d76427bfb5a2f1d03c6ffe188ddd258a402f00ae6f9bbb2d33f6fd86b674dcff3df0aa96a3f27ff
+EBUILD guile-1.8.8-r3.ebuild 3073 BLAKE2B 4108679370301f49192f5197ed499040b871a6b48e36e4b25356addfe39cc23fb2f2745018adef6a59cf735a0ba965bdd81ae308ca845214b877e3f2907d1f39 SHA512 2813fe73867f13dd8369f6d4a18937f469a9c77577d55ba944c2c2039fc51a949a0a1f4993a1a5729a0f49ad3685bf5c8a2731c928c18cf9915e414193af42be
+EBUILD guile-2.0.13-r2.ebuild 2073 BLAKE2B 4c9205a93ca6b49438619c4221fd2729ecc9495d7c16af1a5fe5e52a3948487c138b0e50aeccbfc45496d80f324296317d4d98fc52de483ad19061ca3d8abd57 SHA512 7db0e37d3054683e2e63170ca5bec50c76ce397725785215dc9db9f7ad96c9796740e25e3da9184df9482c8c7546681184f5d669a9e64a852f8e47d64689eb1e
+EBUILD guile-2.0.14-r3.ebuild 2207 BLAKE2B e9f5c028f3e7b151b714549533f00e5c86e07dcd1e3d63a178c7bbf6a52031b48e5fcc45db94d1cbc37f827961fd0eb74c94960c7a117aa74491a1a6ccb0af75 SHA512 dea404226f9efc3a1abe806e26c7619d3cb6514b23ec103e708cff00a8d1535b30aeda9b8500ffefa4aa1bcad3ac1f71487b683e761d0ce77b97d8c0fbe55f97
+EBUILD guile-2.2.3.ebuild 1989 BLAKE2B 52eb4da270d12eae457c689293e0ba2e208b0e0f3f12fadcfde948c28dec84728701f91f008917533bb771e80849bed3fd846b23761d4a87c959244db517b852 SHA512 3749e1fff824fd4951b92bbc5e3347e7ced1d7fc3121096be46f748bda1cae8fce715ebd25d319e01f4a0e8b4663f260cd0f20b6fe35de406498ca0b159d5760
+EBUILD guile-2.2.4.ebuild 1989 BLAKE2B fa975757aec08c6fcb6f54dd3b2444b62f8729afa2da4a13080409fc1147dc6156c8ffa7e42f6bb983ffc403d6cfdbdfddf0723f21bd7074ec733a90d27bc935 SHA512 246ba38dc4b77a8018103d37b47561225a8ec609ce72fbb7e132ae5fe7e467c93fc3d55b400ca42998e398d4db78d32e56d71dd2e96b903e4a6d10a80af6b10d
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
index 079479f7ab04..99ec9f055c3c 100644
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -9,7 +9,7 @@ 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 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
 
 RESTRICT="!regex? ( test )"
diff --git a/dev-scheme/guile/guile-2.0.13-r2.ebuild b/dev-scheme/guile/guile-2.0.13-r2.ebuild
index 727bcc48100f..042d420fa89c 100644
--- a/dev-scheme/guile/guile-2.0.13-r2.ebuild
+++ b/dev-scheme/guile/guile-2.0.13-r2.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index f3c50eb8357e..4fc9800644f6 100644
--- a/dev-scheme/guile/guile-2.0.14-r3.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r3.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools ltprune
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
diff --git a/dev-scheme/guile/guile-2.2.3.ebuild b/dev-scheme/guile/guile-2.2.3.ebuild
index 84a8c4d8a7b0..694a2d600403 100644
--- a/dev-scheme/guile/guile-2.2.3.ebuild
+++ b/dev-scheme/guile/guile-2.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"
diff --git a/dev-scheme/guile/guile-2.2.4.ebuild b/dev-scheme/guile/guile-2.2.4.ebuild
index 8a45a7efb5e6..0cbe70677647 100644
--- a/dev-scheme/guile/guile-2.2.4.ebuild
+++ b/dev-scheme/guile/guile-2.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"