gentoo resync : 03.11.2019

10 files changed, 188 insertions, 40 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index c3cda933c4a1..ed1b19e869a3 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/autobook/Manifest b/app-doc/autobook/Manifest
index 6442091aa4f3..84efa733634e 100644
--- a/app-doc/autobook/Manifest
+++ b/app-doc/autobook/Manifest
@@ -3,5 +3,5 @@ DIST convenience-2.0.tar.gz 1771 BLAKE2B b840a0cfd717fb8e8449bf260b491702b54986d
 DIST foonly-2.0.tar.gz 1211 BLAKE2B 363b346a547a7a4980cbd25b28ef5b93923655f4f1f7af8c718608e12d890cf7d8cf8d9ec01e5fe0a7eb39557cae02d5993b332f2d27b7c381b184e95fcc2bcf SHA512 fba2bf9fdcea37781f72d6fa2dd78811874d67ee8cc7d6145e69ae1d9ef5117747303cad049235111629f0f73139464326144b6d3b6a7f1d416e2401dc53a528
 DIST hello-2.0.tar.gz 1278 BLAKE2B 7278948882f2316ed67590db9b55419c578d623bfc92292571f8032800e9a5c2610215907b3ad4c6f63f4d792f2ddca00173485e6fd79cc5ef32f43e5333dd9d SHA512 9f38671f3d96998b410006c70758773a89f5e38149a4fcfc818cb57b4767e87d24d82ac24d7ef6d084197dc87b06044722dad138a9a57c0781052a8e44a0b67b
 DIST small-2.0.tar.gz 21912 BLAKE2B 1fb87e05e047e7477d931b5ee1f90bba6873109db2d88962466d97c12900ba10ce09bd597b407c48554b179fbca812c7321366bb769f7836cfc56ae0a8c550af SHA512 2fb689bc7b35ae0f1a4b71cd78012cbe1a87f0392da1c1b6321123fe0e3acae53d189ab31ab2038f6e9f6c69d5fad20381212ec6f2b37b837ddbd770e8ab8dde
-EBUILD autobook-1.5.ebuild 834 BLAKE2B a27e514fb82c9c395a6d44696edca4b783176cd664bf4022c1d5202b35be73d9584b3fa21e55c748cd8b101165561b7fea1528b7c622b062509c6fafac33091d SHA512 cde8fc09841a2e79227cb43fa0716a1dbfc0ce601f78dac8914f82ffff516c828dace67f142017ae61bc8c857bf57394dde1ceb6f609f8f11df68ed9070c4f48
+EBUILD autobook-1.5.ebuild 697 BLAKE2B 0eda911f8cca16a1160af7ad16a25d4777d0167b5e0fc85aa8a110f934842ee4d6165a2f64917cdb50a87936804435db269e5747efb911814f8aed23507f2170 SHA512 7f63a7f1b1dad91d89fc8588b388ac4c79a1d8a95a8b8ce7a4ec8257d5b81151d7758807b451626609f1fdab55b4c0f8fc3f220dc1e397be4d8dde86c25d7923
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/app-doc/autobook/autobook-1.5.ebuild b/app-doc/autobook/autobook-1.5.ebuild
index 30c31ea61eaa..5d6cf8494750 100644
--- a/app-doc/autobook/autobook-1.5.ebuild
+++ b/app-doc/autobook/autobook-1.5.ebuild
@@ -1,33 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="GNU Autoconf, Automake and Libtool"
 HOMEPAGE="https://sourceware.org/autobook/"
-SRC_URI="https://sourceware.org/autobook/${P}.tar.gz
-	examples? (
-		https://sourceware.org/autobook/foonly-2.0.tar.gz
-		https://sourceware.org/autobook/small-2.0.tar.gz
-		https://sourceware.org/autobook/hello-2.0.tar.gz
-		https://sourceware.org/autobook/convenience-2.0.tar.gz
-	)"
+SRC_URI="
+	https://sourceware.org/autobook/${P}.tar.gz
+	https://sourceware.org/autobook/foonly-2.0.tar.gz
+	https://sourceware.org/autobook/small-2.0.tar.gz
+	https://sourceware.org/autobook/hello-2.0.tar.gz
+	https://sourceware.org/autobook/convenience-2.0.tar.gz"
 
 LICENSE="OPL"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ia64 m68k ppc s390 sh x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
 
 src_install() {
-	dohtml * || die
-	if use examples ; then
-		local d
-		for d in {convenience,foonly,hello,small}-2.0 ; do
-			insinto /usr/share/doc/${PF}/${d}
-			doins -r "${WORKDIR}"/${d}/* || die "doins ${d} failed"
-		done
-	fi
+	local HTML_DOCS=( . )
+	einstalldocs
+
+	local d
+	for d in {convenience,foonly,hello,small}-2.0; do
+		dodoc -r "${WORKDIR}"/${d}
+	done
 }
diff --git a/app-doc/blas-docs/Manifest b/app-doc/blas-docs/Manifest
index c199700da967..30e9efa543ad 100644
--- a/app-doc/blas-docs/Manifest
+++ b/app-doc/blas-docs/Manifest
@@ -1,5 +1,5 @@
 DIST blas-report.ps 1874460 BLAKE2B 3bbef21663dd4642c74110356b828fc4d84cf1d70afe10ac6d0c7117cb133b0f6005f9787e6a49040247d485f409511c214990b336177380f631c567ef1eb92c SHA512 90346f29fadb6304afd4e1b6c170fc71008f9ffa750d49256feb3d37e9ba646e5120ee6e3cbfa8f10c7916119591b240c72ec747f8135bf6581539365838b044
 DIST blasqr.ps 235163 BLAKE2B cf9d03453690d4b25ba0f77741cec1f57dcfbb1be81ece8a940dc06539526d31f79a56179e7e33e3c0725c7ffc125779d6a2293cc2550dd8628eddac9a0a71e3 SHA512 8795864bd250abc4e7ba396b35277554e7226161133d57206dd4d843d265632d3a4977386412547d620d0091013add0ae156182fa5cac20a2272f1cb17915289
 DIST lapack-man-3.1.1.tgz 1117350 BLAKE2B 3c1dfa55efdc1a2e11315885d853354060d04f3beab701d0dd9574e67ba9b34ec762c23b6275812a6849fbac0141c7a5fa56a86d4a340caeab5c001bc274392e SHA512 3dca890ec618f8c87de137760bd072a8664afc21d9f73e8b04b8bf1e4fd50f0796f11c9327f10ca34e3169fd55bbe8007da044580713428652eaa2c3dc25982a
-EBUILD blas-docs-3.1.1.ebuild 885 BLAKE2B 66227e681e2685ef017117da24b55a058b97d64cef99aeda36261e53db655fa9ca407d6630fc5e2879bb757965415f09519a980b123f414303fdbee9233e20d8 SHA512 722a9e983428e141971dcdf1e49a875603b101a2a25a95eb0a25b77d259241b582abd0d40031bdb52d93a158a7c488b33b9f686999a47c3a5efbf8f9d0c889cf
+EBUILD blas-docs-3.1.1.ebuild 788 BLAKE2B 77ce72b02adff8830c616471f0380550eec2e937e0226ea41f8900787475bd41a7c12f5704aaa35d006d42a01a72383c673f220fdcb599c5e27f9e3619dceb7e SHA512 014fc8f6ad136476713b7f4dc9d290a2ee919fd556435532b12ed030d46db2bdb5b40762eb58ec1e97784094476f1ef2b305a6fa67bdf7c1ccab0fed2456babc
 MISC metadata.xml 714 BLAKE2B 2d6bafd3860626c883522e2c9d246070e427f19ebe7be1841cb8d78d2e681404e2caf5a07a0bb7f82b8992ecc8a86b7dccc01983fcf6d38bd0758581f164c3d6 SHA512 5bd0b57c069e14559e39b6e693df0218d2620a04169bddb5be98af3ae1e963e7c9f0fc325f27113997853c3bed8f2e5018b5c5081d479f0239f204ee14049161
diff --git a/app-doc/blas-docs/blas-docs-3.1.1.ebuild b/app-doc/blas-docs/blas-docs-3.1.1.ebuild
index d034c041c602..899fd9c1c857 100644
--- a/app-doc/blas-docs/blas-docs-3.1.1.ebuild
+++ b/app-doc/blas-docs/blas-docs-3.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Documentation reference and man pages for blas implementations"
 HOMEPAGE="http://www.netlib.org/blas"
@@ -17,13 +17,13 @@ IUSE=""
 S=${WORKDIR}/lapack-${PV}/manpages
 
 src_install() {
-	# rename because doman do not yet understand manl files
-	# Not all systems have the rename command, like say FreeBSD
-	local f= t=
+	# rename because doman does not yet understand manl files
+	local f t
 	for f in blas/man/manl/*.l; do
 		t="${f%%.l}.n"
-		mv "${f}" "${t}"
+		mv "${f}" "${t}" || die
 	done
-	doman blas/man/manl/*.n || die "doman failed"
-	dodoc README "${DISTDIR}"/blas{-report,qr}.ps || die "dodoc failed"
+
+	doman blas/man/manl/*.n
+	dodoc README "${DISTDIR}"/blas{-report,qr}.ps
 }
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 5ac1d76a7f9f..14ec49f926fc 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -3,11 +3,14 @@ AUX doxygen-1.8.14-llvm7.patch 858 BLAKE2B aec2e43c92460e4ff90f3ef9c275a40861b56
 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-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
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.16.ebuild b/app-doc/doxygen/doxygen-1.8.16.ebuild
new file mode 100644
index 000000000000..33dcae697291
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.16.ebuild
@@ -0,0 +1,135 @@
+# 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="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"
+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.16-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.8.15-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/files/doxygen-1.8.16-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch
new file mode 100644
index 000000000000..c3c49e6b5e7c
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch
@@ -0,0 +1,16 @@
+diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
+index 6ae71a6..e03ea7c 100644
+--- a/addon/doxywizard/CMakeLists.txt
++++ b/addon/doxywizard/CMakeLists.txt
+@@ -104,9 +104,9 @@ doxywizard.rc
+ )
+ 
+ if(Qt5Core_FOUND)
+-  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version)
++  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread)
+ else()
+-  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version)
++  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread)
+ endif()
+ 
+ install(TARGETS doxywizard DESTINATION bin)
diff --git a/app-doc/lapack-docs/Manifest b/app-doc/lapack-docs/Manifest
index 447d79adfd2b..00e25adc6277 100644
--- a/app-doc/lapack-docs/Manifest
+++ b/app-doc/lapack-docs/Manifest
@@ -1,4 +1,4 @@
 DIST lapack-man-3.1.1.tgz 1117350 BLAKE2B 3c1dfa55efdc1a2e11315885d853354060d04f3beab701d0dd9574e67ba9b34ec762c23b6275812a6849fbac0141c7a5fa56a86d4a340caeab5c001bc274392e SHA512 3dca890ec618f8c87de137760bd072a8664afc21d9f73e8b04b8bf1e4fd50f0796f11c9327f10ca34e3169fd55bbe8007da044580713428652eaa2c3dc25982a
 DIST lapackqref.ps 72345 BLAKE2B b5c4b7c7d7dae50f622ce06015ca5230a33f880eabba9e8c2b6e27999d51055b6a5b7bae3f7634c1e9313ffb9ffd3cf542b1d68229ae215f51984798cec0b1dc SHA512 b5177910f988002f9b9bc4e735c457b6e65e57e0f4860e237e82e038bd77ef2071d2251b41677374742219dcd0162cd0a92dfba9801279a4b8bb6aa5bdbf0820
-EBUILD lapack-docs-3.1.1.ebuild 885 BLAKE2B 1970fef5d44ab3f382ddae1cf6813d0fe12f21d122357412af924004dea934c62bc690abd793789871ec33a3638fd27730af8b9aaba75dfa8111fbd9c121e8ee SHA512 bd05b48f31cd824a61f0b41115d0dabcc3fd787b58de6526fd1ace518a628e7b6514c6fe3299ccb3fa97df12c62269df12e5463fd67639b36732e49809281c09
+EBUILD lapack-docs-3.1.1.ebuild 791 BLAKE2B 72f1ee7dd274ee7b64694515d8cb5d8cf47bd65b83063ef9f45eb82ee8b6b036192ba9762d4bf6861550ce1b4255f4c631f6c7f71ad04a98fee5d5927558c08f SHA512 37940b1ae6cfd1d4405d819d7063bdd484443f8b324466ba1071aa664787f811ba08d9df31b7e27a169d071a90e6d1a375ed414467c2c267709c0406f13cd3bd
 MISC metadata.xml 702 BLAKE2B 7cb262e5264e6abb4bbdd39cbef6630b2a5a6f8952cd90877260b5218e155197a94d76868ee494a9cae8c639edd33b3fc1b5c1f6de3cfe92e47b4387085a6868 SHA512 d30c03608c227a94b578a235243946be928a26cdbbb873eeb8cf019dec6940c2d8c6dabc341018481ccc8eeccf0d82447c058de43e354e19fc984b78569703df
diff --git a/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild b/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
index 9d017eec92d0..0789a1733c20 100644
--- a/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
+++ b/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Documentation reference and man pages for lapack implementations"
 HOMEPAGE="http://www.netlib.org/lapack"
@@ -16,16 +16,16 @@ IUSE=""
 S="${WORKDIR}/lapack-${PV}/manpages"
 
 src_install() {
-	# These belong to the blas-docs
-	rm -f man/manl/{lsame,xerbla}.*
+	# These belong to blas-docs
+	rm -f man/manl/{lsame,xerbla}.* || die
 
-	# rename because doman do not yet understand manl files
-	# Not all systems have the rename command, like say FreeBSD
-	local f= t=
+	# rename because doman does not yet understand manl files
+	local f t
 	for f in man/manl/*.l; do
 		t="${f%%.l}.n"
-		mv "${f}" "${t}"
+		mv "${f}" "${t}" || die
 	done
-	doman man/manl/* || die "doman failed"
-	dodoc README "${DISTDIR}"/lapackqref.ps || die "dodoc failed"
+
+	doman man/manl/*
+	dodoc README "${DISTDIR}"/lapackqref.ps
 }