gentoo resync : 15.12.2019

29 files changed, 269 insertions, 382 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 53d93d083b46..a05dee4edc22 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 14ec49f926fc..88090c9efb17 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,16 +1,14 @@
 AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831
-AUX doxygen-1.8.14-llvm7.patch 858 BLAKE2B aec2e43c92460e4ff90f3ef9c275a40861b5692f3b999bbe1ddf9eeae2e7a75751582e513e9ba2a2ca6f06f50bccc6c939ec211a879111961abb09882bb8e12d SHA512 c43e295cf7b31e7bd4374c105a9f41622dfeca6326de85a9ba62cbe0907cd7526a8393afbea380c5c662235b09aba1460f0b50a9d9cbc86fe0c9830c9dd1ca10
 AUX doxygen-1.8.14-xml-c++.patch 1064 BLAKE2B f75ead2f58b1dee3854061cb2554a5e9387b6f2d205bd2f8b231124281dd3b91b0f79cfb3059a02a56a579ebc68e4b8194755187c4a4ff7a582b2d11d72cadb7 SHA512 08f2e27a689fed08221ff3c4897be1054f5cf9be50cd131e48d6c05d4b3e87d1ffe2233193dba0667108977bb50ccd76694e6e66b92c625c286f1e34e5d3322a
 AUX doxygen-1.8.15-link_with_pthread.patch 1119 BLAKE2B 3c4dbb0440134d96e7879f4d18869eeffb06a43726dd6ce0441fc1f4bc4664088ebc185f38c1685adf3ddcff1de45a9a0b11e38206c9592c42cb7d45c2ba3f60 SHA512 fc7623892cdfc0fd93a9470ed7c29723b53f690618d86bdb9d4afd387af7dccd36c8b6a54b86d46c464a7960aa557570589e874cbd0ad825a379493143610e77
 AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de759b8f162d1ff2b6cee2c3b5097894c7ed2d14454e0051cfe707aa26605a0551da7ff1e69a608e171ce22adb5b7c SHA512 9dced7f1399a12a4e943f3d3353c771033e66eec11d102483909f16ffe2fded2e766362059a20198e325755f01751d419c5dccdb2f5a5c807bb7b4d3b73cd0bf
+AUX doxygen-1.8.16-fix-external-tag-files-with-TOC.patch 1968 BLAKE2B 739a9ace2ca96be8b696e7ac24f5ec1303e26f6f02250d5cb8eb26bbf41931905c976ceafd732daedf8260d1e19b4a056a779d984712bcc966c45d8a942ca151 SHA512 a0055694b216a89ccccdc763d02be92fd582f2230bd600062c8043afaca199502a2764eb19570ca0af4db4d43040d4f77e1ed5d5ff006d45747941c654f734ea
+AUX doxygen-1.8.16-ghostscript-compatilibility.patch 2046 BLAKE2B 5d2016db1ff06329347ad653537f00c9e5d0de74cbf07c9b1b988b24f140f7a5db136a6dde2fd1ee4cfa935d99cfc81196bc4ede8d32ae6a0b9b37c87b04c547 SHA512 398db683a53059a051b1a123567e870d9f46fb637716b3665af2fadfbd69de3297f4df5beeb7ed4faa38ef762775b7de0aea91fc00abb938059af693ff8cf75a
 AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39a90747d886e0841103a27d105fc40242fbb5dd289a3ff640203fe1d97bb51fdd559bb94dfddf4e2364d4bc630d861c75ff079f0 SHA512 5b23cc35faf571229b9ff7f1dd4745ade10d5ef0935d1ac9455e0036517ec3e038aacd1a565604f1621aa2c42584240939269777321993b02645334ca7dd18fa
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
-DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
 DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
 DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de
-EBUILD doxygen-1.8.14-r1.ebuild 3165 BLAKE2B efc851483f1c382b00264ff513f6cdd2bfdcc8161f3541033ec34f088e4184a802f6217d8a3de16de1a684701766e2ca00d207143415efa85db42c4088dded9e SHA512 74e4263e2f92b30b5c0ba64732384fd67341fc265d80e3cd30c6091c0de7bdd63d16ddb43b7f63b4cc04b88e723d28db8d3815a141532593aea1fa1609284fea
-EBUILD doxygen-1.8.14-r2.ebuild 3240 BLAKE2B 9fed7b65e3b67fcca8dab697b39519a08643cab5f66a16b4bb170265f224d6a4596ee0f03174306e21b1a5090bde7f6caf952776e111e0a70c0e7c36d9fb2d11 SHA512 b62d83fdc8c8ad7a641cc57e2b72e0217c24ad48c0589161fa1279ff32282c3b4548cd3a4bbd3dffa167305ef63b628dd6ff9f3ee428b99ef4e58ee07df9caee
 EBUILD doxygen-1.8.15.ebuild 3214 BLAKE2B b17b7878cb94114ad0d837f3f0f17d2e84acf41e719999af0085a7e852abc00a01f33d6248185ea01cce6dc38297c0ff23a6ce9744c98e6a34d9b4f829526463 SHA512 ae014c865a584a5cc2970449d4fc1916a73c385fe2b2bf7a3d62728c14acda1544cee9989b9d617cc19e8dfc1352285238493d8c33bc45bb60404559a0b0ea17
-EBUILD doxygen-1.8.16.ebuild 3161 BLAKE2B b15332fa3e1ed94714641681b852e8081a9fb7829931be9cc241d41556a361da7de6819005d2f089f0826a9aa2dc5391919f8bd54fcc2e93971cc040737d9809 SHA512 96f16e98bdb78a0d928246dd09d2c18b158c56ebda086bc15902f68e83588058dae9817d258a510c078d33482ef8b9eee36d05488a212fe67ae695a17f962ef7
-EBUILD doxygen-9999.ebuild 3102 BLAKE2B 2e4c2a1534357bdc7ca8e892a67675744bfe85b4e8b2a17c60782e249081e744d8d41019ccb02478acd6a9528cf430b1b1ee8ef007828fdc421e3bcc398e8df5 SHA512 bd23806a0e93f2563c5823c31b36a2f9a6acb71f1f89c7698b045f5d2e1f900ebbc4d552ecf03488e2131df01f4d24f8923e5cff75eb067c2875f41b13e4d8c9
+EBUILD doxygen-1.8.16-r1.ebuild 3361 BLAKE2B b3fd6794ec3aef3ece7f11f0538516ed1bc9456368c56d4cdec4b9c14cecd70b9355dab44fa0b821b24534e886c58030ec54a6bd5f7c3f0f7da5956bb1fdbd73 SHA512 1d01e4655b3b8d295940012e522763879409613261d4dc85d6c93e6f3e224cdd8ed486dcb2fd0612d6efe035869b8ce1cc544dcca52697a2505b692d30a61937
+EBUILD doxygen-9999.ebuild 3089 BLAKE2B 4d54af408a2139c7eb6c2817bc4cc734ed11b1c67d604a031bcd56660eecee09757a87656712fe463f58700f0612978fc00c5062cb1f69aa6b8bf491ad51c23a SHA512 4266ff4fa55be20ec18654d3469800c317150eb834d7a91c78f1815c1b8b25f1dc37345a23e510c3c6ded9d84224f29e32f65a405925179f25f6e033a7b73ec4
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
deleted file mode 100644
index de853a4a2b3a..000000000000
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-4.0.0:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	latex? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
deleted file mode 100644
index f374b46eae52..000000000000
--- a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-4.0.0:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	latex? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692
-	"${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.8.16.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
index 33dcae697291..9083e95a8ea1 100644
--- a/app-doc/doxygen/doxygen-1.8.16.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
@@ -11,9 +11,10 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 	SRC_URI=""
+	KEYWORDS="amd64 ia64 sparc x86"
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
@@ -62,6 +63,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
 	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
 	"${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
+	"${FILESDIR}/${PN}-1.8.16-ghostscript-compatilibility.patch" #695710
+	"${FILESDIR}/${PN}-1.8.16-fix-external-tag-files-with-TOC.patch" #701930
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )
@@ -107,6 +110,7 @@ src_configure() {
 		-Dbuild_search=$(usex doxysearch)
 		-Dbuild_wizard=$(usex qt5)
 		-Duse_sqlite3=$(usex sqlite)
+		-DGIT_EXECUTABLE="false"
 		)
 	use doc && mycmakeargs+=(
 		-DDOC_INSTALL_DIR="share/doc/${P}"
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index ba29bb09a4ab..776ebc3469f0 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -13,9 +13,8 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/doxygen/doxygen/archive/Release_${PV//\./_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-	S="${WORKDIR}/${PN}-Release_${PV//\./_}"
+	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
@@ -34,7 +33,7 @@ RDEPEND="app-text/ghostscript-gpl
 		media-gfx/graphviz
 		media-libs/freetype
 	)
-	doxysearch? ( dev-libs/xapian )
+	doxysearch? ( dev-libs/xapian:= )
 	latex? (
 		dev-texlive/texlive-bibtexextra
 		dev-texlive/texlive-fontsextra
@@ -104,6 +103,7 @@ src_configure() {
 		-Dbuild_search=$(usex doxysearch)
 		-Dbuild_wizard=$(usex qt5)
 		-Duse_sqlite3=$(usex sqlite)
+		-DGIT_EXECUTABLE="false"
 		)
 	use doc && mycmakeargs+=(
 		-DDOC_INSTALL_DIR="share/doc/${P}"
diff --git a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
deleted file mode 100644
index 86e6d7999418..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5c55efae..1ad32b2e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -262,7 +262,7 @@ if (use_libclang)
-     add_definitions(${LLVM_DEFINITIONS})
-     llvm_map_components_to_libnames(llvm_libs support core option)
-     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
--    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
-+    set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
- endif()
- 
- target_link_libraries(doxygen
-diff --git a/src/clangparser.cpp b/src/clangparser.cpp
-index 77151d6e..2ea15ee2 100644
---- a/src/clangparser.cpp
-+++ b/src/clangparser.cpp
-@@ -4,6 +4,7 @@
- 
- #if USE_LIBCLANG
- #include <clang-c/Index.h>
-+#include "clang/Tooling/CompilationDatabase.h"
- #include "clang/Tooling/Tooling.h"
- #include <qfileinfo.h>
- #include <stdlib.h>
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch b/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
new file mode 100644
index 000000000000..cc0704b440f6
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
@@ -0,0 +1,50 @@
+From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Mon, 9 Sep 2019 13:28:28 +0200
+Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
+ broken index.qhp
+
+Ignore automatically generated anchor names when importing a tag file.
+
+Upstream: https://github.com/doxygen/doxygen/pull/7250
+---
+ src/tagreader.cpp | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/tagreader.cpp b/src/tagreader.cpp
+index 56dbe7df9..d79d9b5c5 100644
+--- a/src/tagreader.cpp
++++ b/src/tagreader.cpp
+@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
+ 
+     void endDocAnchor()
+     {
++      // Check whether or not the tag is automatically generate, in that case ignore the tag.
++      switch(m_state)
++      {
++        case InClass:
++        case InFile:
++        case InNamespace:
++        case InGroup:
++        case InPage:
++        case InMember:
++        case InPackage:
++        case InDir:
++          if (QString(m_curString).startsWith("autotoc_md")) return;
++          break;
++        default:
++          warn("Unexpected tag 'docanchor' found");
++          return;
++      }
+       switch(m_state)
+       {
+         case InClass:     m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
+@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
+         case InMember:    m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
+         case InPackage:   m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
+         case InDir:       m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
+-        default:   warn("Unexpected tag 'docanchor' found"); break; 
++        default:   warn("Unexpected tag 'docanchor' found"); break;  // Not really necessary anymore
+       }
+     }
+ 
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch b/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
new file mode 100644
index 000000000000..55445fa19dc4
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
@@ -0,0 +1,39 @@
+From f08e87623368134c6541af12995b811ef9aff069 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Tue, 12 Nov 2019 11:42:22 +0100
+Subject: [PATCH] issue #7290 error: Problem running ghostscript gs -q -g562x56
+ -r384x384x -sDEVICE=ppmraw -sOutputFile=_form0.pnm -dNOPAUSE -dBATCH --
+ _form0.ps. Check your installation!
+
+@maehr had a talk with Robin Watts and Ken Sharp at IRC and there seem to be basically 3 different problems:
+* `-r%dx%d` (the dimension for `r` shouldn't be `-r384x384x`, but `-r384x384`),
+* misuse / unnecessary use of `--` and
+* since 9.50 the command needs more control access (that might be worked around by either whitelisting the file via `--permit-file-read=_form0.eps` (only works from 9.50 and upwards) or generally accepting any file with `-dNOSAFER` (works since quite some time). The second option is considered to be unsafe if we would process any file, but in this case we process self produced / controlled files. I don't know if doxygen has any threat model that it assumes. ).
+
+> Ken Sharp: Yeah the %dx is wrong, as Robin says its sheer luck that works
+the -- isn't needed and is what's causing the first problem
+and file control is the new bugbear
+
+The suggestions have been implemented and test / docs works now with old and new version.
+---
+ src/formula.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/formula.cpp b/src/formula.cpp
+index 534f56ac..3d8e6ce1 100644
+--- a/src/formula.cpp
++++ b/src/formula.cpp
+@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
+       // used.  
+ 
+       char gsArgs[4096];
+-      sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
+-                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
++      sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
++                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
+                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
+                     formBase.data(),formBase.data()
+              );
+-- 
+2.24.1
+
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 922c9a82f084..be7668d8a8f4 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,4 +1,4 @@
-DIST eclass-manpages-20190908.tar.xz 416412 BLAKE2B 12d2b8c90349993510b3b0b462c3158090751e31abba013557595688136519a83bacc58ab4a26e3ed398aa0cb1647e4fa4fec412cce02f48007c4cf2a7c91121 SHA512 6d99114fd754bc9f84c90fcd485cde38772b506e960c2db61025ce3ceb3258c37f6d0e1be13bcc198b875969551c98e19da3f2c09b04efda0be5f4509b006089
-EBUILD eclass-manpages-20190908.ebuild 623 BLAKE2B 660313f5ce0bb957736d4e1c3724af8dbd023ef033c3090b84d30e1400bf5908dde4b4654da86e26fd002aa1fd7442a5d17571927d1831728e64446b5e8a5b56 SHA512 538e4a951965b395d6d8e26d855758dfc74fd5728fd55c1a4302df1471fee63058c712e45abcbdab5879cb49e0f17ea19c04854a970c8a0e08b83f2ca07eaf36
-EBUILD eclass-manpages-99999999.ebuild 741 BLAKE2B fa5b83c9ca6f95e93d20bbf09a867125de252cb28ffc3c3ccdd9e751c8c445cc889a2cfd668602c034835b754c14de2a2fc008d2409654431ccd6ba54dd68f09 SHA512 1e25d06a5ea9273515ba04b7e2f0a27c69143b7b63e97bc9edd8c51707e9794adf668a4b7339628885ceb6d44934ba11e7e9d017a000e53d70b4755a1c793b56
+DIST eclass-manpages-20191215.tar.xz 419924 BLAKE2B f179fa2380952383231dfe5af995da8f92531d942518f5d0c8a9e43fc4a664096f2830fbe37ca5b000886e50528756dc06f092644143731d29c68d77d0c25891 SHA512 61da27edef5fdda692448b352ebc7488b928029ec018097b2813763558e56f1c135ccf358f4a6d6df856a3632109e8d3045ec7e997eeab0e99d65d0aa66faa42
+EBUILD eclass-manpages-20191215.ebuild 610 BLAKE2B adc253a5ece36c84252067e3cfef8bd99e3344e605ca18ec4eff13f0dd2dc7ff0b8ce05d1c63b5b7e77cb0a4fd18a79617d997cd87f5074d7f2112dea5ed1130 SHA512 7da57b815429d315f042c10d924d6acd130a201712bc84e224cfbdaffb30bfca7e1ee0beeca425ba4aaccbca3ae4168397ad472f3a8a4679f40a697ecf25962b
+EBUILD eclass-manpages-99999999.ebuild 734 BLAKE2B 3a2ad31d9607eb9eca6c26a9bdfc7ef076f03bbd72cd9df1c7affbb834a66fd682986a9596af9c1d4d1f3ba2af090d18915403b9028dba6a4c927a8e8e0ebdd3 SHA512 10d89fd7527b870b9bfe35b70be14de0c1f1a0ba5deb7a0e86e8965bf963d04a41fdfb2907bcb5aef0974ef6508e2717c9de383e28f9679dcb1dc87c60530199
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild b/app-doc/eclass-manpages/eclass-manpages-20191215.ebuild
index 58f19de074cd..d13816cc3830 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20191215.ebuild
@@ -5,14 +5,14 @@ EAPI="7"
 
 DESCRIPTION="Collection of Gentoo eclass manpages"
 HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/eclass-manpages/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stable. No need to change to ~arch.
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 
-DEPEND="app-arch/xz-utils
+BDEPEND="app-arch/xz-utils
 	sys-apps/gawk"
 
 src_install() {
diff --git a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
index a810a8713bcd..7b5da48dfdf2 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -14,9 +14,8 @@ EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-DEPEND="sys-apps/gawk"
+BDEPEND="sys-apps/gawk"
 
 src_unpack() {
 	git-r3_fetch
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 0d4800d02299..8a3771b9ccf0 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,3 +1,5 @@
+DIST gimp-help-2.10.0.tar.bz2 187092180 BLAKE2B 29a7fbe3fcb6f3210aeda4bc514d7e0eeca05f9fabd3b9022c7ed1e5a9432876cc3bf530632648e2eb50509add4e387106d9705a1c17469e33496daec737d21b SHA512 2f6d5e7cf0c3b4960c92074ef02d51a1d089c148f6453a66e453a3084cdede280f72c6b77d35f66777adbda8aa273ec2a472fb538142e51bb263c3077eec473a
 DIST gimp-help-2.8.2.tar.bz2 158504580 BLAKE2B d0023a4290879f97e3365f1208427997d1facc09a7ed4ac0a274615e9eff378c9a4da0d7c5190bc24ad27c2b03d6c513003297d835562b0fa3e02685443d15e9 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67
+EBUILD gimp-help-2.10.0.ebuild 577 BLAKE2B 59d5af348baebaa1d1383d497a43ef2123fd365273dde58fcdbb3e17a5426151c31e0069ac014e1f6c48c3499c665146334ec74d7e1e411c3ef0e3e80a25aca4 SHA512 c7e715d37dbd277bc0d3eb4638664e76073273f783916ad057535bdf2ce772092ef29ba96e431153db3db8e06e4e33fb15e3f3763621aff1a67a00e235892ea3
 EBUILD gimp-help-2.8.2.ebuild 628 BLAKE2B 6c4b1302e795c7d7cf2d3dc6c67f30e24851eec41051b204ff4bfa7cb7499f82854582f18ff3de4b7e7efce2b285ace5918ba6f667cb6bd8696777f58914553a SHA512 b33677844bdce6407c97dff9dbe363ff0bd8ebfaec0a8c4165134d7fad1d49594e47fcc4efb32d4bce9e37d674d08d5e94f6db0025536e50315e8b70e8849ed6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
diff --git a/app-doc/gimp-help/gimp-help-2.10.0.ebuild b/app-doc/gimp-help/gimp-help-2.10.0.ebuild
new file mode 100644
index 000000000000..7041b5998ba7
--- /dev/null
+++ b/app-doc/gimp-help/gimp-help-2.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1
+
+DESCRIPTION="GNU Image Manipulation Program help files"
+HOMEPAGE="https://docs.gimp.org/"
+SRC_URI="mirror://gimp/help/${P}.tar.bz2"
+
+LICENSE="FDL-1.2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+
+DEPEND="$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
+	dev-libs/libxslt
+"
+
+src_configure() {
+	econf --without-gimp
+}
diff --git a/app-doc/gimp-help/metadata.xml b/app-doc/gimp-help/metadata.xml
index 6f49eba8f496..e7e7a5da0ad0 100644
--- a/app-doc/gimp-help/metadata.xml
+++ b/app-doc/gimp-help/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>torokhov-s-a@yandex.ru</email>
+		<name>Sergey Torokhov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index c3f25248ff1f..b15d15575f3a 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -7,7 +7,7 @@ DIST gnucash-docs-3.7.tar.gz 70634602 BLAKE2B bee0b328ab36409055ac4f681d4b09ff5e
 EBUILD gnucash-docs-3.2-r2.ebuild 1347 BLAKE2B c6e0b8869682edb5bb8af7d2e18c83ee7cf42f2e99590cb5f5474a369f7a9040ecc301dda70ec3e2e46a2c39322d681484a00abc5f73d4bd5dfe6eb4ed3cca65 SHA512 44bd23ae64ed96efc0b2c7d3b0547cd8a8f02250bde1d8579b118f403c2e9b831703f5651b396ddf0868df9f3500229f29d18ee394504f02424a2c5c5eddefe2
 EBUILD gnucash-docs-3.3-r1.ebuild 1348 BLAKE2B 8f8ba12abedf43cc5d26ec871ce017778cde7532d791eb902f8c084da980015accc6a04f301f4fbfe6201cd114743c0f35a88c42796ff59ea3a30a7960399e02 SHA512 ec36f57e7f890e0f9a3ba1ed760218b1108ecad611c98f89cc427d744ceb8567c0d8818da9d1a4d468ca60357e494d7e83d91797e647ac15b4a79fb0c19b5808
 EBUILD gnucash-docs-3.4-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
-EBUILD gnucash-docs-3.5-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
+EBUILD gnucash-docs-3.5-r1.ebuild 1347 BLAKE2B c6e0b8869682edb5bb8af7d2e18c83ee7cf42f2e99590cb5f5474a369f7a9040ecc301dda70ec3e2e46a2c39322d681484a00abc5f73d4bd5dfe6eb4ed3cca65 SHA512 44bd23ae64ed96efc0b2c7d3b0547cd8a8f02250bde1d8579b118f403c2e9b831703f5651b396ddf0868df9f3500229f29d18ee394504f02424a2c5c5eddefe2
 EBUILD gnucash-docs-3.6-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
 EBUILD gnucash-docs-3.7.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
 MISC metadata.xml 330 BLAKE2B 17393892e962f0d868534c6908a6f6f09c4237cfdf81530b81e572f0fdac64495378d545ca214afc451a6323b97c71328aa1c6a8eda81773cb1d77c358e11bd1 SHA512 fa496247f2026343323b8ff8664fb8018316ebcbf14b88b1c99a649805cefe962d773c4d2aa35b266db2942b78d1fc450f200dc065fac48ebfb2113b5d6e8a98
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
index 505a73b78785..4582197df338 100644
--- a/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 LOCALES=( de it ja pt ru )
 IUSE="${LOCALES[*]/#/l10n_}"
 
diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index 984a1ba81a03..c147661528b3 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -1,5 +1,5 @@
 DIST halibut-1.1.tar.gz 956743 BLAKE2B ba96e2847d57fd6736e7d3a3245527045fe0765c6fbcc857d3af1daf4d249ac81b5442d0ff1c9a00a153b970d83dbab59ab9430ff6cd53d7164cd7aeb4441c22 SHA512 01b0563ebb3678dc1ff1cef1d752d5ebffed70ef73a10d8266d84da3b4401006b686104bbe3e1984ebd3a54254f16d008011b3be8c29a3b9f1e3a033d61cdb15
 DIST halibut-1.2.tar.gz 991975 BLAKE2B e5751d2f90968240825e3ddadbc070de856f6a340e832bcf0977fb8d31f7b7c8eefa776f3bba4df58641d22cca7e9ac562eef236069e1d9a8e9cdb41324a7376 SHA512 b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc
-EBUILD halibut-1.1.ebuild 732 BLAKE2B c72880cf39116571de0b822b1f43ef29c67cf07acf7f7f6248829c419bc32a37bfb50a02f5bcc7c031ac2c4911a822b33b1a64750f97421e823504f4a86f6f7e SHA512 81fafe93dc2f2ac96d28ced8de7e4dbaf1538d7b4c00293cb54cf2de00f30a4f4ac62adbf163465b2432391ace355ec0e8ebb66c01e5988aec3794a0ef34d1ec
-EBUILD halibut-1.2.ebuild 899 BLAKE2B 76e85c125209441b09c03f8d14a12d80d2e3119bf4ffcfc90d299e8fbfcbbdd25d2c31753ff371ff2bde9df0b193ac4f64c37911f28912a9734dab2acd289474 SHA512 2c5f82e652f5533ce75806b6b54de43ef2bd145582287e917aa96f32b852c9f3ffe027ce11e19916d0ed0fc49adc6f82c6d789c8d4f4f370ab772db6820f110d
+EBUILD halibut-1.1.ebuild 665 BLAKE2B 8507499b6f4279423a56b4947d15fc4f3ff2980cc27627a05fbb3c16b172ea0926f0716f308ba152367d39e1f1dd473cbfca1e549a451e4d058d30fa132d4459 SHA512 65d94c72c620267775fd55ce0d17652c1eccc83501df919b8591cd5b7a36e182f124b2332f075afddc3128b3f3fe40c80ee0af6a4dbea98f5293a2a363cf7739
+EBUILD halibut-1.2.ebuild 850 BLAKE2B 7b224fda43aef3ced94758cc7cb7262925b19d19e109fe51c72f629401bd8aa518f42fe8279f12048fba57197503503898d6cb6dc7d116bf6e5e050d85e63898 SHA512 d1e38ef45fc876a9484b8cc005f77c98a72db671b4c35aebd5392268817e0d7f4f798f321f4a5113273a6763beb262d2fdde4e11739ce05f6d86c2874ee5d4f4
 MISC metadata.xml 248 BLAKE2B 098d4976304542e71e494b46eb846b1ddc3f761a0e1eb4477c68fb0270bfd195de3fa8da7de3cf5a86d33442d7f1fc30fded9f56346e784edfbb969387d62eb5 SHA512 5a0cba98b94cc06306b0e352d40ff113de69408752b14e1ba9efdce3f564c9bd11f8f65e89fc24d2e2056056edef5b77ab1ca8aa33e7faad5d0eaef40b895c85
diff --git a/app-doc/halibut/halibut-1.1.ebuild b/app-doc/halibut/halibut-1.1.ebuild
index 9b4f6966032f..e5cc35e2aa70 100644
--- a/app-doc/halibut/halibut-1.1.ebuild
+++ b/app-doc/halibut/halibut-1.1.ebuild
@@ -20,15 +20,14 @@ src_compile() {
 	LFLAGS="${LDFLAGS}" \
 	emake -j1 \
 		BUILDDIR="${S}/build" \
-		VERSION="${PV}" \
-		|| die "make failed"
+		VERSION="${PV}"
 
-	emake -C doc || die "make in doc failed"
+	emake -C doc
 }
 
 src_install() {
-	dobin build/halibut || die
-	doman doc/halibut.1 || die
+	dobin build/halibut
+	doman doc/halibut.1
 	dodoc doc/halibut.txt
 	dohtml doc/*.html
 }
diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild
index 81ec54f31f0c..13c64206e3f6 100644
--- a/app-doc/halibut/halibut-1.2.ebuild
+++ b/app-doc/halibut/halibut-1.2.ebuild
@@ -21,8 +21,8 @@ src_compile() {
 	LFLAGS="${LDFLAGS}" \
 	BUILDDIR="${S}/build" \
 	VERSION="${PV}" \
-	emake || die "make failed"
-	emake -C doc || die "make in doc failed"
+	emake
+	emake -C doc
 }
 
 DOCS=( doc/halibut.txt )
diff --git a/app-doc/pms-bin/Manifest b/app-doc/pms-bin/Manifest
new file mode 100644
index 000000000000..8d75abe6e401
--- /dev/null
+++ b/app-doc/pms-bin/Manifest
@@ -0,0 +1,5 @@
+DIST pms-5-prebuilt.tar.xz 540244 BLAKE2B 06fbfd4cbf9968fbe19d1960687f226c87b2a16df8b9c3c80328c9436d886b1888484b0cd636f3d5ce492578e8a3e7c1a42be5cf7f8072c71fa401f817125d33 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451
+DIST pms-7_p20180430-prebuilt.tar.xz 593500 BLAKE2B e59882b215492424b351242f31b90cc3aa457f7e4630c5b15fe8bc18fd8722764371868f3a44bd7226f4d00c5a8d9c12829d934cda715e575b4c949631c4ad02 SHA512 e27527e4ea1fa16f7c069267bec136521e7be621bd49701920d11e79e4a5645ca8da06aa41c4adaa1813c0f4abce8248e4274d7ec0ae04f6a8479107b0578c4f
+EBUILD pms-bin-5_p20120920.ebuild 845 BLAKE2B 6c9311919cec0bfe1d014518d0da61f5902e37c11463bdee52870301463d4a704a9a99388b0e497f924c6beb0e9cedf5c02d5ae7d544cc8fbde899463c370257 SHA512 54afe3bd6aba83e33cb878e017a06ccfb67bf25f9a97b8f1aafa5a08869f81a8b9af0b50c09d9fc57592ed88db47e12a1fc326c96a73b4a75df27af887ef9273
+EBUILD pms-bin-7_p20180430.ebuild 820 BLAKE2B 2d860f87958980cad83f7e644583266fb75de5eaa62c04297aa662c3d3c94a78c10310d94e14d68af00f7a87018f1dd50d1ae0321129b005066f1f2db2c43646 SHA512 33dfe759e70cc263753462fdfddac82646bc4fad21a3f685e1850784bef3afda2fef48880b77c5b42e695c1641c6a113c585e5c1b10c3b947fb5e4a85aa2b033
+MISC metadata.xml 350 BLAKE2B 553458dec69cbe0a67c6294fb07520ab808057dd1ffa50ba3efb80fd552f8e85e3e8ada9873ae1db9d22a02854e1f6c532846d2fb9ad979e2359bab73c9a57d4 SHA512 7a5908f87c1875f3a70332a3c3b607c1baa94eb68fe8dd10dfe46cceed9ddff3bbf17057f0b5837cbab5ce474b89a2d30c890553016983ef742b771ffd746010
diff --git a/app-doc/pms-bin/metadata.xml b/app-doc/pms-bin/metadata.xml
new file mode 100644
index 000000000000..44a2ea92c99c
--- /dev/null
+++ b/app-doc/pms-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>pms@gentoo.org</email>
+  <name>Package Manager Specification</name>
+</maintainer>
+<stabilize-allarches/>
+<use>
+  <flag name="html">Install PMS as .html as well</flag>
+</use>
+</pkgmetadata>
diff --git a/app-doc/pms-bin/pms-bin-5_p20120920.ebuild b/app-doc/pms-bin/pms-bin-5_p20120920.ebuild
new file mode 100644
index 000000000000..a7116dc6f2d0
--- /dev/null
+++ b/app-doc/pms-bin/pms-bin-5_p20120920.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="pms-${PV%%_*}"
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${MY_P}-prebuilt.tar.xz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="${PV#*_p}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="html"
+
+RDEPEND="!app-doc/pms"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dodoc pms.pdf eapi-cheatsheet.pdf
+	if use html; then
+		docinto html
+		dodoc *.html pms.css
+		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+	fi
+}
diff --git a/app-doc/pms-bin/pms-bin-7_p20180430.ebuild b/app-doc/pms-bin/pms-bin-7_p20180430.ebuild
new file mode 100644
index 000000000000..cd22b28e239c
--- /dev/null
+++ b/app-doc/pms-bin/pms-bin-7_p20180430.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/pms-${PV}-prebuilt.tar.xz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="html"
+
+RDEPEND="!app-doc/pms"
+
+S="${WORKDIR}/pms-${PV}"
+
+src_install() {
+	dodoc pms.pdf eapi-cheatsheet.pdf
+	if use html; then
+		docinto html
+		dodoc *.html pms.css
+		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+	fi
+}
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 50d24ea72efc..f972977b3529 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,8 +1,6 @@
-DIST pms-5-prebuilt.tar.xz 540244 BLAKE2B 06fbfd4cbf9968fbe19d1960687f226c87b2a16df8b9c3c80328c9436d886b1888484b0cd636f3d5ce492578e8a3e7c1a42be5cf7f8072c71fa401f817125d33 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451
 DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
-DIST pms-7_p20180430-prebuilt.tar.xz 593500 BLAKE2B e59882b215492424b351242f31b90cc3aa457f7e4630c5b15fe8bc18fd8722764371868f3a44bd7226f4d00c5a8d9c12829d934cda715e575b4c949631c4ad02 SHA512 e27527e4ea1fa16f7c069267bec136521e7be621bd49701920d11e79e4a5645ca8da06aa41c4adaa1813c0f4abce8248e4274d7ec0ae04f6a8479107b0578c4f
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47
-EBUILD pms-5_p20120920.ebuild 1391 BLAKE2B f7ab4a9f55a227b1a229015479376c901f923d9bebd5aa778bc996b6f976d17bb00718b5681be22442576dace01b02c0d02914bf8527a447e8a2f0511cb27fc2 SHA512 5c82ac1bc1a186a6d645605578baa0785a61c61b389b6626c78d13573c11189216e7574fec05016ab07e6e07f04eb0480394a19b7d96490a5a0090314538165f
-EBUILD pms-7_p20180430-r1.ebuild 1638 BLAKE2B 8afb9f7254af036c5892bb712742c5e6c3b026ec33e1ec8df18dbf6cf0be531c586c721feef659bd625d63745371eca4ea81ced0fb9c1db7b6794b14b1d513af SHA512 d7f04448737f39651aaa80e2bf2b5378bcb7fbf73affc20bb06f847adbaffc6c252a5617846e1e12931c1bd42b79a13a3aaa966c978251ae4fa14793d5571a39
-EBUILD pms-9999.ebuild 1206 BLAKE2B a9df125c860fe83cf1be1b6332e37f61ef9155073550d18dababd6d001cb265a9cdc2d6752651ec3c4876a8ba2d67b14044c3bc2358610e6f5cfaa6d5b778805 SHA512 7a3f3d205415518f1adc703970b46cf646b7b92d9a3c6e10faeeb63ab343316c18078707526de13e7030c18b77f5964b57a81e33386483449d896e56ab71bc80
-MISC metadata.xml 518 BLAKE2B 370ddfa79e44e10c0234d0aafb89624181bf64ae7e90b89b678a8dcb518214f310bc9afc261d5069a8f07299b2194c3a831e1d2a9bcba8d97dd6ef0dc1369346 SHA512 e1079583ec59594d9c89dbbf68199aff7edb35112375e96a2f6ca28627f679ee46570f649a0723c296bd41d003dd91226e6b2805bc780baded00dc1ae72d24a2
+EBUILD pms-5_p20120920.ebuild 1261 BLAKE2B e9604857ada8e5594cfdf8296e93edac3e17f775bbe1b3995d4ddacbe3e5825853cf68a7ee45916ed9bfe41789147f717dc72fbdb2cdc93c4e8b5f9f4d4d2289 SHA512 bfb2951e7f6cc2c66e6983379ebb3d3baee6ba29550ed7b1eede85dd7dc4cc6709c1df4ee1c1293f3e70c25f18f0c771258aeba280762f7e54f4afd8c0653ebc
+EBUILD pms-7_p20180430-r1.ebuild 1440 BLAKE2B 24b98366bfed0e1c30caf05aa907d61c1d0c49a188e96348873e0e0b55a7e319e4943c91a8cf35d57607c57e0a29400baf9d05aa051048fd98da47e1a2b576be SHA512 ee450c55504b1aefdc766ae3adb37842f137472b910b10b0209ed2d8e568f25c66aa3453d6c742985c6f6cd3d00b26648662d1ec5e90834581b456d47df88e90
+EBUILD pms-9999.ebuild 1233 BLAKE2B 0a96671e313a3f2a725c0d5f436587f30cb39b08c1fdbf3d4d2737abec4f24ca0abe2b96a76330d907feb3e52974c201287b9759b216f1a9150d7fbf9b7aa21c SHA512 1d0aee888971bb84bbf98036d44783f5f013c06fc209fb15362e89d899a32b97a2982ba31016cbca33bea9b8752e3b8f2f131cea05bbb4221bf8ee9d3a2e98af
+MISC metadata.xml 439 BLAKE2B 3d5b7ec10330bc77a6234beb03de1400af3a295b88e9f2382c76232e2519c944b8b518923d93d2a474e1b96cbd6801458814704b12f0b993165e802bc1fb9b7c SHA512 aa8e7627fb52d1a5357b7758f4cbdb74cef129b3cc45f48a8c58973141e5cea65c0007333fb8e388fd99de8606d8ca137e03f906f5c6e75df68f6eb96099949d
diff --git a/app-doc/pms/metadata.xml b/app-doc/pms/metadata.xml
index 3e38fe6abb63..cdd2d5fbcfeb 100644
--- a/app-doc/pms/metadata.xml
+++ b/app-doc/pms/metadata.xml
@@ -7,9 +7,7 @@
 </maintainer>
 <stabilize-allarches/>
 <use>
-  <flag name="binary">Download pre-built files instead of building
-    from sources</flag>
-  <flag name="html">Generate PMS as .html as well</flag>
+  <flag name="html">Generate and install PMS as .html as well</flag>
   <flag name="twoside">Enable two-sided layout suitable for printing</flag>
 </use>
 </pkgmetadata>
diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
index ec756a31611a..8c738245eee8 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -1,42 +1,38 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P="${PN}-${PV%%_*}"
 DESCRIPTION="Gentoo Package Manager Specification"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
-SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz )
-	binary? ( https://dev.gentoo.org/~ulm/distfiles/${MY_P}-prebuilt.tar.xz )"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="${PV#*_p}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="binary html"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="html"
 
-DEPEND="!binary? (
-		dev-tex/leaflet
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-mathscience
-		html? (
-			app-text/recode
-			>=dev-tex/tex4ht-20090115_p0029
-		)
+BDEPEND="dev-tex/leaflet
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsrecommended
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathscience
+	html? (
+		app-text/recode
+		>=dev-tex/tex4ht-20090115_p0029
 	)"
+RDEPEND="!app-doc/pms-bin"
 
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	if ! use binary; then
-		# just in case; we shouldn't be generating any fonts
-		export VARTEXFONTS="${T}/fonts"
-		emake
-		use html && emake html
-	fi
+	# just in case; we shouldn't be generating any fonts
+	export VARTEXFONTS="${T}/fonts"
+	emake
+	use html && emake html
 }
 
 src_install() {
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r1.ebuild
index fbf885437186..bd1d7b478c8f 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r1.ebuild
@@ -5,41 +5,35 @@ EAPI=7
 
 DESCRIPTION="Gentoo Package Manager Specification"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
-SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
-	binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}-prebuilt.tar.xz )"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="binary html twoside"
+IUSE="html twoside"
 
 # texlive-bibtexextra: plainurl.bst
 # texlive-latexextra: chngcntr, isodate, marginnote, paralist, tocbibind
 # texlive-mathscience: algorithm, algorithmic
 # leaflet used by eapi-cheatsheet
-BDEPEND="!binary? (
-		dev-tex/leaflet
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-mathscience
-		html? (
-			app-text/recode
-			>=dev-tex/tex4ht-20090611_p1038-r5
-		)
+BDEPEND="dev-tex/leaflet
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsrecommended
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathscience
+	html? (
+		app-text/recode
+		>=dev-tex/tex4ht-20090611_p1038-r5
 	)"
+RDEPEND="!app-doc/pms-bin"
 
 src_compile() {
-	if ! use binary; then
-		# just in case; we shouldn't be generating any fonts
-		export VARTEXFONTS="${T}/fonts"
-		emake $(usex twoside TWOSIDE=yes "")
-		use html && emake html
-	else
-		use twoside && ewarn "USE=twoside is not supported with USE=binary"
-	fi
+	# just in case; we shouldn't be generating any fonts
+	export VARTEXFONTS="${T}/fonts"
+	emake $(usex twoside TWOSIDE=yes "")
+	use html && emake html
 }
 
 src_install() {
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 4de9727baee6..001aee4fd9fb 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -26,6 +26,7 @@ BDEPEND="dev-tex/leaflet
 	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-mathscience
 	html? ( >=dev-tex/tex4ht-20090611_p1038-r5 )"
+RDEPEND="!app-doc/pms-bin"
 
 src_compile() {
 	# just in case; we shouldn't be generating any fonts