gentoo resync : 30.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
commit: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree: e907cb121b30e3c1df1710719c0ddf4029597a47 /app-text
parent: db063b515939ab15261136b24e4bc44386335c0c (diff)
52 files changed, 971 insertions, 865 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1cd64ae57454..eb441b62ad95 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 01d1945bea97..54e21b83c684 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,3 +1,5 @@
+AUX atril-1.24.0-make-synctex-optional.patch 16815 BLAKE2B 13c65b9dbf1afa43aa32d147462c90dbad94366b1795b1409746cde2991180a3b2a3266908469b2ff5a4b3107b457ae86a3cb3bc058384877f885a512fabab2d SHA512 cb4493eca4e0bc1bd4a9bdd4540033aad3318023f6101f5548c14c7c7134ce6a4618849df44573af39af7d561ebca4b9b549668e81c50c7432a525db7d0f620b
 DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293
 EBUILD atril-1.24.0-r1.ebuild 2253 BLAKE2B ae262b9f622fbbd916898c936e83d5411501596bd4b1c36ddf057ae4a25aca707f6f4eb7ea8a56ffd3662e9db0b46aaafde49e879ddbd32b67eaeee5871b4de0 SHA512 c76e3f3ebcb797648ee2290e6adcd5920c5a55e01b8f529ca3c58a9b4132baa388bb4aceaadd8e2322821b0cf0f135e1950de096f6b6681299c65cf4a145440f
-MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
+EBUILD atril-1.24.0-r2.ebuild 2933 BLAKE2B 3a0b1a54743998e9f881227a83350cd4f8e01e4d8295dbcd10f812e83c60e2d4dbd330353fd17c8e2cb082d5006f9a441ee9ce5b98d3329ac10ac5f5e6961a04 SHA512 2d86e498774025b1b9949069808c1dab18d3d0845723e4ba5488fda6e48be22a39c9d438c0559a2513ee8a4db72ca910bae846985641c26dce2855dc63157c43
+MISC metadata.xml 887 BLAKE2B 38b14cf53af3c9728f59bc846fe8664092c545703fe542b9264f20aa867e26186c2a0ade2910c8f9040d33f1f882af5b00fb85b181e9a5ddcae92aa0732f385d SHA512 dbf93874246a0f8da95bf6b80968211b58e15c9d14ceddf7bafcee7f073be9d1eedbf0203c796411b2be38d651b110903501dda4a0ee7a1fb6429d1b3d926934
diff --git a/app-text/atril/atril-1.24.0-r2.ebuild b/app-text/atril/atril-1.24.0-r2.ebuild
new file mode 100644
index 000000000000..6947e34b8f30
--- /dev/null
+++ b/app-text/atril/atril-1.24.0-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit mate python-any-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript synctex t1lib test tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11
+	>=x11-libs/cairo-1.14
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? (
+		dev-libs/mathjax
+		>=net-libs/webkit-gtk-2.6.0:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2 )
+	synctex? ( virtual/tex-base )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!app-text/mate-document-viewer
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian
+	app-text/yelp-tools
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+#RESTRICT="!test? ( test )"
+# Tests use dogtail and require using accessibility services.
+# Until we figure out how to run successfully, don't run tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-1.24.0-make-synctex-optional.patch" )
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable synctex) \
+		$(use_enable t1lib) \
+		$(use_enable test tests) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
+
+src_test() {
+	export GSETTINGS_BACKEND=keyfile
+	gsettings set org.gnome.desktop.interface toolkit-accessibility true || die
+	gsettings set org.mate.interface accessibility true || die
+	virtx emake check
+}
diff --git a/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch b/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch
new file mode 100644
index 000000000000..7b2d3a9c372e
--- /dev/null
+++ b/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch
@@ -0,0 +1,526 @@
+From ed650322792514d69ae54eef4cb105cac1dcb4b8 Mon Sep 17 00:00:00 2001
+From: Oz Tiram <oz.tiram@gmail.com>
+Date: Fri, 7 Feb 2020 21:57:10 +0100
+Subject: [PATCH 1/5] Make synctex optional
+
+Not everyone who reads PDF's is necessarily a LaTeX user.
+These changes allow users to install atril without the huge bagage
+of tex-live on systems where synctex isn't provided as a stand alone
+library.
+---
+ configure.ac              | 25 +++++++++++++++++--------
+ libdocument/ev-document.c | 16 ++++++++++++----
+ libview/ev-view.c         |  9 ++++++++-
+ shell/ev-window.c         |  5 +++++
+ 4 files changed, 42 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6fee0ff6e..e7a63feed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -361,15 +361,25 @@ AC_SUBST([GIRTYPELIBDIR])
+ AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
+ 
+ dnl ================== libsynctex ===========================================
++AC_ARG_ENABLE([synctex],
++  [AS_HELP_STRING([--disable-synctex], [Disable support for synctex])],
++  [],
++  [enable_synctex=yes])
+ 
+-PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no)
+ 
+-dnl not found? use internal code copy.
+-if test "x$has_synctex" = "xno"; then
+-        AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found")
++if test "$enable_synctex" = "yes"; then
++  AC_DEFINE([ENABLE_SYNCTEX],[1],[Define if synctex support is enabled])
++  PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no)
++  dnl not found? use internal code copy.
++  if test "x$has_synctex" = "xno"; then
++          AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found")
++  fi
++  AC_SUBST(SYNCTEX_LIBS)
++  AC_SUBST(SYNCTEX_CFLAGS)
+ fi
+-AC_SUBST(SYNCTEX_LIBS)
+-AC_SUBST(SYNCTEX_CFLAGS)
++
++AM_CONDITIONAL([ENABLE_SYNCTEX], [test "$enable_synctex" = "yes"])
++
+ 
+ dnl ================== portability checks ===========================================
+ 
+@@ -776,6 +786,7 @@ Configure summary:
+     Tests...............:    $enable_tests
+ 
+     PDF Backend.........:    $enable_pdf
++    Synctex enabled.....:    $enable_synctex
+     PostScript Backend..:    $enable_ps
+     TIFF Backend........:    $enable_tiff
+     DJVU Backend........:    $enable_djvu
+@@ -784,6 +795,4 @@ Configure summary:
+     Comics Backend......:    $enable_comics
+     XPS Backend.........:    $enable_xps
+     ePub Backend........:    $have_webkit
+-
+-    SyncTeX.............:    $has_synctex
+ "
+diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
+index b713a6717..be082aebb 100644
+--- a/libdocument/ev-document.c
++++ b/libdocument/ev-document.c
+@@ -25,7 +25,9 @@
+ #include <string.h>
+ 
+ #include "ev-document.h"
++#ifdef ENABLE_SYNCTEX
+ #include "synctex_parser.h"
++#endif
+ #include "ev-file-helpers.h"
+ 
+ typedef struct _EvPageSize
+@@ -53,8 +55,9 @@ struct _EvDocumentPrivate
+ 	gchar         **page_labels;
+ 	EvPageSize     *page_sizes;
+ 	EvDocumentInfo *info;
+-
++#ifdef ENABLE_SYNCTEX
+ 	synctex_scanner_p synctex_scanner;
++#endif
+ };
+ 
+ static gint            _ev_document_get_n_pages     (EvDocument *document);
+@@ -124,12 +127,12 @@ ev_document_finalize (GObject *object)
+ 		ev_document_info_free (document->priv->info);
+ 		document->priv->info = NULL;
+ 	}
+-
++#ifdef ENABLE_SYNCTEX
+ 	if (document->priv->synctex_scanner) {
+ 		synctex_scanner_free (document->priv->synctex_scanner);
+ 		document->priv->synctex_scanner = NULL;
+ 	}
+-
++#endif
+ 	G_OBJECT_CLASS (ev_document_parent_class)->finalize (object);
+ }
+ 
+@@ -137,8 +140,9 @@ static void
+ ev_document_init (EvDocument *document)
+ {
+ 	document->priv = ev_document_get_instance_private (document);
++#ifdef ENABLE_SYNCTEX
+ 	document->synctex_version = SYNCTEX_VERSION_STRING;
+-
++#endif
+ 	/* Assume all pages are the same size until proven otherwise */
+ 	document->priv->uniform = TRUE;
+ 	/* Assume that the document is not a web document*/
+@@ -336,6 +340,7 @@ ev_document_load (EvDocument  *document,
+ 		}
+ 
+ 		priv->info = _ev_document_get_info (document);
++#ifdef ENABLE_SYNCTEX
+ 		if (_ev_document_support_synctex (document)) {
+ 			gchar *filename;
+ 
+@@ -346,6 +351,7 @@ ev_document_load (EvDocument  *document,
+ 				g_free (filename);
+ 			}
+ 		}
++#endif
+ 	}
+ 
+ 	return retval;
+@@ -388,6 +394,7 @@ _ev_document_support_synctex (EvDocument *document)
+ 	return klass->support_synctex ? klass->support_synctex (document) : FALSE;
+ }
+ 
++#ifdef ENABLE_SYNCTEX
+ gboolean
+ ev_document_has_synctex (EvDocument *document)
+ {
+@@ -492,6 +499,7 @@ ev_document_synctex_forward_search (EvDocument   *document,
+ 
+         return result;
+ }
++#endif /* ENABLE_SYNCTEX */
+ 
+ static gint
+ _ev_document_get_n_pages (EvDocument  *document)
+diff --git a/libview/ev-view.c b/libview/ev-view.c
+index a195ba21f..e98582d34 100644
+--- a/libview/ev-view.c
++++ b/libview/ev-view.c
+@@ -3210,6 +3210,7 @@ ev_view_remove_annotation (EvView       *view,
+         g_object_unref (annot);
+ }
+ 
++#ifdef ENABLE_SYNCTEX
+ static gboolean
+ ev_view_synctex_backward_search (EvView *view,
+ 				 gdouble x,
+@@ -3235,6 +3236,7 @@ ev_view_synctex_backward_search (EvView *view,
+ 
+ 	return FALSE;
+ }
++#endif
+ 
+ /* Caret navigation */
+ #define CURSOR_ON_MULTIPLIER 2
+@@ -4078,8 +4080,10 @@ ev_view_draw (GtkWidget      *widget,
+ 			show_annotation_windows (view, i);
+ 		if (page_ready && view->focused_element)
+ 			draw_focus (view, cr, i, &clip_rect);
++#ifdef ENABLE_SYNCTEX
+ 		if (page_ready && view->synctex_result)
+ 			highlight_forward_search_results (view, cr, i);
++#endif
+ 	}
+ 
+ 	if (GTK_WIDGET_CLASS (ev_view_parent_class)->draw)
+@@ -4472,9 +4476,10 @@ ev_view_button_press_event (GtkWidget      *widget,
+ 			EvFormField *field;
+ 			EvMapping *link;
+ 			gint page;
+-
++#ifdef ENABLE_SYNCTEX
+ 			if (event->state & GDK_CONTROL_MASK)
+ 				return ev_view_synctex_backward_search (view, event->x , event->y);
++#endif
+ 
+ 			if (EV_IS_SELECTION (view->document) && view->selection_info.selections) {
+ 				if (event->type == GDK_3BUTTON_PRESS) {
+@@ -7522,6 +7527,7 @@ ev_view_find_cancel (EvView *view)
+ 	view->find_pages = NULL;
+ }
+ 
++#ifdef ENABLE_SYNCTEX
+ /*** Synctex ***/
+ void
+ ev_view_highlight_forward_search (EvView       *view,
+@@ -7549,6 +7555,7 @@ ev_view_highlight_forward_search (EvView       *view,
+ 	ensure_rectangle_is_visible (view, &view_rect);
+ 	gtk_widget_queue_draw (GTK_WIDGET (view));
+ }
++#endif /* ENABLE_SYNCTEX */
+ 
+ /*** Selections ***/
+ static gboolean
+diff --git a/shell/ev-window.c b/shell/ev-window.c
+index e2dfbf727..bffc9a7f9 100644
+--- a/shell/ev-window.c
++++ b/shell/ev-window.c
+@@ -7736,6 +7736,8 @@ ev_window_emit_doc_loaded (EvWindow *window)
+         ev_atril_window_emit_document_loaded (window->priv->skeleton, window->priv->uri);
+ }
+ 
++
++#ifdef ENABLE_SYNCTEX
+ static gboolean
+ handle_sync_view_cb (EvAtrilWindow        *object,
+                      GDBusMethodInvocation *invocation,
+@@ -7756,6 +7758,7 @@ handle_sync_view_cb (EvAtrilWindow        *object,
+ 
+ 	return TRUE;
+ }
++#endif
+ #endif /* ENABLE_DBUS */
+ 
+ static gboolean
+@@ -7816,9 +7819,11 @@ ev_window_init (EvWindow *ev_window)
+                                                       ev_window->priv->dbus_object_path,
+                                                       &error)) {
+                         ev_window->priv->skeleton = skeleton;
++#ifdef ENABLE_SYNCTEX
+                         g_signal_connect (skeleton, "handle-sync-view",
+                                           G_CALLBACK (handle_sync_view_cb),
+                                           ev_window);
++#endif
+                 } else {
+                         g_printerr ("Failed to register bus object %s: %s\n",
+ 			            ev_window->priv->dbus_object_path, error->message);
+
+From c141d2c6ae0b4ce5824817f9aa2f98d5edbf7756 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Thu, 11 Jun 2020 09:15:28 +0200
+Subject: [PATCH 2/5] Fix -Wunused-function warnings caused by
+ --enable-synctex=no
+
+---
+ libdocument/ev-document.c |  5 ++++-
+ libview/ev-view-private.h |  3 ++-
+ libview/ev-view.c         | 10 ++++++++++
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
+index be082aebb..f7c878956 100644
+--- a/libdocument/ev-document.c
++++ b/libdocument/ev-document.c
+@@ -68,7 +68,9 @@ static void            _ev_document_get_page_size   (EvDocument *document,
+ static gchar          *_ev_document_get_page_label  (EvDocument *document,
+ 						     EvPage     *page);
+ static EvDocumentInfo *_ev_document_get_info        (EvDocument *document);
++#ifdef ENABLE_SYNCTEX
+ static gboolean        _ev_document_support_synctex (EvDocument *document);
++#endif
+ 
+ static GMutex ev_doc_mutex;
+ static GMutex ev_fc_mutex;
+@@ -386,6 +388,8 @@ ev_document_get_page (EvDocument *document,
+ 	return klass->get_page (document, index);
+ }
+ 
++
++#ifdef ENABLE_SYNCTEX
+ static gboolean
+ _ev_document_support_synctex (EvDocument *document)
+ {
+@@ -394,7 +398,6 @@ _ev_document_support_synctex (EvDocument *document)
+ 	return klass->support_synctex ? klass->support_synctex (document) : FALSE;
+ }
+ 
+-#ifdef ENABLE_SYNCTEX
+ gboolean
+ ev_document_has_synctex (EvDocument *document)
+ {
+diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
+index f10593953..4f6179e4a 100644
+--- a/libview/ev-view-private.h
++++ b/libview/ev-view-private.h
+@@ -125,8 +125,9 @@ struct _EvView {
+ 	GList **find_pages;
+ 	gint find_result;
+ 	gboolean jump_to_find_result;
++#ifdef ENABLE_SYNCTEX
+ 	gboolean highlight_find_results;
+-
++#endif
+ 	EvDocumentModel *model;
+ 	EvPixbufCache *pixbuf_cache;
+ 	gsize pixbuf_cache_size;
+diff --git a/libview/ev-view.c b/libview/ev-view.c
+index e98582d34..7c9281cef 100644
+--- a/libview/ev-view.c
++++ b/libview/ev-view.c
+@@ -177,12 +177,14 @@ static void       ev_view_remove_all                         (EvView
+ static AtkObject *ev_view_get_accessible                     (GtkWidget *widget);
+ 
+ /*** Drawing ***/
++#if ENABLE_SYNCTEX
+ static void       highlight_find_results                     (EvView             *view,
+ 							      cairo_t            *cr,
+ 							      int                 page);
+ static void       highlight_forward_search_results           (EvView             *view,
+ 							      cairo_t            *cr,
+ 							      int                 page);
++#endif
+ static void       draw_one_page                              (EvView             *view,
+ 							      gint                page,
+ 							      cairo_t            *cr,
+@@ -4074,8 +4076,10 @@ ev_view_draw (GtkWidget      *widget,
+ 
+ 		if (page_ready && should_draw_caret_cursor (view, i))
+ 			draw_caret_cursor (view, cr);
++#ifdef ENABLE_SYNCTEX
+ 		if (page_ready && view->find_pages && view->highlight_find_results)
+ 			highlight_find_results (view, cr, i);
++#endif
+ 		if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document))
+ 			show_annotation_windows (view, i);
+ 		if (page_ready && view->focused_element)
+@@ -5654,6 +5658,7 @@ draw_rubberband (EvView             *view,
+ }
+ 
+ 
++#ifdef ENABLE_SYNCTEX
+ static void
+ highlight_find_results (EvView *view, cairo_t *cr, int page)
+ {
+@@ -5698,6 +5703,7 @@ highlight_forward_search_results (EvView *view, cairo_t *cr, int page)
+ 	cairo_stroke (cr);
+ 	cairo_restore (cr);
+ }
++#endif
+ 
+ static void
+ draw_surface (cairo_t 	      *cr,
+@@ -6497,7 +6503,9 @@ ev_view_init (EvView *view)
+ 	view->page_layout = EV_PAGE_LAYOUT_SINGLE;
+ 	view->pending_scroll = SCROLL_TO_KEEP_POSITION;
+ 	view->jump_to_find_result = TRUE;
++#ifdef ENABLE_SYNCTEX
+ 	view->highlight_find_results = FALSE;
++#endif
+ 	view->caret_enabled = FALSE;
+ 	view->cursor_page = 0;
+ 	view->zoom_center_x = -1;
+@@ -7517,7 +7525,9 @@ ev_view_find_search_changed (EvView *view)
+ void
+ ev_view_find_set_highlight_search (EvView *view, gboolean value)
+ {
++#ifdef ENABLE_SYNCTEX
+ 	view->highlight_find_results = value;
++#endif
+ 	gtk_widget_queue_draw (GTK_WIDGET (view));
+ }
+ 
+
+From f0054e7011c5cf6ac814ce1c6b42ce1713b25dba Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Thu, 11 Jun 2020 10:21:00 +0200
+Subject: [PATCH 3/5] Improved detection of --enable/disable synctex option
+
+---
+ configure.ac | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e7a63feed..ee33f27d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -362,9 +362,12 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
+ 
+ dnl ================== libsynctex ===========================================
+ AC_ARG_ENABLE([synctex],
+-  [AS_HELP_STRING([--disable-synctex], [Disable support for synctex])],
+-  [],
+-  [enable_synctex=yes])
++  [--enable-synctex  enable support for synctex)],
++  [case "${enableval}" in
++    yes) synctex=true ;;
++    no)  synctex=false;;
++    *) AC_MSG_ERROR([bad value ${enableval} for --enable-synctex]) ;;
++  esac],[enable_synctex=yes])
+ 
+ 
+ if test "$enable_synctex" = "yes"; then
+
+From 37d80d4c862cbd03525fe4393f09b92d1dff8f56 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Thu, 11 Jun 2020 10:23:15 +0200
+Subject: [PATCH 4/5] Use ENABLE_SYNCTEX in libdocument/Makefile.am
+
+---
+ libdocument/Makefile.am | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
+index f527f0a4a..d1db419c0 100644
+--- a/libdocument/Makefile.am
++++ b/libdocument/Makefile.am
+@@ -102,11 +102,14 @@ libatrildocument_la_CPPFLAGS = \
+ 
+ libatrildocument_la_CFLAGS = \
+ 	$(LIBDOCUMENT_CFLAGS)			\
+-	$(SYNCTEX_CFLAGS)			\
+ 	$(WARN_CFLAGS)				\
+ 	$(DISABLE_DEPRECATED)			\
+ 	$(AM_CFLAGS)
+ 
++if ENABLE_SYNCTEX
++libatrildocument_la_CFLAGS += $(SYNCTEX_CFLAGS)
++endif
++
+ libatrildocument_la_LDFLAGS = \
+ 	-version-info $(EV_DOCUMENT_LT_VERSION_INFO)	\
+ 	-no-undefined	\
+@@ -116,9 +119,11 @@ libatrildocument_la_LDFLAGS = \
+ libatrildocument_la_LIBADD = \
+ 	$(LIBDOCUMENT_LIBS)	\
+ 	$(GMODULE_LIBS)		\
+-	$(SYNCTEX_LIBS)		\
+ 	$(ZLIB_LIBS)
+ 
++if ENABLE_SYNCTEX
++libatrildocument_la_LIBADD += $(SYNCTEX_LIBS)
++endif
+ 
+ BUILT_SOURCES = 			\
+ 	ev-document-type-builtins.c	\
+
+From 87c8ee575d3ec50a278c5e428d066341ffd3295d Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Sun, 14 Jun 2020 17:09:56 +0200
+Subject: [PATCH 5/5] Re-enable highlight_find_results
+
+---
+ libview/ev-view-private.h | 2 --
+ libview/ev-view.c         | 9 +++------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
+index 4f6179e4a..e95157234 100644
+--- a/libview/ev-view-private.h
++++ b/libview/ev-view-private.h
+@@ -125,9 +125,7 @@ struct _EvView {
+ 	GList **find_pages;
+ 	gint find_result;
+ 	gboolean jump_to_find_result;
+-#ifdef ENABLE_SYNCTEX
+ 	gboolean highlight_find_results;
+-#endif
+ 	EvDocumentModel *model;
+ 	EvPixbufCache *pixbuf_cache;
+ 	gsize pixbuf_cache_size;
+diff --git a/libview/ev-view.c b/libview/ev-view.c
+index 7c9281cef..29b06fbef 100644
+--- a/libview/ev-view.c
++++ b/libview/ev-view.c
+@@ -177,10 +177,10 @@ static void       ev_view_remove_all                         (EvView
+ static AtkObject *ev_view_get_accessible                     (GtkWidget *widget);
+ 
+ /*** Drawing ***/
+-#if ENABLE_SYNCTEX
+ static void       highlight_find_results                     (EvView             *view,
+ 							      cairo_t            *cr,
+ 							      int                 page);
++#if ENABLE_SYNCTEX
+ static void       highlight_forward_search_results           (EvView             *view,
+ 							      cairo_t            *cr,
+ 							      int                 page);
+@@ -4076,10 +4076,8 @@ ev_view_draw (GtkWidget      *widget,
+ 
+ 		if (page_ready && should_draw_caret_cursor (view, i))
+ 			draw_caret_cursor (view, cr);
+-#ifdef ENABLE_SYNCTEX
+ 		if (page_ready && view->find_pages && view->highlight_find_results)
+ 			highlight_find_results (view, cr, i);
+-#endif
+ 		if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document))
+ 			show_annotation_windows (view, i);
+ 		if (page_ready && view->focused_element)
+@@ -5627,6 +5625,7 @@ ev_view_style_updated (GtkWidget *widget)
+ 
+ /*** Drawing ***/
+ 
++
+ static void
+ draw_rubberband (EvView             *view,
+ 		 cairo_t            *cr,
+@@ -5658,7 +5657,6 @@ draw_rubberband (EvView             *view,
+ }
+ 
+ 
+-#ifdef ENABLE_SYNCTEX
+ static void
+ highlight_find_results (EvView *view, cairo_t *cr, int page)
+ {
+@@ -5683,6 +5681,7 @@ highlight_find_results (EvView *view, cairo_t *cr, int page)
+         }
+ }
+ 
++#ifdef ENABLE_SYNCTEX
+ static void
+ highlight_forward_search_results (EvView *view, cairo_t *cr, int page)
+ {
+@@ -7525,9 +7524,7 @@ ev_view_find_search_changed (EvView *view)
+ void
+ ev_view_find_set_highlight_search (EvView *view, gboolean value)
+ {
+-#ifdef ENABLE_SYNCTEX
+ 	view->highlight_find_results = value;
+-#endif
+ 	gtk_widget_queue_draw (GTK_WIDGET (view));
+ }
+ 
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
index 0b999715ba8c..57f8c6d47b41 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/metadata.xml
@@ -11,6 +11,8 @@
 		<flag name="dvi">Enable build-in DVI viewer</flag>
 		<flag name="epub">Enable build-in DVI viewer using
 			<pkg>net-libs/webkit-gtk</pkg></flag>
+		<flag name="synctex">Enable search highlighting through synctex
+		(<pkg>virtual/tex-base</pkg>)</flag>
 		<flag name="t1lib">Enable the Type-1 fonts for the build-in DVI viewer
 			(<pkg>media-libs/t1lib</pkg>)</flag>
 		<flag name="xps">Enable XPS viewer using 
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 1ffba96098d7..4527f03d56e2 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-EBUILD cmark-0.29.0.ebuild 731 BLAKE2B 9cf4db73d57e077dfcf941a7fef74ca55afcb39b8a8e4e9241ed882a260d476b21c171d829eac90cf5696471bf553e23e50856fe2b177a2221b7c13d987223ec SHA512 746e152b0f048556a4e49b62db055e8b5d3d53fe3dd48fc4b914a8e50cae25b6717fb0e25eee7d550d8ceffeaaf4bd094be8415be54deeab7a9364e37af448dc
+EBUILD cmark-0.29.0.ebuild 735 BLAKE2B 7550a714e33648a6510be6286a2d1e4a2b67f26fb3353dcb301b2fcdb569916d0e42577eb282e1bcaa55b77667e0de0d5f450081b4bddd50a7470b88aa582b9e SHA512 4860930cfa25a4c8c0551516fe93f2d543dee90468ee105fc16135fa1d4fe7f9e06bdeb6548719f273da781796bc0e8ad5418041c8a2003e2327a11d75c3039f
 MISC metadata.xml 473 BLAKE2B 770f8d92e6aa0ff167733de2877fe1b244cd153875dce9116b361cdb4ee529e54de01f0841af1d1a23b54826786e784097afa993f791515a79c4a1af61b4349a SHA512 a0f0f24ee085d6d49311c08a1cb72f492cb88659a840ffdc2d01576c97b9a56b63beab6fe46a23df5331ce2fc100341283b2cf0bdb18a3861f0953f8c1331c72
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
index 975cfc4fe12b..2084c1803213 100644
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ b/app-text/cmark/cmark-0.29.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake python-any-r1
 
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 9fed0172cac1..b7d8ec6a2408 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,7 +1,9 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 DIST coolreader-3.2.39.tar.gz 17679570 BLAKE2B e84fb7d8032ae62fec24a74a9cebab086664a2ed3827f0664e667a4ab3b8d76b722790958f71f5fcd79729238e897c6592059f9b45eb4069c9ad483883bc0600 SHA512 1b92b35750174a8ef4df4b7c4f33bb9fcc94b36008c08a7f9d1f8e85c6b642c5b037e0673a783cde1aa98296887bb286c4a2da186911b26f298f689605e1eb4b
 DIST coolreader-3.2.45.tar.gz 20290340 BLAKE2B a4e6218965618a1b0938606ca323534112a5d7b64a1d56e06f56ba8b2e5591d380d7fb2aeb9c37d007fb834963a42e684e2af939720272c3a7494e5afc65501e SHA512 d7dc9921b74d1da236aeb02edcb39d44dfcfb9da5d6d3b1bf428157f67415c19af218c2454a602828d12d0c6d8c80d1335e92101acda1af8abd6bd312900c33c
+DIST coolreader-3.2.49.tar.gz 21398327 BLAKE2B 9a63f34d661f7c12d55e08788edb0c348d33c67708890e89a857975ce3a6fc82d8788dc0a15ad18e025d68254293b1b34977b2ffe24ea19ab4865727d5afbdcb SHA512 06c8416c33ccf939c0292b573352c097c4b2a0b1390181428e5f1bf08e145f1fa1f8ebdcf658bb0f9e8846c1fd5a57a67fb075b8e7285e1e7602e26aba6790b0
 EBUILD coolreader-3.2.2.1-r2.ebuild 2479 BLAKE2B 63c86c1dee137edc9f8937c72cb80c77c0f890347aa1d385b2be771a3fdfc11a1d895ee87b4bd295a52392dc72f9abcd34f019c5f350943d4a9ce45e3971f5b0 SHA512 8df9d4a6337416a8d394cbab4be7f9d166d7ca9febe6e4dc5054d842de4f006adb535342c24a1b80370988edad4c71f9a0e7f50a0aeb832ebcd251fa38f0d8b0
 EBUILD coolreader-3.2.39.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
 EBUILD coolreader-3.2.45.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
+EBUILD coolreader-3.2.49.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.49.ebuild b/app-text/coolreader/coolreader-3.2.49.ebuild
new file mode 100644
index 000000000000..0b26482993e9
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.49.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
+
+CR_PV=$(ver_rs 3 '-')
+
+if [ "${PV}" != 9999 ]
+then
+	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-cr${CR_PV}"
+else
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+DEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if ! use wxwidgets; then
+		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 6ff117683bd9..fc466a0f0db9 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,4 +1,4 @@
 AUX fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r5.ebuild 1934 BLAKE2B e12e5cdb9714e1f97e6a375c3e64dc65aedd93b9214417e7d3b3f2dfb4b39f53a8cb540cf2636bed5940b202f64ab7f8817d541d32b212ac5a1835656e923fe9 SHA512 48a634082045cdc346d06473db3ac1b17e1ff91451fae50900ef7b19e5a7529b82c683d8ff93435b9d0053f69ccee8e924ec82854b06f213895657cec26aaad6
+EBUILD fbreader-0.99.4-r5.ebuild 1963 BLAKE2B 7e57a9735769fb874456cd61ec0b2c6baf4a953847bad977b397753a0ece645bf6c8390663ad5fee1ea925f2c8168209652e13cc5ae9b261eee5054ccf1f76aa SHA512 dd2afce62eed3c7f5b0ad8bfa8f4a065511b1609d29b5bb1f5b2418abe24f487370803c952b52a4c5f6722055347ea6e4523fac637e8c14fc548b935fcf1ac05
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 7c47fc4ac07a..75cd8347fff2 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils multilib flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils
 
 DESCRIPTION="E-Book Reader. Supports many e-book formats"
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+HOMEPAGE="https://www.fbreader.org/"
+SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,18 +16,19 @@ IUSE="debug"
 
 RDEPEND="
 	app-arch/bzip2
+	dev-db/sqlite
 	dev-libs/expat
-	dev-libs/libunibreak
 	dev-libs/fribidi
-	dev-db/sqlite
-	net-misc/curl
-	sys-libs/zlib
+	dev-libs/libunibreak
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+	net-misc/curl
+	sys-libs/zlib
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
@@ -61,15 +62,15 @@ src_prepare() {
 	sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \
 		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
 
-	echo "TARGET_ARCH = desktop" > makefiles/target.mk
-	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk || die
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk || die
 
-	echo "UI_TYPE = qt4" >> makefiles/target.mk
+	echo "UI_TYPE = qt4" >> makefiles/target.mk || die
 
 	if use debug; then
-		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk || die
 	else
-		echo "TARGET_STATUS = release" >> makefiles/target.mk
+		echo "TARGET_STATUS = release" >> makefiles/target.mk || die
 	fi
 }
 
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 552885ccb17e..adf6ebfbeda9 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,9 +1,11 @@
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
 DIST ghostscript-9.53.0.tar.xz 41358720 BLAKE2B 9a8b5872dc799f14759033685c37890f2da28450b1e115fcc63a2a920bb22bfc02db078d3f39dc62778da2a2518b82c2fc91f349486e83914c88c70d1e15d7e8 SHA512 fa594ef99e58257074b651e4d078bd1025f7bc2c435cd2a5454ba59c2a98cc82e93339ccd1eaa4fe624275165aacefeabc6f8336476027946f56aeb02e93da30
 DIST ghostscript-9.53.1.tar.xz 41362600 BLAKE2B f4f3e9c067d120195cdcbd8ba3ecbb5618d668e0582408cc76b0e13627aca06c40064a7ae96d0ebe8c313ec282c4d3f5dddddabef3d0194ff9aaf98832b5a50c SHA512 5c78ed0a03983cbf9d55885c5ee8fbfc987db367b020ad0148b8861de42923e38c688447cfc6efcea5521121545ecfbea9690058fd3c4438629a43b5990800c5
+DIST ghostscript-9.53.2.tar.xz 41362364 BLAKE2B 1ff4d00661d28f7f9a14064928182147fa0b20b41accb287b779a40651fbc45047eefc8522242b7dd909324b6e3ebc15f421b351c69fb248fef2095210c81461 SHA512 fe430e96b67a082b58942d66193a89b8af042574929e8299e1f8b1ef2a7f71565ba5a96b72d26db38f4a05e70119a019c5fe73b842d51afd357d642d39d95320
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5097 BLAKE2B 748ff28b3a38714562d03d63b267a2cbb762103972d41883d2c5917083cbed564ca36788fdde92ac8366768153d0453ece4b25b760bad6c3d97e08c9e86961bf SHA512 82e9b5f3f1515236197510bb29238ca955cf042a233ef314036b8b88887df2bc8dc353342b09c7d0444d73de9f98412a2c7252d19782e956f15dac2147b3d289
 EBUILD ghostscript-gpl-9.53.0.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
 EBUILD ghostscript-gpl-9.53.1.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
+EBUILD ghostscript-gpl-9.53.2.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild
new file mode 100644
index 000000000000..0d3acf4a9d16
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz"
+
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=media-libs/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-text/poppler-data
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n "${MY_PATCHSET}" ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
+		eapply "${WORKDIR}/patches/"*.patch
+	fi
+
+	default
+
+	# remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index db64eb03c36b..ef7fa46e44ac 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -1,9 +1,3 @@
-DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 BLAKE2B f124608b13888f337fc35ed02b4757818d145943a13f645da73dbf0735a4a5627026ad995435b822f6022d61f6cf0a6821824a1272c389459adb16932bc06bcc SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821
-DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 BLAKE2B 20112b60a2a9f5f5b1d805280cd5dc77e8d039a768410a3f2259aa60449c660eb6c3764d14edd3db819dd68a830ba38aebe5bc0d6014dcd04752a194b1da87dd SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97
-DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 BLAKE2B 1092b6245eb60a2e54cadf6193a402ad085923224e05d35f80453505fb2f0a4e97822746907d1f9a8c0b95f82d0b1396b7ff81d133099def75b850e54a899725 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416
 DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1397d592b772a10a45fe8b9184ffb7fc5f30a8db3c81011c19a80d3d14a228ea47b4b6ba21b7ab7f81e283533beef4596065d0c4b6b SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369
-EBUILD groonga-normalizer-mysql-1.0.6.ebuild 714 BLAKE2B 9700d2835f3f1558fa659eaa88f6ca4cfdaa382d023b9558ea28dea2dc07782d1f0286e862456fb054c0ba421e12930da2c3307ae21470d1eed05188f09370ef SHA512 1c78bcd77d2438b85f51e591964cebe3d14e335b24899b89e1625a30db3a1e98c9175075e7deca1ae7c91b5ef24be5064c9a73c31b1fbd4df5810f1bf597fa38
-EBUILD groonga-normalizer-mysql-1.0.9.ebuild 702 BLAKE2B 21096c271665dcb14c2828519ba5d0338918d6bbf575195cfb4e0e577c2628e8b280a51e73346bfe014d6cf43e6bb4b6ea364bca76049320134a256372aa3abd SHA512 bbff6609a47a4ef115fb72e70c8443ad9bceddb7a56f5447438f71c5c90d2d33b0bedeaba918a6e2772416438b39636c370f58092da39f4db8b9cfdfd8365301
-EBUILD groonga-normalizer-mysql-1.1.0.ebuild 702 BLAKE2B 21096c271665dcb14c2828519ba5d0338918d6bbf575195cfb4e0e577c2628e8b280a51e73346bfe014d6cf43e6bb4b6ea364bca76049320134a256372aa3abd SHA512 bbff6609a47a4ef115fb72e70c8443ad9bceddb7a56f5447438f71c5c90d2d33b0bedeaba918a6e2772416438b39636c370f58092da39f4db8b9cfdfd8365301
 EBUILD groonga-normalizer-mysql-1.1.1.ebuild 677 BLAKE2B 43c428007fc189bc6fc1f1ff62251c99ade97f9bb2f0775f4fa4bad48cf15733a2886cb1700f773817ef38386d1585c234303b61c8756d89eb3deda2047e7a3b SHA512 6b387668dee0f7c4d68dc1b690ef028ff8e14da6f8a15a764d300497b1eca16329adfd1a2adfe98e3aecbb8c2267acd742b1f02c31904dc3c7264d2ee0e0edac
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
deleted file mode 100644
index a2e51d5c428e..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools ltprune
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-ruby19 \
-		--docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	# Dont install README twice nor license
-	rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
deleted file mode 100644
index febf15c849db..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools ltprune
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# ruby is only uses for tests
-	econf \
-		--without-ruby \
-		--docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
deleted file mode 100644
index febf15c849db..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools ltprune
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# ruby is only uses for tests
-	econf \
-		--without-ruby \
-		--docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index 05c2fc6bdddd..5cb622ac6994 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -1,11 +1,7 @@
 AUX groonga.confd 259 BLAKE2B 440b084d0e41da1b81e27ffa1e42963ce22d83027841039d488d516dce8beffce0e2ca03f5ca78a6aae02fa7bf238f0cf900e770ebfba04cfac581a13bd2381f SHA512 489feed6a4c22eb2ac02be070dd84ed3eb677b4f250b7eacd5619c1749b322b302bdff36fc3586e83125ac7ef02569054c4f267ddd7b26e5aa378af428cbc8ea
 AUX groonga.initd 715 BLAKE2B 0cf870704257490477a7a254a670ef5ce48141b8c9c4119446bcfab92972319857c77ebe41044c7d338b10bb720744788ce0313f8b2ee50277571513d0cfdb83 SHA512 7b4f789c9201f40fee0d99b94554bc33aebf024da02794143317215713cea3f2a9fda2e87d2a8bb864a7d0c8a2c44e824c65deecd4c95360423f7d3a4f04f8c2
-DIST groonga-5.0.3.tar.gz 12421501 BLAKE2B 22b695fca6c4d0859b7a9ed5b1bc46be48493faa513524634662b0d520d1159bc70b4dc34d82ba83e5c57681f01f01dbe47d5a957f110eab2db65cf8eefe878f SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158
-DIST groonga-5.0.9.tar.gz 12851324 BLAKE2B a58084146e5e8fbcbc56f9737a3623b4385123cc449fb63b136f3f312d31d5574620831a4fa6e759381950ee6aa035e4d6a4c277c26c7d8ebb1e99fe5bf02e75 SHA512 6e89be8894737616cfcbd0edd92c94a25fb8a2f9c97bd0aab10c2d628664aa328384d6b953516fe96cec5b58fd229c42262caad4785ca9574c759d6d7177fba6
 DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a0016837810c12813bb4f208bf9b114fc514a8887e4f756fb0ec27ad2c991eea026bf57391e9234e49ee084656d26c SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20
 DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1
-EBUILD groonga-5.0.3.ebuild 2423 BLAKE2B 68844a8cd8c52e45eeba804d8d44659a32b723182a7584c6acea02bdb165334ebad517901eccfcbdf0249f1c8772d60cb9fc75ff7d7c72a604574cdad31acc59 SHA512 25cd58568c1947f1d42e441b297542c7856c0b8033dcea73791aaac720bf74bfa6df47f55776f37e5b4869f76d13b31b423c0893163480b7208804090c81da07
-EBUILD groonga-5.0.9.ebuild 2423 BLAKE2B 68844a8cd8c52e45eeba804d8d44659a32b723182a7584c6acea02bdb165334ebad517901eccfcbdf0249f1c8772d60cb9fc75ff7d7c72a604574cdad31acc59 SHA512 25cd58568c1947f1d42e441b297542c7856c0b8033dcea73791aaac720bf74bfa6df47f55776f37e5b4869f76d13b31b423c0893163480b7208804090c81da07
 EBUILD groonga-6.1.2.ebuild 2413 BLAKE2B 0d9472484b1d0bfd0949c968e52f6b80737d5398d9304a35826984a30db9555610fc2e8512b8eeba6bd0fd33b9f337d70ceceb425ebe9180530fdcff75390327 SHA512 d6832fac842eab906b5c9df2cbc9e9158b1336c39775a42eea818e8e8fb3ea40917ad02b6b89517bf6a75e6477e92bc0cb290343fe5fb8bf685cff79c3c6fdbe
 EBUILD groonga-8.0.2.ebuild 2621 BLAKE2B efcfa60f6d05c88d765973434c2fa53f25d28de79ac627cd1d5ba7a3f7313e214c88ecff5b70f16b1fac046f7b8ad919311c6d5abef3ce762f413a0de4fe2627 SHA512 875ffc1cd44664637e860ffd5ac91ae1e5b8b6858ca6413fa0076090e04a0bf78fa89e03e3e8f52941adf1d8a748bdbd4d0c46a8aa3bcf6ec00914b219b03aea
 MISC metadata.xml 1156 BLAKE2B a6fdcf212e2de097ea99dee4c071da0af7c4024a9c4390aaee67a94f1940ff3483e08a5c20e301e47de63dffc59856a2114c2bf72de9f22e2031bd60c719fe6d SHA512 a1e8936921f6688690cc70ef39eee1abfcdb7b6940de9a29c6f1f3750c3dab4e8f50d1e189ee57ca87085e8e0daf81ff52a93cd81076745f6f479d291fabe079
diff --git a/app-text/groonga/groonga-5.0.3.ebuild b/app-text/groonga/groonga-5.0.3.ebuild
deleted file mode 100644
index 7854044dc1d6..000000000000
--- a/app-text/groonga/groonga-5.0.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool ltprune user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
-	libedit? ( >=dev-libs/libedit-3 )
-	libevent? ( dev-libs/libevent )
-	lzo? ( dev-libs/lzo )
-	mecab? ( >=app-text/mecab-0.80 )
-	msgpack? ( dev-libs/msgpack )
-	sphinx? ( >=dev-python/sphinx-1.0.1 )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
-	enewgroup groonga
-	enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	# httpd is a bundled copy of nginx; disabled for security reasons
-	# prce only is used with httpd
-	# kytea and libstemmer are not available in portage
-	# ruby is only used for an http test
-	econf \
-		--disable-groonga-httpd \
-		--without-pcre \
-		--without-kytea \
-		--without-libstemmer \
-		--with-log-path="${EROOT}var/log/${PN}.log" \
-		--docdir="${EROOT}usr/share/doc/${P}" \
-		--without-ruby \
-		$(use_enable abort) \
-		$(use_enable benchmark) \
-		$(use_enable debug memory-debug) \
-		$(use_enable doc document) \
-		$(use_enable dynamic-malloc-change) \
-		$(use_enable exact-alloc-count) \
-		$(use_enable fmalloc) \
-		$(use_enable futex) \
-		$(use_enable libedit) \
-		$(use_with libevent) \
-		$(use_with lzo) \
-		$(use_with mecab) \
-		$(use_with msgpack message-pack "${EROOT}usr") \
-		$(use_enable nfkc) \
-		$(use_with sphinx sphinx-build) \
-		$(use_enable static-libs static) \
-		$(use_enable uyield) \
-		$(use_enable zeromq) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	keepdir /var/{log,lib}/${PN}
-	fowners groonga:groonga /var/{log,lib}/${PN}
-
-	dodoc README.md
-
-	use examples || rm -r "${D}usr/share/${PN}" || die
-	# Extra init script
-	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/groonga/groonga-5.0.9.ebuild b/app-text/groonga/groonga-5.0.9.ebuild
deleted file mode 100644
index 7854044dc1d6..000000000000
--- a/app-text/groonga/groonga-5.0.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool ltprune user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
-	libedit? ( >=dev-libs/libedit-3 )
-	libevent? ( dev-libs/libevent )
-	lzo? ( dev-libs/lzo )
-	mecab? ( >=app-text/mecab-0.80 )
-	msgpack? ( dev-libs/msgpack )
-	sphinx? ( >=dev-python/sphinx-1.0.1 )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
-	enewgroup groonga
-	enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	# httpd is a bundled copy of nginx; disabled for security reasons
-	# prce only is used with httpd
-	# kytea and libstemmer are not available in portage
-	# ruby is only used for an http test
-	econf \
-		--disable-groonga-httpd \
-		--without-pcre \
-		--without-kytea \
-		--without-libstemmer \
-		--with-log-path="${EROOT}var/log/${PN}.log" \
-		--docdir="${EROOT}usr/share/doc/${P}" \
-		--without-ruby \
-		$(use_enable abort) \
-		$(use_enable benchmark) \
-		$(use_enable debug memory-debug) \
-		$(use_enable doc document) \
-		$(use_enable dynamic-malloc-change) \
-		$(use_enable exact-alloc-count) \
-		$(use_enable fmalloc) \
-		$(use_enable futex) \
-		$(use_enable libedit) \
-		$(use_with libevent) \
-		$(use_with lzo) \
-		$(use_with mecab) \
-		$(use_with msgpack message-pack "${EROOT}usr") \
-		$(use_enable nfkc) \
-		$(use_with sphinx sphinx-build) \
-		$(use_enable static-libs static) \
-		$(use_enable uyield) \
-		$(use_enable zeromq) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	keepdir /var/{log,lib}/${PN}
-	fowners groonga:groonga /var/{log,lib}/${PN}
-
-	dodoc README.md
-
-	use examples || rm -r "${D}usr/share/${PN}" || die
-	# Extra init script
-	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index a5c3b9bf32e7..b244e5404530 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,6 +1,4 @@
 AUX strip.patch 261 BLAKE2B 760a04284f2b79e942fbee21d7b075d41c047f8f7f5eca563f6754e4a9fec1c372986dbcc965f2a1009ac26f8347868f7c0cb4bb767ac98c3be8b2895c49677f SHA512 2f2a9afb828e9de08fa97ca2798a0d2dc6f65cbf192cbc749c3790ed542f75c49c5fbb4644fb8017f93dc24a42c584914d5659841a211c1fe74a3aa43be633e4
-DIST htp-1.16.tar.gz 141133 BLAKE2B 58f0ab7df1400d561ec1994a98ce4fa3acaa3299b51d9382f9baaecbd95a623795d72204617c153fd4e165910fdabd0328e737cccb242be2075edd2573af55c1 SHA512 f33a9497fc3a1d0b95d8e3ee2747583d58626b565644e7c8cc054570458907aac9db42c6fa816b176b0e10db98ec7d1cedb521406035a8e7173e1abd991533a0
 DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
-EBUILD htp-1.16-r1.ebuild 1229 BLAKE2B fec83aa0771a504a8f53da9fc66663f15b59f093f784c0b7d46568d408b46f3a694a093139df4cd9bc383de4d5764f617eb3a2e649108985b912d23ca7dbe487 SHA512 9e9b73f8b7d413446be1be74ddc673e30bb75035244f63346d7da29b699d38940c9c12c5095dec942d9264f749b4ac73dbfeff7f862feb9e4f14cfc5d3f502b4
 EBUILD htp-1.19.ebuild 698 BLAKE2B 943bad8608f7c0eb9677747b2a68838204c4c8d0a1137eba07f8a7c8844dc16e99b215745b707d8df7e94616fc08b8802d625bdbf25cf18c176dde59dfdb69b7 SHA512 d7f085bbdc08fb1b1a0afaf076c1593bd4ad96d2ee26e65c98f958cd01fa1112074d2654a39ea3f47e12d787a33dfd1585fa24edad65ec0db0a9a0880535cdab
 MISC metadata.xml 323 BLAKE2B 815632fb1a839f62a7e2201270b77e1cb16955e5bcc978bebd09d0501eb2df6f56bf20a8ed6a7c2ed6d7a5fcb5d0900a06c38f22dc649c731ada0d36478f3aa1 SHA512 f5c0a7720bd23aa0c604e0ffa07e2925afe69f9af09c9364818e16197fdf55c1decac5839234cdb08e483be1bfb4d0a88279e57c2b48c0002d3de27e90616f26
diff --git a/app-text/htp/htp-1.16-r1.ebuild b/app-text/htp/htp-1.16-r1.ebuild
deleted file mode 100644
index 6a5c090922df..000000000000
--- a/app-text/htp/htp-1.16-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An HTML preprocessor"
-HOMEPAGE="http://htp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-# HTP does not use autoconf, have to set options defined in Makefile.config
-
-src_prepare() {
-	epatch "${FILESDIR}"/strip.patch #240110
-	# let src_test take care of testing
-	sed -i -e '/SUBDIRS /s:tests::' Makefile || die
-	# don't install doc files with +x perms
-	sed -i -e '$aINSTALL += -m644' homepage/ref/{*/,}Makefile || die
-	# make src_test abort on failure
-	sed -i -e '/DIFF.*FAILED/s/echo/exit 1; :/' tests/Makefile || die
-	# the png file in this test isn't fetchable
-	sed -i -e 's: width="630" height="331"::' tests/png.html.exp || die
-}
-
-src_compile() {
-	emake \
-		CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
-		CC="$(tc-getCC)" \
-		LINK='$(CC) $(LDFLAGS)'
-}
-
-src_test() {
-	emake -C tests
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix='$(DESTDIR)/usr' \
-		pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
-		install
-}
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 09e92a967f6f..efda90d75bcd 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,4 +1,3 @@
 DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
-EBUILD jabref-2.10-r2.ebuild 1818 BLAKE2B 9fd1b25bb773e29e924cefce7e7b85046f1c84c88727c8009785af90dfe65475454962f5e3c0b88d3788cc37ea674374500b8d14fd1163df06c498a407417479 SHA512 4c685bce3c6d9cf4dae811548d7f230647049c728669bbb5816ddf1de43c226efe1002d7e2d42cce7008a4aaaf920e5136913b1f0072d49953f808ce44e2e050
 EBUILD jabref-2.10-r4.ebuild 1839 BLAKE2B 14f139884a63130ffdf59ee41f8640117ab925a39058c6ec80d515d7e8deb8379da387baa50023a08e218888811f1fb89ee9bb840cfdba2a0021b8a09da83f4e SHA512 53df22685ae2fe8a572f87ddb0bb1b953438bb05d2a8fe6ad1a64a97037348819309d55e3d532eea61fbba5c58470e732a68005fc5eaba435d90b55f89b0898f
 MISC metadata.xml 537 BLAKE2B 1aa32da69c977641a51f05b3e615d4cfb15d21912ab649b0db7f6a4b35daf5428225431533e97eca895253e4370dfd03baa60beaee4ee333a225df8942e715d4 SHA512 8478bf7312a365c4fce15051b0cedb465e92a274e215bcf989e744434ed93f568217f953cbaa07e9adfc5e620187d4ed4076d3201806bfe2df55ae8743bfaaa2
diff --git a/app-text/jabref/jabref-2.10-r2.ebuild b/app-text/jabref/jabref-2.10-r2.ebuild
deleted file mode 100644
index 731fc02ac090..000000000000
--- a/app-text/jabref/jabref-2.10-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/antlr:3
-	dev-java/fontbox:1.7
-	dev-java/jempbox:1.7
-	dev-java/log4j:0
-	dev-java/spin:0
-	dev-java/microba:0
-	>=dev-java/glazedlists-1.8.0:0
-	"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/spin.jar || die
-	rm lib/microba.jar || die
-	rm lib/glazedlists*.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
-	# Fix license file copy operation for microba bundled lib.
-	sed -i -e 's:^.*microba-license.*::' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	use doc && java-pkg_dojavadoc build/docs/API
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index e434ca1b5e0f..6337820a5611 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,7 +1,5 @@
 DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
-DIST lcdf-typetools-2.107.tar.gz 652445 BLAKE2B bbbc428673c8e036f8d3be8ec80dbcf8892f60976fee7f11d622af8442c4d3eda0e118d47b364f55fe0dc8b53062ece0926be1d67e6627500a787bce810c074c SHA512 be54d4346d567c640b260dc513854085901af96b82701fccb8f0feae4b373ac69962c568a648515eb9ebfcabc828359ab2d742947ccdf9422643b0d889961ff3
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
 EBUILD lcdf-typetools-2.106.ebuild 863 BLAKE2B 7789c49b02c9c7f4be70c853d4a8c90537b4d77e7386c875a2b06e777eaf4bb4e056d2d4458308b2d30b4f52f5228813fe80d6e361a75af08823bfe779ed4a8c SHA512 50ca06f247bdc12a597989c94073085e3c0efbe30345c3b6eab63b6d0a34c92f2032ae4b9e968f7d7f0268472287c3f094eeb197f22fe45fc462e54544e1b046
-EBUILD lcdf-typetools-2.107.ebuild 870 BLAKE2B dc9521fe2510e84e01410a8e0f9b1ab67f6f2b991bb85eb28c822f7dc3cad20c00833c6ccc2385b9a2ab21bf6b9e7115116c9325cd35ced95ca2025c878114cf SHA512 012fd232f0a36178e410ff311b6fb75a522f2dcea6ae4d97a06123a944422c09945fd01722da51f22c271176554fd8616093fd22fdcac48666c668ab5007cfd1
 EBUILD lcdf-typetools-2.108.ebuild 870 BLAKE2B dc9521fe2510e84e01410a8e0f9b1ab67f6f2b991bb85eb28c822f7dc3cad20c00833c6ccc2385b9a2ab21bf6b9e7115116c9325cd35ced95ca2025c878114cf SHA512 012fd232f0a36178e410ff311b6fb75a522f2dcea6ae4d97a06123a944422c09945fd01722da51f22c271176554fd8616093fd22fdcac48666c668ab5007cfd1
 MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
deleted file mode 100644
index 54e4b30c16d1..000000000000
--- a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+kpathsea"
-
-RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	econf $(use_with kpathsea)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS.md README.md ONEWS
-}
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 07c28258985a..d9197b2ed096 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,5 +1,5 @@
 DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
 DIST libnumbertext-1.0.6.tar.xz 283416 BLAKE2B d02a521db19a21c6036412f902af7227d7442ca25d38e5e35339f74c8ee6e275ed085aeb4c4f07f998bcdc33ac62be84ce6915dd430594dedad1fa0f65b388b6 SHA512 0b2a5226f363af9a6df90f788f6cdc5fe95ddb524d96ad2db1caf2e7f414649ce2975eae3c9e5fceecbf825a90c736a0717b02ec9671e980ab9cfb3e2df73b8d
 EBUILD libnumbertext-1.0.5-r1.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
-EBUILD libnumbertext-1.0.6.ebuild 547 BLAKE2B 1a08a4acf77cec1ee6ad97206badb8c594e057f2a8b17275db251676a7ebb1a806b89bcee25fc44ef126f70bd93e0f98dcd8d3973afc003c6a726eaff02447c9 SHA512 bae5fdba976bb5ab02f407887916f1e247bd5352e597195889bef0b26ae3d15123232490cbace05fdca002b0363b1aea8a07900caa96ca850a0eca7640fe587f
+EBUILD libnumbertext-1.0.6.ebuild 546 BLAKE2B 525a518f93f30c5f039a44ec638db8fb655637d45ae0441d38be80609eda2d3489970a85fadc3e1e9b6dc26eccfe513318f269afb88b95d9fd6e47a1d3ca5f12 SHA512 c4ed0b8bba6f24349340ce6a5e6bb5fa64ad1ab482912aaac5363886967f9467d327fe0337bcf7d22dfb4aba4dd8dc5c7a3926dba68b70e01f2622757f839d43
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
index f652a58f5a45..eb21ab61e89d 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 61d82c830d50..88b4a532d911 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,5 +1,5 @@
 DIST libwps-0.4.11.tar.xz 706000 BLAKE2B e733b2fed9a05352b41126b2c0225807b3fe9a57f01f3b2a3bf35f99bd0adbd47bab8ef058f45de749332d407d589f6c33a03a3579fc76551548cb92c236e09f SHA512 6c81342b68fd93974c10ec0907dd46e9417cafa46d06205843941650828f4299a8793a7ace5c0ca755b8b9fb91fc1d6ef63304c641e7b5de36885e9995566e36
 DIST libwps-0.4.12.tar.xz 713008 BLAKE2B c95bdab54f8853cd1d13b59904ee4064cded3741cb91f2b067f139d80cdae6ea19bac68e6855cad74878403bc1a04c6f4bdd3181407b69b7e50f1e7bf4255f58 SHA512 d23667681f443b0c718b55006bee881e8a07d6b071cda742a783a89e9ed0e4c60c66c7dc9612a3fb4a419ff6d6e572f5981cec1d9470422e10cf9837e92a4649
 EBUILD libwps-0.4.11.ebuild 782 BLAKE2B 74bd852c8cce0c5ccacf6d96f30f9dfb4b1f68a022c7f75fa11ec86f29bab9a5d8c5e671645bb3bcf6813771b06f0d2778b1a15b0d70773a402c8129e73dd65a SHA512 b27f0287b4ac60676578b94e0398aaa2b820b068b716478fdd73681ee91b451aaa8a66edb9f8d0970dc2cddacd04fd29c049c5c0d9b6a4f1cd647b678384c11b
-EBUILD libwps-0.4.12.ebuild 757 BLAKE2B fa5142857e2530c08f2dd024b3d9d0623ed8ce41c4b7a4433b1f01fa67edbb4a12cd21883495820ec5161c15b6cf718804c9a01d4b1b19328ce2e4837587cf16 SHA512 08c95a50555af60751821b42395f79f74dcba4a2ca48c23d44988af6ed93617ca9469398af418ec201da9d877be3cba392b9b90b1260395f2dc7c90e54b3ab46
+EBUILD libwps-0.4.12.ebuild 756 BLAKE2B b2ca793800d38a7fe1073b241d71b89e19f551aec31a0ab8340046c3bf17008df90a64ef4006582da9fdb9f4ce14605a86dabf144b332a99bfac1fed158a4d02 SHA512 7311f62ef7c72dbb95a10beb63b4a4d1b37111dea4dc9a84bb5b9a73691574522f2aa256ff388750768d309738c321429dbca32d487c518f0d7edb7a506a76b9
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.12.ebuild b/app-text/libwps/libwps-0.4.12.ebuild
index 9499a49c965a..fa7139d22038 100644
--- a/app-text/libwps/libwps-0.4.12.ebuild
+++ b/app-text/libwps/libwps-0.4.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="debug doc tools"
 
 BDEPEND="
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 6017e92fe834..ba4b3318d85d 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,6 +1,4 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
-DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.1.ebuild 1297 BLAKE2B f42d72abd21ec2b2d5e8386dfe5915fabb73538a47dc353956788c3f86d6d7f05a27334dd0e6f94d1edcb48ea0e83d82034a517db67b7c543a83c01a84e6e38c SHA512 1b14d664c5cb2f4d17c96785c59f38655b2241a437e738a345bc479da37e3934441eabbea5deba077fba4b26f05e4e2e18b18843bfcb2f55e64943550cdadf96
 EBUILD multitail-6.4.2.ebuild 1315 BLAKE2B 69c6437bcd25047d02850de483fc6533603fd73b94277f25f619770f603b6c1a5440353b8f8e0d46b05959865451325383c316d2aa1f15d1b07b46b4e2fcedf6 SHA512 6c6268804d965d733cd1fb9148012dc4f24693b7ae9d2067d4f3d6262e8826e781bc9a8010f1f4e745fc7b16cdd8f2c4038674051e615886a4cf5930f3af9e9c
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
deleted file mode 100644
index 9b88ebb4680e..000000000000
--- a/app-text/multitail/multitail-6.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch eutils flag-o-matic optfeature toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-RESTRICT="test" # bug #492270
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-6.4.1-gentoo.patch
-
-	sed \
-		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
-		-i Makefile || die
-
-	sed \
-		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
-		-i xclip.c ${PN}.conf || die
-
-	tc-export CC PKG_CONFIG
-
-	use debug && append-flags "-D_DEBUG"
-}
-
-src_compile() {
-	emake UTF8_SUPPORT=$(usex unicode)
-}
-
-src_install() {
-	dobin multitail
-
-	insinto /etc
-	doins multitail.conf
-
-	DOCS=( readme.txt thanks.txt )
-	HTML_DOCS=( manual.html )
-	einstalldocs
-
-	doman multitail.1
-
-	if use examples; then
-		docinto examples
-		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
-	fi
-}
-
-pkg_postinst() {
-	optfeature "send a buffer to the X clipboard" x11-misc/xclip
-}
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index dd1e2223bb89..f817bf85f81d 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,7 +1,5 @@
-DIST pdfgrep-1.4.1.tar.gz 151926 BLAKE2B 68b846b26c28e8209fa3ac7a7e6fe3d0c4c6a298e9bea2e3929fd82a44482ec914bd3594f3e07da8c56766e94ca3d4c3c2d6997364393e95b3741b1bf9685ec5 SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735
 DIST pdfgrep-2.0.1.tar.gz 187217 BLAKE2B f498158e63e2f8419829df0d1801a31d3dff02627ccf0efee7239650203300233d1a19a5c72c57eb24495f2b5403e0e2c6a479b0f28a8d053aa578c732866b1a SHA512 4285f8cb514975a0040cdd6b82133090e27ba5c2f95ca880dccc3dd4fa3427260a5fc73d807df9124a79fa36ac6ed8c11380cde11e00599ed7134d92c50df4a0
 DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746c649f7ec77d58a41b90b13dd903d47b5ed2d35f56ca7ca12ae49cfb8a57004f9ad3ee6b8930f533b33d7d8463 SHA512 27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c
-EBUILD pdfgrep-1.4.1-r1.ebuild 631 BLAKE2B f98ddc8be42c8534972df535a2e27bd433278382cc854d23fc34adf75b98cd07eecc22d654e79bfe1149e4fdc1395a3186a815f3947625ae8dbe8335088f28c1 SHA512 3dd3e6515d913d44b749d0491d6120e6ee32a3f3ea458d8d3515c1d6ec0e99719d5dc85005ec4951158dff230cae1cfaf751dfde131324cd079f58bd2a73b7fe
 EBUILD pdfgrep-2.0.1.ebuild 701 BLAKE2B 8b877e130a6d58635312771cb09778454d25fbb87cb2686deb92adbb981b9ecfb5706fe842a6bd8477e67d098d07c4e941809b94f7e92a29f456a0934c843844 SHA512 c1c78707a9cf2589800d275b50dc0a8a97a7f5477c2f1f0773312801aad082c2af4752380d5463aec6b136ead175d4f42cd75d9632da8bebe557c4776b03a879
 EBUILD pdfgrep-2.1.2.ebuild 761 BLAKE2B c6879de906a6b25f22eaa4e24566df386ea4b9545da164084a61465664d82559d24fe5b9ef860902ea6932b05f1580888a8704a7553550f34643b857e10f66ef SHA512 48865871bd3e0f115e7acaf64218703341ef162e637609adbe138f70a73ab32e8d30b46bfb433e447a79ba648a3ad5cdf5b9596d7aebd431fd29971905b6ad7c
 MISC metadata.xml 492 BLAKE2B 7cee2a75825f42f20f364427915e938fecd8a62d0d7053bfc8dad1f9e377a8d0ef5f6155c756fef486a0136181b67b08d5536783613d27cfd63bf32b850a6f69 SHA512 2db060e5b59ad5bb8d8f1d66178e28ca923afbf68420898b27e69bb46f7edea4296bd87f2f35c954f75062cec9b765369aaf45a5516d33b79581ae60efc25d1c
diff --git a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
deleted file mode 100644
index bd8de67b356e..000000000000
--- a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A tool similar to grep which searches text in PDFs"
-HOMEPAGE="http://pdfgrep.org/"
-SRC_URI="https://pdfgrep.org/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+pcre test unac"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/poppler:=[cxx]
-	pcre? ( dev-libs/libpcre[cxx] )
-	unac? ( app-text/unac )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-			dev-texlive/texlive-latex
-			dev-util/dejagnu
-		)"
-
-src_configure() {
-	econf \
-		$(use_with pcre libpcre) \
-		$(use_with unac)
-}
diff --git a/app-text/pdfsandwich/Manifest b/app-text/pdfsandwich/Manifest
index 10e5841dc049..aa15d007e5e9 100644
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@@ -1,6 +1,4 @@
 AUX pdfsandwich-0.1.7-gentoo.patch 1211 BLAKE2B 47461d33a0ecea51de9db0cda447f13c74094b7bf630abfa0ca0b5a72357e20b9adfc86b2035b89af8addbec9ee9ebdac9751490afe7166005c2ebad2b9333bb SHA512 d9865439ea2ed6ffec6c30abe9da1042b5b12a28d266131d421e1d459ff8f0bd60f8d6c2e68017464341f26215a04b4a537cf3f445cebeec55723831a9dee454
-DIST pdfsandwich-0.1.4.tar.bz2 16401 BLAKE2B cb431f35b199e3e6290c60a3f6c7b2621dd3652a29346092869d8e5f86f5664079de1ef431f9b5e8b9f7cc044d64006295a8176d6a28b2ea5fb820db8c952000 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171
 DIST pdfsandwich-0.1.7.tar.bz2 17461 BLAKE2B edeb08ab55df89ef2d1f3e43446e831c66e57273b36ecd56a4cc5f910ca5b59a03e2a66b13e7150f06f8f3eb26ed14cd1c80d02cd38d6bd6cfe923c30c801577 SHA512 ac315aeba2cc753fddc380e2522d0c41d65ea80372a23c2cd5371ebc239ac104ab5a5a1386378b9e026b2935a767128224f7617a5eb8f5ef9d6874cc18ef83ff
-EBUILD pdfsandwich-0.1.4-r1.ebuild 970 BLAKE2B 416b43bc2a95175aabde4379e23207fa524bb882e4b40c7c61c1fff87fb6b016721bff23720b2bf7712892b4eb7d5786edf7c5500dadb9a5ec1646eb7612c8b7 SHA512 3505739fec5f3d76a7d51c0c9f4f4cf992faa59e23779dfd0ebf677246da0a794ca18af304a5631e7fc0984bd698bfe69f6c3a012389cdc943a543ac0fe4b263
 EBUILD pdfsandwich-0.1.7.ebuild 1044 BLAKE2B 93a792a16a1e7612283e25d56b92648614fd606a19b50065192a904cdf12b20e1ff297b8f6c925e92ef5320b5fed08aac94e152a3e8a1c44c9375a96bf2a6dcf SHA512 dd59831311042b08e22a818b2cd553e26b0e7a58c2e3ee558d16a13100b7a3636bbe36f8a791fe8ce15d134aa1d452e5e100a7f427e1859c763664d1d4cdceed
 MISC metadata.xml 939 BLAKE2B 88b45ad8aa691ea97c50e7b9ba9f97455eb8557e8d244f70eb3715b8838530ce8cad94c0e30f8d73755fb738c798d727dab80507260a34298266f2d8cdae608f SHA512 b2e12b2457c8e8cdc35b7c6a3bcce5c52850a554b378849201654ba892f223891fbdfe58f1b6b9bbf711b621c01a5507577241e3c41746fd29e3b14cc5c6bd19
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild
deleted file mode 100644
index 21bf32dcc96f..000000000000
--- a/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="generator of sandwich OCR pdf files"
-HOMEPAGE="http://www.tobias-elze.de/pdfsandwich"
-SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="png"
-
-RDEPEND=">=app-text/tesseract-3.00
-	media-gfx/exact-image
-	app-text/unpaper
-	app-text/ghostscript-gpl
-	virtual/imagemagick-tools[png?]"
-DEPEND="sys-apps/gawk
-	>=dev-lang/ocaml-3.10[ocamlopt]"
-
-src_prepare() {
-	sed -i "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" Makefile || die
-	sed -i "s/install -s/install/" Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	elog "pdfsandwich relies on the tesseract library for OCR."
-	elog "Consequently language support is determined by tesseract's"
-	elog "language support which in turn is controlled via the LINGUAS"
-	elog "variable in make.conf."
-}
diff --git a/app-text/tofrodos/Manifest b/app-text/tofrodos/Manifest
index 61a2eb906b8f..3633599c75b4 100644
--- a/app-text/tofrodos/Manifest
+++ b/app-text/tofrodos/Manifest
@@ -1,7 +1,5 @@
 AUX tofrodos-1.7.13-CFLAGS.patch 192 BLAKE2B a83cb40a82e2034820315423d4da8dd800cbf5c5e3f5e50c04e7d489e5b68c471c19c846ae40db4f69c2568d03ce79640e8bb5b6438c6dcaebbfb0f1d103067e SHA512 137b0d00edd1a534eba7a415b46ddc455eb5954a06148ca2132579bcca859b18b642deeb6e5bc364e1ec1824a5f0d72512de58109acbbad2ba958b6071aa9723
 AUX tofrodos-1.7.8-CFLAGS.patch 306 BLAKE2B 4e3b3ec28cb47d758d053394c4a0c806f27bc2bb97f0b715e85c21c6c3646924fcdb0b520dd819460f84c787a5852e0aab3ff67479c16dd959aa202b3c04711d SHA512 d96573638ba4cc4c3413ad42b903a08ac84286571317097aabcba7dfc69f794e53601154b5faf3e19ca0833377a742df745209ae3958ec9e7d2895e13bce5b2d
-DIST tofrodos-1.7.12a.tar.gz 97588 BLAKE2B ca8794df5b58e0e88d23a52287ec3f9c58918baa6590b6e2d571782c4c2ff1625e208648cce8346b2f63b52031da5dd3aff0e66522e670525cdc09bdfd8744b0 SHA512 45a03203ccd053ec02a420fe4a63b427ee74dfa2c30e914836621a1cd7836ce81800e8bd5f1cccdb93233780ce79bc74d4ad49dca6192899b3039cf559baa8a2
 DIST tofrodos-1.7.13.tar.gz 99975 BLAKE2B 677b5cf7b1ef061b86a60229e083dc19ddcb7887b1319685ccd5a50493c1f02feb8556db3c2866f3ca1851304d0e97592a8abdd880a5f4e70eb7032f4238445d SHA512 629804caf20ac7bfc6f47637b7bc575766f032e324142df3be14347f050c61d969e023f8fed0ce5c87d8fc57b25c60c4e0214600738c5079d5e731045dae4843
-EBUILD tofrodos-1.7.12a.ebuild 699 BLAKE2B 6cb65a781ef4ea7b86b8bd62a4ea6714140663dac58aeb24d349eef8856f3fc7e5cc46e3f0d7926d11a897d4208b845b86886bd5c4e50ee5dc6073a21492746a SHA512 8c4e88d3082d5c597f18fcf45c092ac86d291236ab9cd2e78cdae2a62cb6c85bec5adbee83007c9a64cf8dfe85401db3ace18e45561ac13ea7d92284943462ad
 EBUILD tofrodos-1.7.13.ebuild 678 BLAKE2B 506e4bffe84c7af833a70ba1db010c57e097ac17aded77c4d222e1bfc6bb78ef23d77008f96ecd7e3069b0a211bff3de87b350c932dd054176d7bb7ee2e4c9e1 SHA512 43401bdad6358fc79d96015dae8df3dbfdfaee3c02535fe6540660e7f9b6c07eace732df3aaf29864f48d003cee0768d29c3f7b75cf2be5a81f842ef8d5e391a
 MISC metadata.xml 325 BLAKE2B 89b80fe9769278e73ae9aaeea66f6037a6321f25725f6645a0b02220d1ba06a18213bdf71a2d7676150d75f58ba67ad79a4f4f5fe8c8ba7e5dd4d95054c0e45f SHA512 d32c6a8e3e9bd397896145130afc1328ed86f507af35e2ab5b0a9b385462624542728178a06530af5cda863aee10e961bf3d189fbe3d1cf64619ba3d0a8f0b8b
diff --git a/app-text/tofrodos/tofrodos-1.7.12a.ebuild b/app-text/tofrodos/tofrodos-1.7.12a.ebuild
deleted file mode 100644
index cc6d10bee44b..000000000000
--- a/app-text/tofrodos/tofrodos-1.7.12a.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility that converts ASCII files between the MSDOS and the Unix format"
-HOMEPAGE="http://tofrodos.sourceforge.net/"
-SRC_URI="http://tofrodos.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}/src"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.8-CFLAGS.patch
-}
-
-src_compile() {
-	emake DEBUG=1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin fromdos
-	dosym fromdos /usr/bin/todos
-	doman fromdos.1
-}
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index 615c717786ec..252137bd890f 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -1,7 +1,5 @@
 AUX unrtf-0.21.8-automake-fix.patch 191 BLAKE2B ca81dbbebd8ab2ae786e6291018ecae848ee79a0193c0c176e15052712363f196776b2014a83a2f294d718528588251087c896c87f24335dc4f1fcaf76b926a3 SHA512 7df52c8bc5a6955096fdb3a0e2c151ecec8226c4f703a7d6095f9ca4e4507084b0b0a97b10d853b5da0e27b01bb4e73a6080aec35e5fef14fb015c36bed222ad
 AUX unrtf-0.21.8-iconv-detection.patch 301 BLAKE2B 53d3125d59e44da9c539a13f76d99828be94261e61e367c3582da17cb8625caa75accdd38bfb59b6a7e15a3879ed8ecaf62df3ff26d5e757a86f963ef6c3094f SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
-DIST unrtf-0.21.9.tar.gz 828590 BLAKE2B 832ab672265efa8f1ed5dfdcc73e310ef920199db57cc2be5303c7d0c502a15e7027cb9539ee5a27df66e2589d9dce88aac40d465f87d39770de9c4b5d886b8f SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03
 EBUILD unrtf-0.21.10.ebuild 410 BLAKE2B cd3520f0d3fc77ae683afe34210b2cd6c93d293274aa944f9f23df3c2d19b4856fc95525e2c8a82f0d72974eba1db24ec3704f866cf1e7af629826a231821ae9 SHA512 749fdba434a8788d2ede21351de8d5fa09119b3bfd4c1652ad8e0053ea7480243b7e845ae07026de447e4e9abbaf682a510f883a01d456cee280ce35f39466c4
-EBUILD unrtf-0.21.9.ebuild 730 BLAKE2B 222ce4105c497644f5fa5183b71f9e6ce5e4750cacbe3e0b0eb15fcba31f4883ad1fb599d34b024b8f122fb82cdcbbd331950397009c62b0723fd1ddafc471f0 SHA512 e592ca14d15900ede6345f4e64ceb7a1451dded20be5f0dfdfa607bf3f6123a79cbf9a93cae4376388d692cbf9fb38a9d710e27ddcc086e378216b016189f8e6
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
deleted file mode 100644
index 1bc242caf1b4..000000000000
--- a/app-text/unrtf/unrtf-0.21.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Converts RTF files to various formats"
-HOMEPAGE="https://www.gnu.org/software/unrtf/unrtf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-
-src_prepare() {
-	# eautoreconf fails when automake-1.14* is installed. Please check with
-	# next version bump if we still need this workaround.
-	rm aclocal.m4 || die
-
-	epatch "${FILESDIR}"/unrtf-0.21.8-automake-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.21.8-iconv-detection.patch
-	eautoreconf
-}
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index ce3af968dccb..13a05258ad3a 100644
--- a/app-text/wiki2beamer/Manifest
+++ b/app-text/wiki2beamer/Manifest
@@ -1,7 +1,5 @@
 AUX wiki2beamer-0.10.0-doc-examples-makefile.patch 641 BLAKE2B cbac271fbfcb8a41e9bfdb4eb950a9cad46f71f38378a5a4309b401ac6a136865dae81fbe6f75bc1dcbcbc43f1d78a225c5f48205667aad869067b2eb5eb3daa SHA512 0e92df952bd4e82d6198d26f88303c9e992d9f409185079c9261ee11d3a61e76e988574ad7b830fdd9075430ed2fde9e5a635f512e71fa730557af95bcbe23c9
 AUX wiki2beamer-0.10.0-doc-man-makefile.patch 1441 BLAKE2B bfbf6c71f037d67359d1460a4e3c75b7b0a260252881efc2429ddc0b5aa90005c2c4bd36b18873106f9010803f765217f19a1575ee7ba5324ad53e52908a23d6 SHA512 b6ad3ce2b1435d79cce8a517e1a784399b349c4390c245d888b50acb2f5b89aaa49241d3687e4b5432fde7d433bf5ab5fb4bd1d4d96dfaa44358a6c0961bc76b
-DIST wiki2beamer-0.9.5.zip 443288 BLAKE2B a0263ba7044966ff45c892e9f0f78f6916346c051bf57cc8445f4127019cc4cd031719b1b5b61fc7d41a85b42439fa20cdf8fc35fbed43feb28d6d9797c781c7 SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7
 DIST wiki2beamer-v0.10.0.tar.gz 164911 BLAKE2B 0a532669915f0db5f1bb8755297bcd36e4175bc57d3b5f14df01566ac74e425c999447ff3f2bd20f2bcd50671bd65accfcf8049476a1656439fc46bab2becafd SHA512 712c719bcdd97f48c65aff1919f2e6a838a0beba1d2e5569063fd1f84bf68eda3137ac20e5dc463dff64c8b4656ce0bf02a0acea090b9a30262374cbee5db433
 EBUILD wiki2beamer-0.10.0.ebuild 946 BLAKE2B 21783eff4aa4eb1a981ed36a64c1ca0d10ebbf011d0e4d9c8e973117523cf112ee798a6dd2d476c87fb789df3d6073a4a5043fd674273deaae4094b302fe8b85 SHA512 1754372e1c4cc0c14988b515fa5f7cb8d42740af6e988d4af808c74ed1798232b83010aa68eb18240e3dfbeee1989d2a27516ece5ea5255564add3ed7662f9be
-EBUILD wiki2beamer-0.9.5-r1.ebuild 784 BLAKE2B 2d30ac44221d37aff5cf627805bafb0a07d106bd526ec9be8842789c1d89662e6059bd9a796a6af07b1e6cf5b08590fff4466f77da5609d28648c4a8a155e545 SHA512 2ce36544aa7ad33dc468ce4c6867e20867231e9c4066a7726c7f2e33fec43c3ddb82f77178ec1d414b55e1a6b2918c88e54cdb164e8618348ae7f05eaddfa985
 MISC metadata.xml 330 BLAKE2B 27059ed0cbe2bf10ad3b028d1f0e12b0617c0e2146432e375ccae5d570d8b1c1860bb9b9f36021a588ce859b7b30dfc04fb1f841890c549093687f3b6ad8addb SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1
diff --git a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
deleted file mode 100644
index c87c19f7d575..000000000000
--- a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool to produce LaTeX Beamer code from wiki-like input"
-
-HOMEPAGE="http://wiki2beamer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="|| ( GPL-2 GPL-3 ) FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_install() {
-	if use examples; then
-		# Patch example Makefile
-		sed -e 's|../../code/wiki2beamer|wiki2beamer|' \
-				-i doc/example/Makefile \
-				|| die
-
-		dodoc -r doc/example
-	fi
-
-	doman doc/man/${PN}.1
-	dodoc ChangeLog README
-
-	python_doscript code/${PN}
-}
diff --git a/app-text/wscr/Manifest b/app-text/wscr/Manifest
index 26cfb316d734..1227db98e1a2 100644
--- a/app-text/wscr/Manifest
+++ b/app-text/wscr/Manifest
@@ -1,4 +1,3 @@
 DIST wscr-1.2.tar.gz 3502 BLAKE2B 4a6684dd6d9eb9c23caa92f9ddf62332f59b20eb4aba0f475015ddc7e66c592177b0d15ec25249fed86e2302a53463f59d608bd727d97bc33a42d903ecd04281 SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3
-EBUILD wscr-1.2-r1.ebuild 614 BLAKE2B bab67559b806a208d93eb4c6a32086e0e7455408987f89178b29190dbd38db5ffd1608624c835dcef62c431e5660babb1595641ea93eb22180f05464e99e50e3 SHA512 e22ae0d8250bd8a377446b5b0c3bb60c2e78491c268a87c1156f6312ecdd5941c6fdf68acacd21907c7a918e9d50c50d5ddcc564d19729b520b62d38424037e6
-EBUILD wscr-1.2-r2.ebuild 618 BLAKE2B 1f31256e75563d9dc010ff3c53163c83cd0fd6e914a6ed40cf22cddbca38b0979e3c58047aaf6877ee4d294e8ee359828810b8f13454a821148244e2cb0bd7f9 SHA512 a269f6a1f89461263d44d8f3b37744d9055d451ed05cb7028054215b0c21b3e74c5dbea7c0fc9a38f3c380907f1e59c282b649ec8f669e4bacb38777c41e5f68
+EBUILD wscr-1.2-r2.ebuild 615 BLAKE2B 18ec7f574e279bd960b9609673ce34af861c6aa390f4a238f89f82a7ec56f0c297029142ac08e4a20dc9baf8a43eaf74a800b954c1369dd7bb242a118f7e36e7 SHA512 945b79643488740ce22f6e255a61b7618bcdeeb6c7f8bfa06f0c2b51f4a9fafb152de0376bf322ea6136ae8deef602369a93f2f6fc72208f5dd59d4a27c43190
 MISC metadata.xml 421 BLAKE2B dd48a7b914e790db0db06781519466d05de32f96ff8399e9fcb24ff040119dcec5380677910d9155c611c28203ac1ee7bf5d9602faeed69d4bff35a8cb1d6b3d SHA512 70722daa9c12a7e783b5fb3651f207c057648287e104739043f96c726820268ceb8e4ec211af9a3e2f8fcf7a5e03c9346cea7a25a70478dfdb60f333112b70e7
diff --git a/app-text/wscr/wscr-1.2-r1.ebuild b/app-text/wscr/wscr-1.2-r1.ebuild
deleted file mode 100644
index 7b47ea900355..000000000000
--- a/app-text/wscr/wscr-1.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE=""
-RDEPEND="sys-apps/miscfiles"
-
-src_prepare() {
-	sed -i 's#"/usr/dict/words";#"/usr/share/dict/words";#' wscr.h || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" FLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin wscr
-	doman wscr.6
-	dodoc README
-}
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
index 1760d0f73dd2..b0d8920b953b 100644
--- a/app-text/wscr/wscr-1.2-r2.ebuild
+++ b/app-text/wscr/wscr-1.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 RDEPEND="sys-apps/miscfiles"
 
 src_prepare() {
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 8bcd4df9bd2b..436d0b0eda97 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,11 +1,9 @@
-DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
 DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b1390ba63ca999f235a10a7ab9bf4db378273cf6f7f6b3107c80c1ebb44bdb1a94ce3c00585f83ac0bec188163633be843b SHA512 27059d13bbdfc2ee9e8f4f6e74479bac0885cabab97d7eb1ebdc57eacbff1724b2684ba72efdf6d35f608e2e8f0891d47c626aaa100c713f4c2f66f923d841b7
 DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679
 DIST xapian-omega-1.4.16.tar.xz 546360 BLAKE2B 990eab976833854d2a172e1584383b71375fe2e0b83a8ff0a150f4c9fdb6e99cbd42e58720e81698292843918112426d3b445efe14d9ee5f76e85304439475de SHA512 7f8c3d4e372c49f89e28da999ee49f0754052a339bbc4492b50f8134cf29b2c433ddae9e58ef3a2468898b711b4510ea87687a247ce21e83eba2f8daaa2910c4
 DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
-EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B e6431300b0eeea58f502e8475225830986573e839441f1701cf9387c1ad53bf2bc838d08aa823c65f93d62c94501def769602b4772d714cf2d9396a052c61c50 SHA512 a22cbd4bf3a7ea46c0a60b7a1884af858f09464928f90d63e0526385e5fc6cad123446d59affe1efbad286c883c1bc125b5f6f7fb6a8b224f9b242ddcfd13a98
 EBUILD xapian-omega-1.4.14.ebuild 1154 BLAKE2B 8811fc7b98c00a549752cc33f1f6ee53a5c9af856e3bc534b830e89aae2a8f2e4dc9b33f14bb5de528bde8941c5629e3c31660daa9e20c5a77133203befd539d SHA512 58671f926670abde77437ed28e6b602777475bc5e5a57775d65d02ff0c6e0ef2c6fa1eb3c2db250c44496697ca6fe4c2bac9a48f73a0b6b8d2d657114227c347
 EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 EBUILD xapian-omega-1.4.16.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.17.ebuild 1161 BLAKE2B 5324c482030c68c492ee1bebe5a010e8614278ea0092476ca8eac5b69e622e12e5897529ef5823c34fadd0dd0f1e6c52efbb0887ddb64d701256dc7894b22c21 SHA512 a1843680dbc57a14bd3b78fa853b00feb546311d4ba4478cc2ea428bab0b48e481c00582d5ae1ee3139c7f32d079dc9f327b874ddd0ec5b8ca72a830d404e91e
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
deleted file mode 100644
index aee8e82c2156..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/1.2.22
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	#move docs to /usr/share/doc/${PF}.
-	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
index f76f70d1acab..844423d980fa 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 4cbbb2d28f5d..93867f5f6ff8 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,7 +1,5 @@
 AUX xournalpp-1.0.17-translations.patch 716 BLAKE2B df50ccfdf86069f08b29168af42955d80b363db5d271bd0c97f07cdc626995922471186cd83f7860f0eecbf8e53982639e23a5a2b817310f6d3d12e529577c45 SHA512 83ae3ff7ae1dd4933f063c9e35a38684eeb6638fbc9ec52b863bd1499d2fe958b7565e8609060d9ba8388eb6c89e046b8908c0fd7387981154cf86da3b574184
-DIST xournalpp-1.0.17.tgz 14885382 BLAKE2B 501feb4480eee5aa38cc148f561d6c730505e43fd5d8017936f4b1d15f1b83ae936eb0a2e81b9889c668f9ed0a9c46b9053c984d45815c88829b023b7dbbd209 SHA512 cc3568ce22fd42f0e8458f1428c102d2fc18a9650d8c5968cadd6693fc19374780beb3c7f6206f2f494439296a883b2a5160da37e3a0e10d6fe3654084967ab9
 DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a
-EBUILD xournalpp-1.0.17.ebuild 897 BLAKE2B 5a9c41c6960ca6317708ce27e379ef269d7e547f12d11122602abbc71ed11f706b81445ec033b54a64b97290b654123b6fe6c8debdce282a7324b56cfcf57145 SHA512 0c2eb1f2a74aa33029a0025e296f6c7014c5ac279ffa42fbfb6816c904cf51ccc81803cbc3eadb475491441d20c478321d76fe5eccd27e520641302d8ffbfddf
-EBUILD xournalpp-1.0.18.ebuild 845 BLAKE2B 75f63c7de44edfbf3a8ec372f6ef50beecd0ea62ca3f71a6700f3521247651f975461ca66de7c8018ff41125b59fee514906c9f2379397b9e524f08bb3e4d83b SHA512 a73628b37075cd9c0f8fbb74a4627d80195e49d8c67b5bb7044a7fbb516dcf4f830bfee9a7683a6af49c60542004fbd20a5c9b9d1c04748f26a9c2d2f704d418
-EBUILD xournalpp-9999.ebuild 845 BLAKE2B 75f63c7de44edfbf3a8ec372f6ef50beecd0ea62ca3f71a6700f3521247651f975461ca66de7c8018ff41125b59fee514906c9f2379397b9e524f08bb3e4d83b SHA512 a73628b37075cd9c0f8fbb74a4627d80195e49d8c67b5bb7044a7fbb516dcf4f830bfee9a7683a6af49c60542004fbd20a5c9b9d1c04748f26a9c2d2f704d418
+EBUILD xournalpp-1.0.18-r1.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
+EBUILD xournalpp-9999.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/app-text/xournalpp/xournalpp-1.0.17.ebuild b/app-text/xournalpp/xournalpp-1.0.17.ebuild
deleted file mode 100644
index 4dac69f10a5d..000000000000
--- a/app-text/xournalpp/xournalpp-1.0.17.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
-	unset SRC_URI
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
-fi
-
-DESCRIPTION="Handwriting notetaking software with PDF annotation support"
-HOMEPAGE="https://github.com/xournalpp/xournalpp"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-COMMONDEPEND="
-	app-text/poppler
-	dev-libs/glib
-	dev-libs/libxml2
-	dev-libs/libzip:=
-	media-libs/portaudio
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMONDEPEND}
-"
-DEPEND="${COMMONDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	sys-apps/lsb-release
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-translations.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
diff --git a/app-text/xournalpp/xournalpp-1.0.18.ebuild b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
index 6cb1258352c3..7057d336d41d 100644
--- a/app-text/xournalpp/xournalpp-1.0.18.ebuild
+++ b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE=""
 
 COMMONDEPEND="
-	app-text/poppler
+	app-text/poppler[cairo]
 	dev-libs/glib
 	dev-libs/libxml2
 	dev-libs/libzip:=
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 6cb1258352c3..7057d336d41d 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE=""
 
 COMMONDEPEND="
-	app-text/poppler
+	app-text/poppler[cairo]
 	dev-libs/glib
 	dev-libs/libxml2
 	dev-libs/libzip:=
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
commit	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree	e907cb121b30e3c1df1710719c0ddf4029597a47 /app-text
parent	db063b515939ab15261136b24e4bc44386335c0c (diff)