gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /app-text
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
44 files changed, 620 insertions, 438 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 452165142f11..394809a88908 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index a4b7deaa5500..90a470674b2d 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,3 +1,5 @@
 DIST atril-1.18.3.tar.xz 1695960 BLAKE2B 2479ddd46104153631d34070054e9ba72956468c7b720aa5dc3c4a458a00cc00484cdfefb01981f2e8beeb7a13f1fc3db940dcc9a728863a1378b5b896e71e57 SHA512 d57cf4386651cb871455b003482e896a2735fb023e0b11f192ed1d169e364306f9ba55ef163df02ffd236b5f86d6afe2c1068d00d3fbc309807ded729ce2355a
+DIST atril-1.22.0.tar.xz 1819580 BLAKE2B 6d5ae9e42407c5c7ae716c0650eda2085bc2206f442dbbb04dbf549263cdabe6d28761deb14bb9557534f26828882cf5b9373698b5e2c29f4b70445ebfabaa5b SHA512 bf940178647c348fd78e828bcb3a55c4ff6195d4020bf198ae5ba4a96e2fe582f7e30fb9d4cde4143e82ae783358373d3a9fd68413295586da9fe1b374e2f034
 EBUILD atril-1.18.3.ebuild 2164 BLAKE2B b846318383a8a5c62e7c48807172df259df46254d95eb64d962884c26decad08bf5023b6c07bf64c23a29ca534421daed0c2951d41b96f828a9ccd78e088974a SHA512 6c9782e6bd88b3258a54cbd4f31115f6527fd91a745c587ca872f9956afc6cb752b651aab86c18b563f935e469873efe780dc5965c6c6d3f2001cb3ca72a1a97
+EBUILD atril-1.22.0.ebuild 2137 BLAKE2B 43f5aa8fce52eab71cdee4de3c08627ee97fbdf7a5eb930bea44376a0f2965cebe8c4ea35781d31e22ba73d9a6dba7ca20826ef32a1c3ee6ab47b321b6572bb3 SHA512 53c279f7beb15f09ccb0a2aa6d3d2d999d541176997e9768deb2ed00854d7591e1c50775a8f6126407f934623d3af67f9f435ccf22c276d3befa3f313f50fcec
 MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
diff --git a/app-text/atril/atril-1.22.0.ebuild b/app-text/atril/atril-1.22.0.ebuild
new file mode 100644
index 000000000000..6ccb2b4d54db
--- /dev/null
+++ b/app-text/atril/atril-1.22.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.50: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.9.10
+	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.4.3:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1 )
+	!!app-text/mate-document-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+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/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+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 \
+		--disable-tests \
+		--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 t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 49c6ff64bb3c..b8f9809c1957 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,11 +3,9 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
-DIST calibre-3.35.0.tar.xz 39482684 BLAKE2B acf61ad52b9de4ab87913d536890f1f74cd4bca656ec275cd5fe21d6bbb4b97792d7f13f40b85b61f7a27745be2aedfff8b6deb9f8dff980f6f30596c184f1f2 SHA512 c81a00832c812603e5c5752f47ad322fcd9aa5079273385af2e0d8813bf04c4b84cca40210d53207c5b52ac4975ecec725f5560cb3c629f4afe9150229138b0d
-DIST calibre-3.36.0.tar.xz 39685880 BLAKE2B 2de7a7ed24b34d15cd4e25f343f50bee412b7b64a5c30d9a0be339a899cbca46453b419fbfb60ff9f05d2853af939f3bb9cf65263193148ec6d33bf06964c72b SHA512 f7ddeb54dac7b52951dfdc4c14c4a18af436eed7e5d80326528d4101f8bf34a5de173049f04cda286f6172ff4aa8f0200a7e8d55aa720c36742327aebe5a9ab2
 DIST calibre-3.38.1.tar.xz 38193788 BLAKE2B a42a8c3a628246def1f27488db729fc5a859bbadea344d04aec7d2ddc347bc97706d623ba522ad960bf239debe62eee126367417067e4a7c1d427af50584fd37 SHA512 4ce1453ff50894adafd027e9bad7cbd557b9b13d5939e53b8476083bb221f1c84cabc465c46f7b6361bcef60ed8da2d96dbfe9670ebf372e4864195e4748ee18
+DIST calibre-3.40.1.tar.xz 38365300 BLAKE2B 5b1b8624d81d8a60d954b3871e46ae5dad8a49a7efb6e986cfef133da6da249fa8b36d1eed3840322ddec9c8144772c1e9504e114d27774096a9939f2a58a326 SHA512 1333c24e384ccae79d264055e1e84b8a13919e68d9290a277e07bb7f3b4579d15090859b50945672c155a438a2bf9e5f088f094bc30781af7c5d0d9ccd7226f4
 EBUILD calibre-3.26.1.ebuild 9281 BLAKE2B 8eaf92eb0c23c1b500105c74841aaf1980f71d7f3d01f5af76a0bf906a904d3df17ed71a5b01d150a70c1fd53b431f66de9a8c3a055a26b086dd60b714e535c0 SHA512 2194ef543af3296766c960768dbe8e6330d89583318052ad56a8a35df5704c88deec235c1dbfe042bc4c99df8ff94b48fd87f3b15b012c288a87f891433d49a5
-EBUILD calibre-3.35.0.ebuild 9246 BLAKE2B 1259df8792b677d45160ea9282d06db8b416cc002dc6016a13acde2054bb2574f7e7def8576277f2af6d8e29b93455dfdcb1c67e3a10fd0e349341101ebffa82 SHA512 7bbf1f3796843e46bd0ca0636476aa397e562b1333fdb605c2a49c8abdea032ec59f7e701e30414e93755db538ebd3d1eea5bea017b3fd5e6fec90a891c8c0eb
-EBUILD calibre-3.36.0.ebuild 9246 BLAKE2B 1259df8792b677d45160ea9282d06db8b416cc002dc6016a13acde2054bb2574f7e7def8576277f2af6d8e29b93455dfdcb1c67e3a10fd0e349341101ebffa82 SHA512 7bbf1f3796843e46bd0ca0636476aa397e562b1333fdb605c2a49c8abdea032ec59f7e701e30414e93755db538ebd3d1eea5bea017b3fd5e6fec90a891c8c0eb
 EBUILD calibre-3.38.1.ebuild 9248 BLAKE2B 9524bb3feaf25473ee99c4c829e23ad586e0752e342ff0d1243da3ce15e65ee73e949cdced9395e2c5d757d8e094a4ddbbd524f78ea35179fdd927f85ea9f277 SHA512 b284b207b18f29229ac277900dc88e0f26b8da082591605d5cef9da7053b324d5b0c5379aa823504bfa731d3b0007bf16824bcb91cc24decb31c3ad71c266357
+EBUILD calibre-3.40.1.ebuild 9347 BLAKE2B aa2f85e4fca55174dd56f149bbf7871afcd3bfb8bea66ab333c3673fe5fca9bb8d6e26a8099e9e55fcc4d1933b961d7c7770231cd98c20eb5df861dc19bfc522 SHA512 c8fe8f932eb75b9439316cbbe9d22cb199c096dc5f65897781c4bcb42a57d1bcb427472bc6af43febe4b2da4297e3f2e6bfb7a5e87319f1b5a99dc4c7926c836
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.36.0.ebuild b/app-text/calibre/calibre-3.36.0.ebuild
deleted file mode 100644
index eaef52feb40d..000000000000
--- a/app-text/calibre/calibre-3.36.0.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# don't create/install uninstaller
-	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	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/calibre/calibre-3.35.0.ebuild b/app-text/calibre/calibre-3.40.1.ebuild
index eaef52feb40d..a35d78bdf209 100644
--- a/app-text/calibre/calibre-3.35.0.ebuild
+++ b/app-text/calibre/calibre-3.40.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,22 +44,24 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2=
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
-	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
 	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
 	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
 	>=dev-libs/dbus-glib-0.106
 	>=sys-apps/dbus-1.10.8
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
 	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
 	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
 	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
 	dev-python/regex[${PYTHON_USEDEP}]
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 1a46a6fcc664..b422a8f1678c 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,5 +1,3 @@
-DIST cmark-0.28.0.tar.gz 228973 BLAKE2B e0f42a7a5929eb8fb7a2fb9405372d626b2fea5f895b9320a28629022a8280d01af67e8e13101565ce86a2dbc4b8191eb461e70e45e7fa33c72b8e8266c2ee78 SHA512 86aeb42f17440c8e743057851bc3cee9ed4b3fa27dacc37d6af54dee7739210a712020e59c102ed1852b7c3f904881cb4e9b80ea475772095514c4025284cbb6
 DIST cmark-0.28.3.tar.gz 229391 BLAKE2B b235d3dd8ed9b83d8fd6ec495d311bed854ad61d28e5a5087f40f7e512977892fcdff7c51e8683db87e0ee8e5e73338fe11b8829e70c6f07c59e917a8b7268cc SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29
-EBUILD cmark-0.28.0.ebuild 704 BLAKE2B 9c0ebfc47577cfef39d9333594d0a200d96ea64f57698cced39e681c3576790edcde14329e1ae8d03e9df38f05c2cce88c33d84691860482b073127f1536589e SHA512 c279cc5b8d899436fed2eed3d4979ac462b28f2248e2fbab934d8ce4075447c11525deb6bcd7fdc7544c36abf71b113ab6266f59f8a1f626c9b84b0fc38e0764
-EBUILD cmark-0.28.3.ebuild 712 BLAKE2B 04fa7e5a42b766e627e2b5e34001e6142277de16de8ecab0a695bfd3e4a1cc183787aa9dab60d252b6632e292ebfb299a2fd8c772bf252c7af7b407828d6db4d SHA512 be392d28a567a2c0ad90dd7dad97494a5f4fa119798522e9e801bd3218b6a47cc8046405ecf0813e06dbb7e9bd550ccbab511a4e8baa2b3f579258b132aad89d
+EBUILD cmark-0.28.3.ebuild 719 BLAKE2B 100296b5499dc7626cc44d81cb38aafae2757e94eb2ade386a24adfd1c41e4798fa3f7c746eeaa749d376d4dc7335519bd827fd4529c8702a3cd4ef5f29b5b20 SHA512 c7fd28032744e4807f7b4eeda7630aed8de99316a199fce886cedc6670ec1436e4695994c9b63df92ec25351e1e09ccfe69b6a0ad68ec2c1ce3d1c9efa208ca0
 MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
diff --git a/app-text/cmark/cmark-0.28.0.ebuild b/app-text/cmark/cmark-0.28.0.ebuild
deleted file mode 100644
index 8645624e81eb..000000000000
--- a/app-text/cmark/cmark-0.28.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="CommonMark parsing and rendering library and program in C"
-HOMEPAGE="https://github.com/commonmark/cmark"
-SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMARK_LIB_FUZZER=OFF
-		-DCMARK_SHARED=ON
-		-DCMARK_STATIC=OFF
-		-DCMARK_TESTS="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-text/cmark/cmark-0.28.3.ebuild b/app-text/cmark/cmark-0.28.3.ebuild
index 55c636df3600..215c1bf461aa 100644
--- a/app-text/cmark/cmark-0.28.3.ebuild
+++ b/app-text/cmark/cmark-0.28.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/commonmark/cmark"
 SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0"
+SLOT="0/0.28.3"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="test"
 
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 6211dc45c275..468aed4c0c13 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -5,6 +5,7 @@ DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e81
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
 DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
+EBUILD enchant-1.6.1-r1.ebuild 1633 BLAKE2B aac2994d7a001722a71c308f2d4b63f40b634126545e47cea86e2d177b539f8ddd92b9230ee47294a18e41e03e17b4f9e21fcda1ccca1f5c8ca20749a78e0402 SHA512 25a076c976727036b9bce85167f708773f78835e769fbbe457360e367d47a61169ea7fbd7cec33303edfd01f27eb5d1e148eafb157fbdbf4e6f45c4bf0604ce3
 EBUILD enchant-1.6.1.ebuild 1497 BLAKE2B 0a9aefe2919ec376d33ac79e271014c065a26cfa4dd70e760efbbd3b76e6723127fb588f4365aec905215236ed407eccb25a9943067bd198ce67f6b7b41adc3c SHA512 ca846dd37eb5e9fabcb512dfb2c77dcecacf22018a3ba5e61528180c2c879f0a849236ad7799121f9f0839bd250078480c2c80f792756d301518e06bd3c7b01a
 EBUILD enchant-2.1.0.ebuild 1315 BLAKE2B 099906e37a942d542e7bf55a4f86e2def554890f131ebb2a717a270a1b7e1582200468f403eaeeb669d8e253ec437beaa8117f5ac8c05d757983caaa7158ba61 SHA512 6c6261e70abe20d1a4ad83b3b3d0cf68fa29543d3f676301ad16fbbd4d8477b3add24accdf94b9c14bcd970a27385c88bf1c8b516a4cdfa720e81bf9c6204515
 EBUILD enchant-2.1.1.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..068866bd3d8c
--- /dev/null
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit versionator
+
+MY_PV="$(replace_all_version_separators '-')"
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell static-libs test"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+COMMON_DEPENDS="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+RDEPEND="${COMMON_DEPENDS}"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+#	test? ( dev-libs/unittest++ )
+
+DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
+)
+
+src_prepare() {
+	default
+	sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
+	sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484, shouldn't be an issue in 2.2
+}
+
+src_configure() {
+	econf \
+		$(use_enable aspell) \
+		$(use_enable hunspell myspell) \
+		$(use_enable static-libs static) \
+		--disable-hspell \
+		--disable-ispell \
+		--disable-uspell \
+		--disable-voikko \
+		--disable-zemberek \
+		--with-myspell-dir="${EPREFIX}"/usr/share/myspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index e8fec5ccea38..0ce9f30f74f3 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -3,5 +3,5 @@ DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
 EBUILD gtkspell-2.0.16.ebuild 942 BLAKE2B ef168b07393e46a98497b1fa3a7d0e999af3d0a943a72e7c1b07eea830745ea6f56c7b1d6f9da3c392ec76fb56fa9ceabcc01ea26d5880ead6d281a0b5088d63 SHA512 90460f1f223900b13fa54ffdf5e87ff2b810d540242691f3574079ed66dd061539cf0d0bd5668f3fde09b2a18297cea93afedffb2772ac3725cdb98a5270ef53
 EBUILD gtkspell-3.0.10.ebuild 1073 BLAKE2B 63ffc838848ab6585ade092b37e11c68148d73ae15a8fb8248eb799aaed0ee2f9b80f99a13d7b0692dd37cc065075176640b85884954128147e11f8e6f5dc5bd SHA512 ebe3f1f432f0f12c256c9f1f83f5dfa91c96c042764814ba68766cfc8ebd2d3decc8eea143f3fdba659234fa60a42218a64072868cb4210c0abfe8d20ad87df1
-EBUILD gtkspell-3.0.9.ebuild 1073 BLAKE2B 3ec89c21b8057ac6dc4db2e492b58044879f215611ee6c4dc5da55fe2ea5d5b4826d65ad3458b77029bb413426cad8c03e0cb46655f0493cd48b812b9fdcfbeb SHA512 39aaa3a31784ec025a8b6fd0a54cb7c05f7f5b346bb06062c8d467887977019dbe0131bf83c5e8e563a1c179977db821a03831df67d045d6ecf64ef734b406de
+EBUILD gtkspell-3.0.9.ebuild 1077 BLAKE2B ed2d232ea31235090443e2235ff40ba2f20ea2802b1abfab986b7c6529560f7d69e0fee9113ea6b452ca31ac998b17dcdf93276a11cad460cec842d748edb100 SHA512 49729dd8cbd6c68a38ee845b3502eab65b4b0c4c3106cb608e59d09d26e1300f46de8c821a26c97795d4505e07a3a176c95cc44952c0c47d1f8c5d524e50da34
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
index f41e0ea8e2fd..e35705c34ec5 100644
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index d2d9ca83415e..8c76c289fe1b 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,5 +1,7 @@
 DIST libgepub-0.4.tar.xz 246016 BLAKE2B d51f55064d2dd0c9d6cb33884d9dae967b6a9ea971624fce333e9692abfaddf12c6ee4fb11cad97dc0fcc0b6a5d42ff71fc842eb205326ce8181af8e3ad46d2e SHA512 dd3e9837ba2c5896319918bda19eec8ea790d54f7893ddca46774f96f8e09ac1962ae6cbfc0bcd23c15059c63683ef4a6673e05f8416b024591677fddfa3ca15
 DIST libgepub-0.5.3.tar.xz 25576 BLAKE2B c51f6850c78185fec6f027ad5507b2402ab578b2ce6e4b91c674c3a3c6945857ce3d3ebd4560408ae8e5552ca658c40b30c73b42db1ef61f4814cde36a404df7 SHA512 8eb3370b6ca639135a1365756f3977f6daea3039bcb7ec4d5cd116d869584be2a2b1e8bb7f202d4c101f1afb0f7b9a45bd48c1b2337197ec4320d50a4c8d0183
+DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
 EBUILD libgepub-0.4.ebuild 682 BLAKE2B 5e5e637ff47ed41cc130907d61d7e5bb4cfd4711d523350f12896926abf90c56f3f5994fdc17c329d5eeb30dea4bd5f7243059642c3261d3f5011f6581bfd1b4 SHA512 636d71bf49aa273232dc555c999febb2f10c14927f4a1c160c2caf64f5d6154921bf4390220483d5967c1abba4d02000e58c59f1270d18a5c6acdee39e9e9087
 EBUILD libgepub-0.5.3.ebuild 646 BLAKE2B 2b15f05ebda230985ba74ff5d233447eed8bb4c283abccebf4d742c128e94447207d583e5ef2fcd5af660f69ca34dfcf31b752ff6640db4d8eb31a9ffc9210e2 SHA512 34fa589cb61498af1b73fbdc312171e6491a52c362fbefac83973b25b7de024355d25e2bc1126ce08a88a7086e745b618a34e48d2c6b5510c951c59d0a58cd97
+EBUILD libgepub-0.6.0.ebuild 646 BLAKE2B 2b15f05ebda230985ba74ff5d233447eed8bb4c283abccebf4d742c128e94447207d583e5ef2fcd5af660f69ca34dfcf31b752ff6640db4d8eb31a9ffc9210e2 SHA512 34fa589cb61498af1b73fbdc312171e6491a52c362fbefac83973b25b7de024355d25e2bc1126ce08a88a7086e745b618a34e48d2c6b5510c951c59d0a58cd97
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
new file mode 100644
index 000000000000..5d6e53a2c0a0
--- /dev/null
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="GObject based library for handling and rendering epub documents"
+HOMEPAGE="https://git.gnome.org/browse/libgepub"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	app-arch/libarchive
+	dev-libs/glib:2
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	meson_src_configure \
+		$(meson_use introspection)
+}
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index 6c568cce0883..8f85e5f9bd2c 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,5 +1,5 @@
-DIST mandoc-1.14.3.tar.gz 617202 BLAKE2B f534c200d450ad526946afe3ffd0a6c21831080312220452aba400f97d11a01ec2e7e31ae64cd9f4e40c00487769b2ad4a9fe132adbe1419b96e7a5995ef746b SHA512 cd638fbacb068fcd6191f2a4e941effc010e3ebf06a3e32847b892c2e561771d03d5bca8fbdf8434d6491f4b68df3f443e2568b79193b7342044fba476fcd30b
 DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97
-EBUILD mandoc-1.14.3.ebuild 1536 BLAKE2B 96d5d1977bdf98a28d26053cd162a050ba8450014ab828486e2621378e8fb2e5b467acb22f93d52be87f7537cb3e9bdee44bb3e6892aae7c851c2e5463db020b SHA512 ba3e9775ce7566f2a7ba9cfd6d8f5e2b86aa3197a9bee35749323b55385d88d7ed8bd29126bca3061e7dc569411483e39952bcca713324e675b0f67f72d09551
+DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
 EBUILD mandoc-1.14.4.ebuild 1536 BLAKE2B 3ecc4853da9d231ab86f340bea39032ad230f2aced26987efe9ec14fb6fa86bac3bdddcb366428d9c539d611538991103e810908f898db7e11d93f70efd971d4 SHA512 ec236f12331d2564a28e9d8c7b2cd369984cbe3a1a5931cd18805c5c48ab58f99d91b004759428241d4bc7e8bab59ca6bfd9aa5317932d4403035bbeacbcfd99
+EBUILD mandoc-1.14.5.ebuild 1533 BLAKE2B d90996d54081786ed97cb61075671a8527af364aaeaf200eb5b4044f3a0b3a975a9ac625ec79cdcd7160d93423589da0c71efc411202bbff50ebd52bc5e34173 SHA512 83c9b522a8703b1bc10f2be8440c1c5fd3235b2fe198ad6db10254d314a85a62b8c7e92c5cfdd7a56130380936f360327514e2164b5ec60d4fe45b6e7d6fcd7c
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/app-text/mandoc/mandoc-1.14.3.ebuild b/app-text/mandoc/mandoc-1.14.5.ebuild
index 927d26c15a00..4b5e8af2d4fa 100644
--- a/app-text/mandoc/mandoc-1.14.3.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 69f63abd40c1..d728c1ed8669 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,3 +1,3 @@
 DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
-EBUILD paperwork-backend-1.2.4.ebuild 869 BLAKE2B c53a020afcbfc0219dabd1366998a279088f5e3e73ab15a970e2b7c136c55a2c11bb1e99806686eb3740eec5d8a8ae886bf5871efb5ead97a1278318616f6d11 SHA512 bfa7995265d8a05949628103a4e7d71f6a8882ca207803dbf3ff509b6f704c0175911731f8b020139f0253873129ea1060cc6f6df34d5340932b91928548009a
+EBUILD paperwork-backend-1.2.4.ebuild 864 BLAKE2B a7934e6c7804dc0efc99770cdee56569950445d9c6e0e82386be6f3e8b344bfc4c4cfa8a3469c4160d18b3302fa4905965414192dd0b51127393755e72ae9a09 SHA512 4714544691f7c3f9ed2777863d83246e8be06834eebd41830b4513d432ae4b19a9a6d2595803f4f213591f55ca52c99d003fd035b36e6964970da641ce375b3f
 MISC metadata.xml 415 BLAKE2B 3d7bb0d432b982a1c482119ffedbff65e938944bb771729e1c56cb801fd5c26286eba701eb7dbf54d682b2fc975bb8bcad32f38b27f93d8ed3dd403469a416c5 SHA512 aeff8f2d4565711d077d1d2a5105f6c87cb99fd37eb1daf7dd1e919e51b5a1309c974a9e7459b35c3334041ad9776b1ae291fc08b7f2fc0bffe8bb360e2f74c6
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
index 5eb5f6caeeb6..c2523e5983c4 100644
--- a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 97a967c63d53..080de98da352 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,5 +1,3 @@
 DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
-EBUILD paperwork-1.2.4-r1.ebuild 927 BLAKE2B 1fdda901f0fcb17bbe56baae0dc5474bc55967257dfb30ac39ff479e4f5de120d1ed8194894097f31b104df98945772612b50d3cdfdbc6f823bef5517cf09d98 SHA512 2db92699b349fc02438f612c17e00d6daf9e03e2d02a36fcedaca0ec2f41ca860e64a52283131fbf0cc23579b4286eeeff7ba1137b75f628a8c7a8aea82d7d7e
-EBUILD paperwork-1.2.4-r2.ebuild 970 BLAKE2B 309c4655686743c4188ce38c3dfb68fb60d4f83fd30757a34f85ac13fee303513ab044147a099078c0ee60129d9032f3c6890443ee91a3e8f9c7e82f0da6dc9f SHA512 38f548e898c97078ee57fab77137498074a4dfeefec72b43a5bcf862b9328e0b641ea742739cfb485799475dc940046c32b3485bce46adec7084fe79b837496c
-EBUILD paperwork-1.2.4.ebuild 964 BLAKE2B 3bc143a98fdf0962e620d97fa129d73a8a9207536961532b394c1a31fdb0c29c42e4a1b7ea99a325bb8ecdb6fdfcd92874e54aa8813c78054280f09495f2d77d SHA512 d93c4389df13158f99780d085211c9e18fde0f57ee9ee54c94c87f79537ecf1f907016546b4023e1395f4a9851ba431252f4d7068c32442d105950963ee2fe33
+EBUILD paperwork-1.2.4-r2.ebuild 968 BLAKE2B 6962a17308bf22f9b4d18a6e662191f66b19b05c7533063c510365cd7952aaaf3c639777a22948d6d30748b06764d176ad4c4cbfbbfb2124dce38a70ebedf0b8 SHA512 cf90898f2916cb980e310c9d65dd67ac80f92e8b358bae52944768c5979c020801601b956c1dd7c571a9bec60519fafc10afa11c1e0863c475136c14df7cad7d
 MISC metadata.xml 784 BLAKE2B 3da20318f2e16ddb08ca7d5920ef57112986fdd0e0c4bfd4acdecb2aedc35123746533b391be47629985d38b2eeef75dae4eb08874526254316bd240ccee5117 SHA512 dad2a904fa5374ae34f4364bc1140d2b550783bdad137269748f614c20803f938ff51cf2cd3154f1bcd6247c3b38a54afda985811881b17515768095987c7950
diff --git a/app-text/paperwork/paperwork-1.2.4-r1.ebuild b/app-text/paperwork/paperwork-1.2.4-r1.ebuild
deleted file mode 100644
index 9156358a08b7..000000000000
--- a/app-text/paperwork/paperwork-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinsane:2[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.2.4-r2.ebuild b/app-text/paperwork/paperwork-1.2.4-r2.ebuild
index 9e4ef25a5076..0003108d4289 100644
--- a/app-text/paperwork/paperwork-1.2.4-r2.ebuild
+++ b/app-text/paperwork/paperwork-1.2.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-text/paperwork/paperwork-1.2.4.ebuild b/app-text/paperwork/paperwork-1.2.4.ebuild
deleted file mode 100644
index 2c75a8c54b21..000000000000
--- a/app-text/paperwork/paperwork-1.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinsane:2[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
index 5a7675809d76..88fa4549ce7f 100644
--- a/app-text/pep/Manifest
+++ b/app-text/pep/Manifest
@@ -1,5 +1,5 @@
-AUX pep-2.8-gentoo.patch 494 BLAKE2B 62beadd57cf83f21f92dc9597265f7ef672aa19e743fd256dc30afe84d57accb741dfde47d1a87dc4b14242432fdcb08fa169db7cace74524458f4ed4b900239 SHA512 5c214a7d6d86ff59f2edf9e77d480414d7a2dbc0ce5f9a96012c6e642f6c0918772558f46c0c2c5e3f6898c7e751438859bae5bb89a900e64e33f1dd53f390e7
+AUX pep-2.8-gentoo.patch 521 BLAKE2B f5dd34e1e46c40986b74e0707ce88fc2d98b6ffb8361af44c50f025696ee28fd60883faf0016b92b7f9dfab0eae0870a62a6e611ec1f727578944fee0241eba6 SHA512 f25ee35964b158dfaa22721f28f01ebcd90bca963a8564926c6050014c4104f9aaea5cf6594028d7700d8a13c95c336dbd95ea05fff9ba05245937a725d09ccc
 AUX pep-2.8-include.patch 239 BLAKE2B fd411d4e3753314ae93634bd24093524f364b1603671149722d31fb42e70977e3c97a76a2902a891aebd4e0f69632c5cd6da7996732195cf4a2d5005f5996fd4 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80
-DIST pep28.zip 83969 BLAKE2B 76dd8867b04299a7d616a1487a4b7812349a076f51b2828e01b45ef4790d890436eed147b51c2591dec8936b339a19fad3bb41eeafca8cda8c9904afbd2107e0 SHA512 c987b8f23409475e1882e06a87366a1692a7d859af907b4154715a4caf4475d6c266162ede019b29d65400fe72e115948d26e9c9396d628ea5f35ca472548ec8
-EBUILD pep-2.8-r2.ebuild 1045 BLAKE2B a99680e225ea84c3b8e0e03c0b3aafbc6d0ac9bc335e3344991887ea4df4341ff8407fe8941fa8875474f37dfec26eb213a71541c2d1a21747b571d30a5a1fb7 SHA512 c126852d6705b8a47e6d7536c99a5c513ff921a001f29f4a02801b9b05edd07caa7440b6ff19abdad872df122357bd641dffb877af6664ac8c8bc5b9bc7e7742
+DIST pep-2.8.zip 84665 BLAKE2B 529ce27e819e1f4aa683516b71e1b391169647dc477980db5e6f334559f265f6427d20043edf42047286c46724cba578a961a305bfecd24cd72692ebca061e6a SHA512 553efb3f6ca113d96313cfaa7efc7142e3f87d1eb746478aa5f112bb09d6e5d863cd8fa2a34d866777d6724b525d9b94a0978842afc6198fa70fe59c2a8d1169
+EBUILD pep-2.8-r2.ebuild 1057 BLAKE2B f192d99476a8444d8d2de1e30949de228678bf9da452731871e247a5703a6c5bed4ab8d5638ca1814de11fc795620c613e1c44158c7b348a4a02af46a1fa7901 SHA512 1fa3de815352fcee977ce021c4061e6f19be2a1e6f29abaf6d79bb151cac151b643cd3b3f9a414ab5c2c2ebed2e347c1d68f15acf92c40f59390a539e92cabce
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pep/files/pep-2.8-gentoo.patch b/app-text/pep/files/pep-2.8-gentoo.patch
index 8d5c13624d65..e932a35cefbf 100644
--- a/app-text/pep/files/pep-2.8-gentoo.patch
+++ b/app-text/pep/files/pep-2.8-gentoo.patch
@@ -1,8 +1,8 @@
---- a/Makefile	1995-08-11 02:00:00.000000000 +0200
-+++ b/Makefile	2010-08-26 23:54:34.000000000 +0200
+--- a/Makefile	2004-03-24 20:23:42.000000000 +0100
++++ b/Makefile	2019-03-10 10:05:13.973408328 +0100
 @@ -66,7 +66,7 @@
  
- # Unix
+ # Unix (Solaris, Linux)
  CC	= gcc
 -LFLAGS	= -o pep
 +LFLAGS	= -o pep $(LDFLAGS)
@@ -13,12 +13,12 @@
  UNZIP	= unzip
  
  # directories, etc.
--BINDIR	= /local/bin
--LIBDIR	= /local/share/lib/pep
-+BINDIR	= /usr/bin
+-BINDIR	= $(HOME)/bin/$(HOSTTYPE)
+-LIBDIR	= $(HOME)/lib/pep
++BINDIR	= /usr/bin/
 +LIBDIR	= /usr/share/pep
  MANEXT	= 1
--MANDIR	= /local/man/man$(MANEXT)
+-MANDIR	= $(HOME)/man/man$(MANEXT)
 +MANDIR	= /usr/share/man/man$(MANEXT)
  TODAY	= 19950811
  CLOCK	= 0200
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index a5320f2d7272..27ea8d3bc0a7 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="General purpose filter and file cleaning program"
 HOMEPAGE="http://hannemyr.com/enjoy/pep.html"
-SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip"
+SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index bf5dfcc6533a..1710a1d4033c 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -5,6 +5,7 @@ DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47
 EBUILD scdoc-1.3.1.ebuild 1031 BLAKE2B 3da18d09700584dc4c3365ea66c06bdcc5e8363e5dd3ca44a0c36a2237abe6ec444a760ed0ee288e522d6c4ea1994f8c9dc0db09a6b3bb07005f8cc9c379915d SHA512 2a943adf9b0ecac43499c55f74ab56fb0f5cc59d74bb43862726ff4da4aa9a765c09cc8b4ff1de28cae3de0d7856634de65027c83577a61c91c2b222fa6f14cc
 EBUILD scdoc-1.5.2.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 EBUILD scdoc-1.8.1.ebuild 1109 BLAKE2B 9e0265584e2e9dca427d2ecd419a0ab72e723f88d4cb88be78e0ad5266a48534930d848c35a7542d8de89a12c91b7d279002c5d2b6a9550358666737fe191838 SHA512 5fbf573577f5e489e8361c8fc03594a1a4a0c38371e2df40af7178e0bbcc5b4bc78ce01c88e35326c6c66142a491bfb40a25b6be2e6373d10bd382e048bc3e68
+EBUILD scdoc-1.9.3-r1.ebuild 1154 BLAKE2B abebdc143dcf69209b591b14a752348481cb53887a3bce20c9e2b3c56645be2022c407e9ea7f06bcbdd3d7a3765aa0abe255a5891c903b3d259370af639eb93d SHA512 6e74ce420930fb3996d53fa105c845adc07103b8dc131b69cd09fcea9e2bafbdbd9cfaf6fbe47ce4491f05a6284198916160dc0375f4aa60846390adb5e2ac86
 EBUILD scdoc-1.9.3.ebuild 1109 BLAKE2B 9e0265584e2e9dca427d2ecd419a0ab72e723f88d4cb88be78e0ad5266a48534930d848c35a7542d8de89a12c91b7d279002c5d2b6a9550358666737fe191838 SHA512 5fbf573577f5e489e8361c8fc03594a1a4a0c38371e2df40af7178e0bbcc5b4bc78ce01c88e35326c6c66142a491bfb40a25b6be2e6373d10bd382e048bc3e68
 EBUILD scdoc-9999.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 MISC metadata.xml 444 BLAKE2B fe48dd13d534bacc09205bd073b4052e2f5afca50eedea53236f7d2d2f31f4f876fe0b4dcb57eb8a87b4090fffb5f924ed57b9a636453be7c2bb586cc4d1a142 SHA512 3a172b03f1768baf0bb940bd842f7e6c05762e79bb1d8632bdbf86276e79cda7f1b334750a3650cc86106154a8b2e2e426c7ab99d41cc5bf5119ac1e81e7b5fc
diff --git a/app-text/scdoc/scdoc-1.9.3-r1.ebuild b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..119be54bf057
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+	inherit git-r3
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' \
+		-i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+	local MY_HS="./scdoc"
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		MY_HS="./hostscdoc"
+		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+	fi
+	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
+}
diff --git a/app-text/unac/Manifest b/app-text/unac/Manifest
index 806f826a4096..7c53695d62f6 100644
--- a/app-text/unac/Manifest
+++ b/app-text/unac/Manifest
@@ -2,4 +2,4 @@ AUX unac-1.8.0-automake-1.13.1.patch 950 BLAKE2B 41be5811b494475d0927f6dc8a3581a
 AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1454 BLAKE2B af02bd996b41651305b7f958adf87a0901be40b39312951ddfec4b0c973fa95626de115ed33d0ac609a3ef8b1f97e8673fad3c5d6ef09ac5f2744ef415c8609b SHA512 40294181f611a047c25900235d35b231e4026ff0a2759f90e3b74b0b93c97f64162803bcdfa4041652fe39421291248d189046f7e993d0a88606f4e240d04b7e
 DIST unac_1.8.0.orig.tar.gz 281807 BLAKE2B 1c566d75eef70b37cc6e8d4840d5712783ec01e2cf6ed5dc39a10b5da2af2c35928b62a1e6592bae1bb21682c3a0410582158661b4989f0ecbea80220bd256d9 SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8
 EBUILD unac-1.8.0.ebuild 1147 BLAKE2B b5c373eff732bd4533b6067caccf6ed1a47cf6e8b3a5af1d46a80ae983c30364ffdadbf5e4798a3d9953963faf2c6f8ab502e4635a1c3495c5853d524ed5caa4 SHA512 43c2ee5eb87b078d087b5f711ad5d8e4265b5dabd28f67ec47c727cfe292c5501d7f0bd2c548d8346bd5a8f52ca9a3ee34b6aa6a7f33103301130dd7d1bbf3b4
-MISC metadata.xml 252 BLAKE2B baab35383a82c344682e5dea4a051cfa3bae507232a5db1ea982f775b85375ce854c0c647c93072eb24d23f5f592405c33c8ea233726fba9f0611aff20b93863 SHA512 4f60eeb0614b560f69085d664d02d29833e1d7a9d0975b3d6b09945df857b97b9a827b73808b1ac354b77367f22035765949ea8bc696193cb08f9bf71176a032
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/unac/metadata.xml b/app-text/unac/metadata.xml
index 477cc0e0a286..6f49eba8f496 100644
--- a/app-text/unac/metadata.xml
+++ b/app-text/unac/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index c123987e4ecb..d796c7737dcc 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,11 +1,13 @@
 DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
 DIST xapian-omega-1.4.10.tar.xz 532952 BLAKE2B dec0ebc7b4de24d6f11ea91f090925c0a2dd088ec6468e47e1ea6e60f31acd99d8480f47275df597a508b51c3d2046ce89cd1c8f10e19ff4ad4ce5e593e25852 SHA512 53dde1705eea39fa26afd4db6a0ab39e050ecd1ffc71d2e4c2a2287930d926993c48c36d0c2ad6268188a29876bac1f0e3c29fc54afd2fb6f831899929ebb302
+DIST xapian-omega-1.4.11.tar.xz 533596 BLAKE2B 5002f809a310cfff8b7316c6d1f7fa17f93fd88381aa5ca5de14a443f2b3bfd7f00738bae7b2e3a739a170bd8f454e82f696212fc43282d342946a774b7bfaa0 SHA512 135077e26dc0b0707d1d14c64eeb25db67374b1b7909e9f3e925b10e03b1557263339d2f84c5a82046a159e58a5301834e76e99843d66342666d5694f91ed4f3
 DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
 DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f833384ba7ca53aa7e8affef77d71bc74602476ef7c6a8b11b67a60e0ff2e007e0d4da38020ddcac9d7ac7f2df4774d9 SHA512 3e784691c7de807a2eb9c00c97e03cfb7e66686d54e0ee572facad7bcfbdcc2c7aba4b60996bc56657a5ecabc79984e838b9d207cf6f1b7df1df90c108d17d1d
 EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B 28e33f851cccd463daf6ff3e92c980d4c3421cd5272504c6e6dafed1dc859a60d361ebb8e89a2b62b2cd86416760a1d91f9f0c83eda7396705af45c487c88a4a SHA512 769048855d948fdfcfb06cc37d1790712fda232b800b74a8b347617140d1e0ce4dcbb8f9e47d40f39342a694201a592c3446411c92989c840e0b6305e11f1169
 EBUILD xapian-omega-1.4.10.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
+EBUILD xapian-omega-1.4.11.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.5.ebuild 1152 BLAKE2B 1cdca6a87ec353a468a65a7dc5df903e452128c8df66930d3b7eb651963d211305962cf5b415dca9a56475ff782c4693aa34cd2a91e4d2a444e6a1d2f00b5144 SHA512 540c43a135aaab12509e155b188e17f768d0b9c50a4170f39a29d815532aea4c66c24c65af270c7b906321527f4795a06d325d87b0b67f51600a0da488408944
 EBUILD xapian-omega-1.4.7.ebuild 1151 BLAKE2B 60e49c563df5f5df9b3b29a4ad0aec64c56b045b3bb0f6ac4691d34d46342ae8504a2da8910562cd6dfdd5068b097a9e0d0217c517968f1db9fee114275297c3 SHA512 bd6cc0b52a785d6d205d4faebe6f8dd620623a9c4305da606238bef4026279d6e5c3490c3f398ce51e4fedbf91cb2fd65a1efca8943f8e3ad4ebba829c6e1bf6
 EBUILD xapian-omega-1.4.8.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
diff --git a/app-text/xapian-omega/xapian-omega-1.4.11.ebuild b/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
new file mode 100644
index 000000000000..4a7e3ffd806d
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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/30
+	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
+
+	# 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/xchm/Manifest b/app-text/xchm/Manifest
index 345cb03d164d..c8b35cf16d66 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -2,6 +2,8 @@ AUX xchm-1.23-wx3.0-compat.patch 929 BLAKE2B 87f22da40033007e071ff3c1ca497247027
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
+DIST xchm-1.26.tar.gz 785338 BLAKE2B b5aedff3de1a3c79205f27b833e339fa24ac08710ab2c97199fdd10f5674ee7d4a4689e275d9f6df4b6eb34c60cf2d36c5938924c4c0d73e37c2a464a1c63695 SHA512 8ed0281a2b2969f83d474b89e828545096b4ad9ece451cff2bdb602079751f6f6ca2c8f3c8cd79740ab0b4e5b2c3a3f8ce4e6f4985dc158b5d76007b7bc549a3
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
 EBUILD xchm-1.23-r2.ebuild 1066 BLAKE2B a195970c160cc7216b1b4eacf079e33f8ed4391ac630eadd49fe60953858804dfe3003af5f4b493d9863bb1ec9750d05be2c30ffdbd8eae5900ab00011b094b7 SHA512 25d23d01ea964f0a924544d90b422dfba200ffb528c4ef0c1f2ef866df857936bc324969711b6de2ec5c609709b26c8b4ca9c9da94be84d7cd85127ca8f35cfb
+EBUILD xchm-1.26.ebuild 1022 BLAKE2B cc9f00fa40103bfd9792f081b7e425d9250dbe29c6188bd428fd2ee65cceeaba6a087680476f898a4e23051abeefb210a8406d2ccb81530a4f5e2bc7a80e669e SHA512 e533a82a1be1e78a3f30882abfbb1723a0328b662f81afd36490154d29a54e82cf928a9ca4a2bc9a5a74dd478a2554b9b3ac4e9cfb274e5e14b2f66f7e0d6c63
 MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/xchm-1.26.ebuild b/app-text/xchm/xchm-1.26.ebuild
new file mode 100644
index 000000000000..a2c546cdaf3c
--- /dev/null
+++ b/app-text/xchm/xchm-1.26.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	>=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	setup-wxwidgets
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 23938b370a22..e37614b713e4 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,5 @@
 DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
 EBUILD xmldiff-0.6.10-r2.ebuild 522 BLAKE2B 6d012cfec8f200441be4e5e27e9cbd4ca927843b46a5b8d24108440663d619c36b1f4bf11f256bd7c8478e88a9b01805d12c112cbba2a82fb96887aec40d9265 SHA512 b16ceed0a37b133b1f61b9e47529bd61469bc933ad99218f5d3a345baa6bfb2d4908754bcce5691be68085ace23f3049bc1ae12b855073f33bddce20620fc879
-EBUILD xmldiff-1.1.1.ebuild 638 BLAKE2B da0d6c42b55a78254d9af9d3ecd9b8187179fe7564cedc18824ddc3df70f4842b7dc8f35867551413f2a9f663851c0d254b359f848c94b4601bd6452a7cc5bd2 SHA512 34054f13beb1726721d2ce69c72d5194113ed8231bfd54e6fd6814eb2a53a576ed100cff80d94c9aabba7841a66ba2b6e7a91621077a636792f537a936b33c5e
+EBUILD xmldiff-1.1.1.ebuild 635 BLAKE2B 95d793609115d7bd924496d50c70fc22d14a9c5ee3668f7c147b88834d793119e532b81a908d6972f8b44f786e24a747d1e2a41c66e0d921996493166e10396c SHA512 feafc245d98fc9def49d31e38d4ed80d431e9a3daca68eefbaf0d8f63ae29e0f9b8fccb6b03653fccd11885ace9c65bdb8fc351dbfabd0e2283f3496427e0624
 MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
index 803d641601fe..3407e9f0a3e6 100644
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ b/app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ia64 ppc sparc ~x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/future
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 12947b98e102..798429198607 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -4,5 +4,5 @@ DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529e
 EBUILD xournal-0.4.8-r1.ebuild 1202 BLAKE2B 7bd649419efc8c130d88e90303f7b1946a907c8737b1dde4cc5aaf3798e3fc54e7459dbb70abf4fc0539245b710f5b5e8f8a9f125452cd2e0a6d4109532c8c39 SHA512 f872b8b3c4b00a265ab0fc74f33f895c1fbfd676d39df4ebe2a1c2d5282b3265d13f741067ce6f417cc03f437db7e10768693bd9de758ec9b5ffc6d920d300e0
 EBUILD xournal-0.4.8.2016.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb
 EBUILD xournal-0.4.8.ebuild 1069 BLAKE2B 26606ab4d9128be573c91e33025270ed832f71c9b8d6b27cb1fe80defa11936d3ea8d2643376e691aa365d5140e287cad109be3019de6bcf8f02baadbc45a168 SHA512 7f74070413631ace102df1bb34cc06023d17eb35a6da2e5fce6c09914e6afff101e49eff7cfdfcfb9afc7699b4345e07c7d3ad7c575685269d7050e136769eb6
-EBUILD xournal-9999.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb
+EBUILD xournal-9999.ebuild 998 BLAKE2B b040d45de8ab96b168607a97e249a5e92aec2b7e8a2f95f098ddd63c912e33e90679566fec6cbf03ae4b95d5b039ee7ee65d0249cc35303ff68e0b864cd77d54 SHA512 d45e91904ccc3f71297a79ae9dc2308b7cbc38b574d55dc3483789bb3320dcbcf2267a298dbd5f1c368698caf8750b32f6bae4ed887f5a9f6fd7debf6693f5d9
 MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 50477f8a4537..5afafb130f7e 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ HOMEPAGE="http://xournal.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+pdf vanilla"
+IUSE="+pdf"
 
 COMMONDEPEND="
 	app-text/poppler[cairo]
@@ -43,17 +43,9 @@ DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default_src_prepare
-	if ! use vanilla; then
-		eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
-	fi
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	emake DESTDIR="${D}" desktop-install
 
-	dodoc ChangeLog AUTHORS README
 	dodoc -r html-doc/*
 }
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
new file mode 100644
index 000000000000..2f0c05725970
--- /dev/null
+++ b/app-text/xpdf/Manifest
@@ -0,0 +1,17 @@
+AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21fccf60d5f2db959a7a2e2e64eb36cc7cbc0aea7e1cd21bdc6a11cb0ae7ae43e9293164ba5ef88685aa1653 SHA512 8bdeafe1553fea67b6d30afd1eb6e6abbd57f470a79b982b2b545fc91f12bc00c34a1639a05e8ef589ce1518886cc8de45c54303c4528c7e3d721ff624a0d27e
+AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c
+AUX xpdf-visibility.patch 414 BLAKE2B 835bdfdbb39297859d1886a5ebd76bec23a8b8df744f627a475d8c00ae3cdcfe219ec039f00b7b6a7305e6c451399c422fafdea0599bf22d2ef34bd4912eae4c SHA512 a1f87523aeb657484181005b3e40a90eaaee2d00452bfc50bc23913d6e1e5a9117600959b3800e789be50f6d12d726f875caf02b73ec41dc9d98e1215b2e964e
+DIST xpdf-4.01.tar.gz 891150 BLAKE2B 6280bf9d4c17894a22e63d3fdbe3c67679657121196f84964c1353cb2f09348c38de327f7a6259831afb2ff748340c94196eec11b24a442c6e76dbc170d62ac7 SHA512 327d8bcf1f30a0fdbbdc33e2262d4e7de44f28a0f42cc87bbee6b2a8059d8cca8ffa715f7e810f9b53deb690bf9744ae5e8cf86a101941b8103100ded89e36e6
+DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
+DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34 SHA512 1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
+DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc SHA512 6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
+DIST xpdf-cyrillic.tar.gz 1656 BLAKE2B 454b9a276106d61481fdb8da934ac0de50b86a99d882e27bc9e1cf09a03ae2156909df405de78413e0ac3b529af479b2fbdf5978cc1022cee25c50df6ef21f0e SHA512 ab1197c90f8cd3d8664ebbdc7ecefdfb8ec12e24da2f7616cad1d5bc9c7fd172c48db6a18d76172de8342377acc8e1dcd78bcf0fb1ef9f05cf94729e90586827
+DIST xpdf-greek.tar.gz 1259 BLAKE2B f9f695b55c48ee2956ccab1ba9c7ae5bcb2df0669efcb8e111c6100f957238ae73b18589e40dece8b0c38212f00a52c1dc381cc5efcca7c97fe261d72470bb6f SHA512 2e0e281e09e1abc2f0e40b6787703538d52cb62edcd4c4156698700a5f908afee290c62ad9a6ff4ea74bc42e0a8fe9a7765a212efbc223512d4bb442448ea52f
+DIST xpdf-hebrew.tar.gz 1317 BLAKE2B bfd5bddc250c1ae1e01fe68f1a4caa649d2a443d3c39565b5209d07f32d46e3474e6823f243b08ab6088e4686cb79e58fce5c9a3de271a77c6b1713fa58b1000 SHA512 0ebe652f8633151d13ef2403bd293682b511ab86c1391ce187f1fc0274f33bd9c7e6ec682c8f79ac4fd27c74ab81ad2ae334a75f26001092521cff9a73cd0b8a
+DIST xpdf-japanese.tar.gz 1011166 BLAKE2B 67c2e8045214462737aa2332aa6ddba35581866e22bece5c166aa3fa808da0dddae11b7e9bcfe50f00087b74f1e7694ac8e407268cdefcab1fe60163eb3bdf70 SHA512 0d7b6e4c31caae1ec49d43f108d2dacc76fa84b79e9794d2d0071f33d7fadfacd533f0da1d5bcac3ec1c0757dbd6be4279acac1d148620e1d89d7a9af0966a08
+DIST xpdf-korean.tar.gz 526847 BLAKE2B e1640f6df0bc1e126b2e0f010403fc3ff068a8171d31cc616dfaff43170acfa69ff5dc0ac732d346d6aa9b2b21549b21e11f98f5038050b5075ee7fff8a93444 SHA512 871a9de0e40d7ef9fb42bb2d90558875f5b84962d7f811d5a18f4b68fadbe7c34e2c18c660a160c9ed9539adc22684985f296c77af2ed3bf604d9989bdcb3d1d
+DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
+DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
+DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
+EBUILD xpdf-4.0.1.ebuild 3038 BLAKE2B 28561bb40f52285d6c4cab731624e87dff10694d4b8abbc435ac3648f275acafdf9fced9440e3c94fc1e9ca022dec86fc269535d5f25009ce09698911252053c SHA512 3ace4b1baab1a0fbb70b7bcf8874a2a3c1593ab0a9d46d018a7b2235964a2757673cc000b5729f0d8a0402f41ecb8fcb0f663f414d81c2f66f7a7b34e2ddd838
+MISC metadata.xml 899 BLAKE2B ec3658537d667032b6f725c70c6ad41dbaea8bf8a15e999bdc4d7ca2f2000542b1d6bf4f247c4d050b0c9ccf11c8a7abd385c496091facd2038b7e55be3783d4 SHA512 7be89c30dfb1644aebf07794f2fb0f26abbf921d6185ce6fed9c0f5c802704e5fc6cff9d9a1f8e59a0e6bdf27548f34eef3b8b130296c93b492d0110aa16e359
diff --git a/app-text/xpdf/files/xpdf-automagic.patch b/app-text/xpdf/files/xpdf-automagic.patch
new file mode 100644
index 000000000000..4c35ca8916ff
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-automagic.patch
@@ -0,0 +1,36 @@
+--- xpdf-4.01.orig/cmake-config.txt	2019-02-18 21:24:19.000000000 +0300
++++ xpdf-4.01/cmake-config.txt	2019-03-10 20:59:59.769610445 +0300
+@@ -93,6 +93,10 @@
+   option(XPDFWIDGET_PRINTING "include printing support in XpdfWidget" ON)
+ endif ()
+ 
++#--- disable lib dep automagick ---
++option(WITH_LIBPAPER "Enable libpaper support for getting paper size preferences" ON)
++option(WITH_LIBPNG "Enable png support via libpng" ON)
++
+ #--- check for various library functions
+ check_function_exists(mkstemp HAVE_MKSTEMP)
+ check_function_exists(mkstemps HAVE_MKSTEMPS)
+@@ -182,7 +186,9 @@
+ find_package(ZLIB)
+ 
+ #--- look for libpng
++if (WITH_LIBPNG)
+ find_package(PNG)
++endif ()
+ 
+ 
+ 
+@@ -239,10 +245,12 @@
+ endif()
+ 
+ #--- look for libpaper
++if (WITH_LIBPAPER)
+ find_library(PAPER_LIBRARY
+              NAMES paper libpaper
+              PATH_SUFFIXES lib64 lib
+ )
++endif ()
+ if (PAPER_LIBRARY)
+   set(HAVE_PAPER_H TRUE)
+ else ()
diff --git a/app-text/xpdf/files/xpdf-shared-libs.patch b/app-text/xpdf/files/xpdf-shared-libs.patch
new file mode 100644
index 000000000000..c8aafa8405db
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-shared-libs.patch
@@ -0,0 +1,54 @@
+diff '--color=auto' -Naurd xpdf-4.01.orig/cmake-config.txt xpdf-4.01/cmake-config.txt
+--- xpdf-4.01.orig/cmake-config.txt	2019-03-10 21:32:18.000000000 +0300
++++ xpdf-4.01/cmake-config.txt	2019-03-11 09:03:37.025125528 +0300
+@@ -12,6 +12,9 @@
+ include(CheckCXXSourceCompiles)
+ include(GNUInstallDirs)
+ 
++set(XPDF_LIBDIR ${CMAKE_INSTALL_LIBDIR}/xpdf)
++set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/xpdf)
++
+ enable_language(CXX)
+ 
+ #--- set default C/C++ compiler flags for Unix
+diff '--color=auto' -Naurd xpdf-4.01.orig/fofi/CMakeLists.txt xpdf-4.01/fofi/CMakeLists.txt
+--- xpdf-4.01.orig/fofi/CMakeLists.txt	2019-03-10 21:32:19.000000000 +0300
++++ xpdf-4.01/fofi/CMakeLists.txt	2019-03-11 09:04:16.257526539 +0300
+@@ -24,3 +24,6 @@
+ add_library(fofi
+   $<TARGET_OBJECTS:fofi_objs>
+ )
++
++set_target_properties(fofi_objs PROPERTIES COMPILE_FLAGS "-fPIC")
++install(TARGETS fofi LIBRARY DESTINATION ${XPDF_LIBDIR})
+diff '--color=auto' -Naurd xpdf-4.01.orig/goo/CMakeLists.txt xpdf-4.01/goo/CMakeLists.txt
+--- xpdf-4.01.orig/goo/CMakeLists.txt	2019-03-11 09:03:04.000000000 +0300
++++ xpdf-4.01/goo/CMakeLists.txt	2019-03-11 09:02:51.638793035 +0300
+@@ -25,3 +25,6 @@
+ add_library(goo
+   $<TARGET_OBJECTS:goo_objs>
+ )
++
++set_target_properties(goo_objs PROPERTIES COMPILE_FLAGS "-fPIC")
++install(TARGETS goo LIBRARY DESTINATION ${XPDF_LIBDIR})
+diff '--color=auto' -Naurd xpdf-4.01.orig/splash/CMakeLists.txt xpdf-4.01/splash/CMakeLists.txt
+--- xpdf-4.01.orig/splash/CMakeLists.txt	2019-03-10 21:32:19.000000000 +0300
++++ xpdf-4.01/splash/CMakeLists.txt	2019-03-11 09:04:48.885028391 +0300
+@@ -44,4 +44,7 @@
+   add_library(splash
+     $<TARGET_OBJECTS:splash_objs>
+   )
++
++  set_target_properties(splash_objs PROPERTIES COMPILE_FLAGS "-fPIC")
++  install(TARGETS splash LIBRARY DESTINATION ${XPDF_LIBDIR})
+ endif ()
+--- xpdf-4.01.orig/xpdf-qt/CMakeLists.txt	2019-02-18 21:24:19.000000000 +0300
++++ xpdf-4.01/xpdf-qt/CMakeLists.txt	2019-03-11 17:29:55.445451783 +0300
+@@ -93,6 +93,7 @@
+   else ()
+     set_property(TARGET xpdf PROPERTY Qt5_NO_LINK_QTMAIN ON)
+   endif ()
++  set_property(TARGET xpdf PROPERTY INSTALL_RPATH "")
+ 
+   install(TARGETS xpdf RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+   install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
diff --git a/app-text/xpdf/files/xpdf-visibility.patch b/app-text/xpdf/files/xpdf-visibility.patch
new file mode 100644
index 000000000000..9eab57b4a3ff
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-visibility.patch
@@ -0,0 +1,11 @@
+--- xpdf-4.01/goo/GString.h.orig	2019-02-18 21:24:19.000000000 +0300
++++ xpdf-4.01/goo/GString.h	2019-03-10 20:16:48.257102840 +0300
+@@ -39,7 +39,7 @@
+ 
+   // Copy a string.
+   GString(GString *str);
+-  GString *copy() { return new GString(this); }
++  __attribute__ ((visibility ("default"))) GString *copy() { return new GString(this); }
+ 
+   // Concatenate two strings.
+   GString(GString *str1, GString *str2);
diff --git a/app-text/xpdf/metadata.xml b/app-text/xpdf/metadata.xml
new file mode 100644
index 000000000000..aab31e840b14
--- /dev/null
+++ b/app-text/xpdf/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <use>
+    <flag name="cmyk">Include support for CMYK rasterization</flag>
+    <flag name="i18n">Enable support non-UTF8 national charsets</flag>
+    <flag name="libpaper">Use <pkg>app-text/libpaper</pkg> to get paper preferences</flag>
+    <flag name="metric">Use A4 instead of US Letter paper size by default for PostScript output. This option has effect only if libpaper USE flag is disabled</flag>
+    <flag name="opi">Include support for OPI (Open Prepress Interface) comments</flag>
+    <flag name="textselect">Allow text selection</flag>
+    <flag name="utils">Install command-line PDF converters and various utilities</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/xpdf/xpdf-4.0.1.ebuild b/app-text/xpdf/xpdf-4.0.1.ebuild
new file mode 100644
index 000000000000..1a243e175e9e
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.0.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_P=${PN}-$(ver_rs 2 "")
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com"
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${MY_P}.tar.gz
+	i18n? (
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
+		https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
+	)"
+
+LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
+
+DEPEND="
+	cups? (
+		dev-qt/qtprintsupport:5
+		net-print/cups
+	)
+	libpaper? ( app-text/libpaper )
+	utils? ( png? ( media-libs/libpng:0 ) )
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/freetype
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	media-fonts/urw-fonts
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-automagic.patch
+	"${FILESDIR}"/${PN}-visibility.patch
+	"${FILESDIR}"/${PN}-shared-libs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		"s|/usr/local/etc|${EPREFIX}/etc|;
+		 s|/usr/local|${EPREFIX}/usr|" \
+		doc/sample-xpdfrc || die
+
+	if use i18n; then
+		sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DA4_PAPER=$(usex metric)
+		-DNO_TEXT_SELECT=$(usex textselect off on)
+		-DOPI_SUPPORT=$(usex opi)
+		-DSPLASH_CMYK=$(usex cmyk)
+		-DWITH_LIBPAPER=$(usex libpaper)
+		-DWITH_LIBPNG=$(usex png)
+		-DXPDFWIDGET_PRINTING=$(usex cups)
+		-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /etc
+	newins doc/sample-xpdfrc xpdfrc
+
+	local d i
+	if use utils; then
+		for d in "bin" "share/man/man1"; do
+			pushd "${ED}/usr/${d}" || die
+			for i in pdf*; do
+				mv "${i}" "x${i}" || die
+			done
+			popd || die
+		done
+
+		einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
+		einfo "with other packages"
+	else
+		rm -rf "${ED}"/usr/bin/pdf* \
+			   "${ED}"/usr/share/man/man1/pdf* \
+			   "${ED}"/usr/$(get_libdir) || die
+	fi
+
+	if use i18n; then
+		for i in arabic chinese-simplified chinese-traditional cyrillic greek \
+				 hebrew japanese korean latin2 thai turkish; do
+			insinto "/usr/share/xpdf/${i}"
+			doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
+				! -name README ! -name add-to-xpdfrc || die)
+
+			cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
+		done
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /app-text
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)