gentoo resync : 09.06.2018

12 files changed, 23 insertions, 173 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 17b847394789..f55b8ca89ce6 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index c92a98bc1c7e..28bf70c622c2 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -4,8 +4,7 @@ AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc6079
 DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
 DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
-EBUILD doxygen-1.8.13-r1.ebuild 3744 BLAKE2B 30d92ffb3614533e52c0ad3944ffc214eaad5d68a04de15b25355db91433ac86e2af6d7237d3819513d9a21971944d0c216d6b0977426baa57fbc7d4ee52e727 SHA512 3e9289cc32c5beef3c5c1eef9be2bb18fa43748eeccf821d42514bfd5bff64e5a56c03ab8b91134e697a9091c83332ece3aa16153a401dbaaaab38d0d5fc5043
-EBUILD doxygen-1.8.13-r2.ebuild 3094 BLAKE2B 4e77532c8bf21831d310af27e1d0025ac6b6530fc4da374a36fa1d7cc061326b36c73805454dd8b2389acea09446a534ad8eae891adcae81c0cefb671241c114 SHA512 ee8eb067c38f8fa24ff5bd4b2fd6da04e4d5b60779ae2eb44d96333e35e18e594b17d81fee700bed68fbb3b125d5d59e8449600c023b3abefc8de9e01ea133f0
-EBUILD doxygen-1.8.14.ebuild 3051 BLAKE2B 1ae3e1b7519fbb144437162c57acef7e8dfa7a1de494ec79f35642316f4952e9e22ad1f708ea9acb17201f6e922abb496b85cb1e2e52affb05e4c72edf273298 SHA512 e8ccf14e86847880252d6384160a5f52fc2acde041daf2da116ec94c2b7a1828c25f2ed312976fd4df6a46a177842d11efaf4a60f35db0de6db5df6c6d255995
-EBUILD doxygen-9999.ebuild 3072 BLAKE2B 3c1ee0ed71e60b85f1f754c61adb91c013edfed7d66a1f45993003df30d4c6073feb540d4c78cc988bd7517583b22ffc773870baf1f108a107c372edea077bbf SHA512 5a046846eb2f7cc163f33b350c6bb1b26c8bf81109d015d9fb9deb32717f6e1ab94ca73488a99d0075f130bc4f91ea66e9b9ae82f6ecd8cccb505a0ad0b27be3
+EBUILD doxygen-1.8.13-r1.ebuild 3743 BLAKE2B 27ff1130731c6205ba3332a00a5b2d5175e3f5980ffffdb8dec65ae8ff1ad2893f48dca1ca77d07eb7be1b8d03509e17b752b02b44fce10601705af6b6c93f38 SHA512 aa8d218d2044b769787a82482a0483b219e17c656c3e8ad806fdda2026430bd63654113676caee8572bfeb1bc82aae6f54b55f0dee9e7b0ca723f1fb773352d2
+EBUILD doxygen-1.8.14-r1.ebuild 3071 BLAKE2B 0b4be122b9e14bad66be6bbc2e4e1b929359d088b053bc5eade4f0559c639da1ec8b7065d8adf150b3d49a708a9f01fa412ae81235a3e4ccd8874347d5df2510 SHA512 b080f4a0a85993f705a8bc0e7f56d39f16837e0c754e32be7170cec92ae03558c45e3937cd083eba9ec3e48477d34afde3ecf68250e4c8ed85081997ee40d24a
+EBUILD doxygen-9999.ebuild 3097 BLAKE2B 6bd1e6c6fd59342bd060f4b4dcfe19997ade7cd570401d8306c67b49eabc9487af84ddb768682d749d2ac045072cbc33f28ccce3fdffbca8e971f1be733c9c05 SHA512 84a7175f62eac4cc2af66cf24e395e53779c2e0ed776aab3d6a0dcba0efc97ef20f8bb2c7b1c64fc7341f0ab333c0a0d6872a82e52dc5b4ee26b00065eada392
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
index 035383b82d28..980992918892 100644
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
diff --git a/app-doc/doxygen/doxygen-1.8.13-r2.ebuild b/app-doc/doxygen/doxygen-1.8.13-r2.ebuild
deleted file mode 100644
index 85605062e13c..000000000000
--- a/app-doc/doxygen/doxygen-1.8.13-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doxysearch? ( =dev-libs/xapian-1.2* )
-	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.13-NULL-dereference.patch"
-)
-
-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=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		)
-
-	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.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
index 502086e771c6..dfb84cd13d56 100644
--- a/app-doc/doxygen/doxygen-1.8.14.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
@@ -30,7 +30,7 @@ RDEPEND="app-text/ghostscript-gpl
 		media-gfx/graphviz
 		media-libs/freetype
 	)
-	doxysearch? ( =dev-libs/xapian-1.2* )
+	doxysearch? ( dev-libs/xapian )
 	latex? (
 		dev-texlive/texlive-bibtexextra
 		dev-texlive/texlive-fontsextra
@@ -99,13 +99,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
 		-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
 }
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 9f082f097a2a..0f8cc61578a8 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="app-text/ghostscript-gpl
 		media-gfx/graphviz
 		media-libs/freetype
 	)
-	doxysearch? ( =dev-libs/xapian-1.2* )
+	doxysearch? ( dev-libs/xapian )
 	latex? (
 		dev-texlive/texlive-bibtexextra
 		dev-texlive/texlive-fontsextra
@@ -97,13 +97,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
 		-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
 }
diff --git a/app-doc/linux-device-drivers/Manifest b/app-doc/linux-device-drivers/Manifest
index fde19c236a71..030b4c269792 100644
--- a/app-doc/linux-device-drivers/Manifest
+++ b/app-doc/linux-device-drivers/Manifest
@@ -2,6 +2,6 @@ DIST LDD3-examples.tar.gz 77780 BLAKE2B 76774a4c6ce91b7332b4b5fa92b8e2309a24c83d
 DIST ldd2-samples-1.0.1.tar.gz 123791 BLAKE2B 5cbfe4925af42688e10af86d341be6d8cba2c4093f2ce293705f9e72f5b2b65f4ffd5809cea00e1065351aea8314a38b3d2c0eec3c41ac3a55903a9c8b6f8c34 SHA512 c6d1c72f0b71806cc719f758b62f3ee2a5bc1c66b63399f2765c0b4edfb2f89945e1248607faae1a88c9278d74c1edfa42f4c4408d926883b1c82a650ebbdd6f
 DIST ldd3_pdf.tar.bz2 11553208 BLAKE2B 539903963d62cbbf15399726a6dbf795cefc0909d10f0383183dd3ee4408c6616c4548331f3cc9cff2b1c6ded6a84d378278bc4e2774df18bd50980ebc406c0f SHA512 46e9f9c2c4e5ce5d325e071f4638ebee772fb55c7c3c0f4a303a35e7ca3576dfccf655bbbe6ef8cf6be0558a1c84addf6a4b59b6c50b621c495f3b75184653a4
 DIST ldd_book_pdf.zip 6971754 BLAKE2B 161ec5b96bedba16958521b7b8605a515d7152eb75c661b2a66d27adeda6235de30fec437016c4f9fef559c27dfac4a9c4d0bee8b6eef89da3af30a9c745a158 SHA512 f30675ff5279df6c689cf4f936aa6bd50f6aab8254e557a6a3be87217efb2c6bc30de8efd489ea5c86f86ebebe2b3ac119b0965fd567caf757e9d6d67d02676c
-EBUILD linux-device-drivers-2.ebuild 667 BLAKE2B f0a76bce2364f3f349607115344be545f6fd175c5f786b9fe6d22130ca906c1df391e7f056db68a36bd4ad051a61eb610729a9f7eed4403ce8a11cffdfb060bd SHA512 c163c236c95765d4e594cf702ca854bd5c530f5aef029338353681b3d92939bc1638d6237cefc95acfca5309f4c8d213bf08a4f253ad91be78b27ebd44e1191d
-EBUILD linux-device-drivers-3.ebuild 783 BLAKE2B 348ecb2b4f9abd58b97f3cc7a3a5267713f828454ef587037776c2f51ffb8bba0bb5b5b1a0c37f3898f1e82fcb08919a4e7f63e8f67e6af38bb498ad2f7871ee SHA512 be5796bec0971a0f0a705ac086979ff8219332c3a3a839a78d41a2e1fa2bc760e3029ab86fc2e06c6f9ad7deaf056a85fa6247aac02e079f9f37bd90a822321f
+EBUILD linux-device-drivers-2.ebuild 636 BLAKE2B 82c129a5161575248b0856b1ad69ae41bd4dae2259d1a62332429484e87b71fb9155717b4e57854d43c4a00b9a0389f94bfc59bd6563fedc33b594437c52209f SHA512 877e8996a5b9b1653c4d1dd9fd0534425fda86b0eccc484255895656eca617d795b62ec6279e15559d0c3bc47daca1eb9ea784737774cf0c7cd4912fea5bfc01
+EBUILD linux-device-drivers-3.ebuild 751 BLAKE2B 8214f902c45f53c4605a8882da84bf7a7999651641ef8f401c164aefc113659e9f84f7893243155034d4e0a3d13e3d2c066d8f83cc5bfd9e88b543de7706e64a SHA512 b994578148bfde514248327bcf95bef1744adfdabbdfd4228d0351353512ca1688756519c5d3a41e3c7683727c18ce481907ce189b78d060ff2f593d64d6b739
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
index bfd14f38cc43..54900698a637 100644
--- a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
+++ b/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="howto write linux device drivers (updated for Linux 2.4)"
 HOMEPAGE="http://www.oreilly.com/catalog/linuxdrive2/"
@@ -20,7 +20,7 @@ S=${WORKDIR}
 
 src_install() {
 	insinto /usr/share/doc/${PF}
-	doins *.pdf || die "pdfs"
+	doins *.pdf
 	insinto /usr/share/doc/${PF}/samples
-	doins -r ldd2-samples-*/* || die "samples"
+	doins -r ldd2-samples-*/*
 }
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
index 60920ab46d5d..bb2198f12426 100644
--- a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
+++ b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="howto write linux device drivers (updated for Linux 2.6)"
 HOMEPAGE="http://www.oreilly.com/catalog/linuxdrive3/ http://lwn.net/Kernel/LDD3/"
@@ -23,7 +23,7 @@ S=${WORKDIR}
 
 src_install() {
 	insinto /usr/share/doc/${PF}
-	doins ldd3_pdf/*.pdf || die "pdfs"
+	doins ldd3_pdf/*.pdf
 	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/* || die "examples"
+	doins -r examples/*
 }
diff --git a/app-doc/mkdoxy/Manifest b/app-doc/mkdoxy/Manifest
index 3b7b26394e97..97aedb724dfc 100644
--- a/app-doc/mkdoxy/Manifest
+++ b/app-doc/mkdoxy/Manifest
@@ -1,4 +1,3 @@
 DIST mkdoxy-1.0.0.tar.gz 11109 BLAKE2B 348d62a189d2f79432eafb65824b90bf0a3f82fab3621edcdc9fc04859b1a901cb71fd05773aee57431559bbc7a1055668fe710e719a6a8fa86a987b2c8d64e2 SHA512 0d40282da6b15cdbfe10e41549acc48241e6732519025e93f38d5d76c93ff180b41cc458fc8dbad4ab81bc28a96e4801c15577d39496392a05e743e581d19241
-EBUILD mkdoxy-1.0.0-r1.ebuild 549 BLAKE2B ab2dd5578b9c850bdc8c06a1f6589aed41d880157bfc6a0c0e00b1be24ad434198cc2893d013d5afca53882c8642f7d741ca947803187027ca5f4c25fdc41910 SHA512 8b6d233f691770e2f21bd3ca1c9a75b8d8348923a8b06c0683394854a240f6570c1ca48f0ea10c6618ef9b540453dfc13f6b1125344b76bb8640c98f369c70e6
-EBUILD mkdoxy-1.0.0.ebuild 525 BLAKE2B 82b77033e710ddbb73efdb56946c39bef726e2cf70657c0962b58ca3ad1c230c5af134aa4d3e6ab5cd7aceccddf18b1b4a3204a482756bbbd7eb15d46da476d9 SHA512 972310d237b60e7ed38277a7d8614b423248a3f0e75d9214466ee85b31459390ac8babdb1938f395128bded2170402b55ef5a185294b14ccea0cdfc0655f7184
+EBUILD mkdoxy-1.0.0-r1.ebuild 548 BLAKE2B 5d7ce5187b32d8adf7f536f5f8b6cdffb929e8cc8386f2987260889dae888515accb0f7d85a949d1825158437133f5ab9f3541781e7e152eda3d12b6cf8b6595 SHA512 47d6c11736d53fe33e62412dbca79a5b7d5a865a4a394987a265ab3d9ef82ae49fe36f6d2a73cc36bb4de89dc54f1abb91f38db7f9e5e23a14c31c7ece4da71d
 MISC metadata.xml 353 BLAKE2B 0433be5fd165f3af420f9f1fe357b7ea3edb785662dfcf3c4a47fbfdf7134ad82b733bd6d54ca5c9bb9640fcdd35e0a0b94634071dfe6ffc50018e0f05477d38 SHA512 aaf9f25dbd03b04756347b66753434800e575c2c9e63ebbbd58602c7a67929498db6b9ff4c3b50ff1031f49438c48cdf88d61169e00bd09b2b6510a68666ae83
diff --git a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
index 1aaec08132b0..7241ac00ff6b 100644
--- a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
+++ b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-doc/mkdoxy/mkdoxy-1.0.0.ebuild b/app-doc/mkdoxy/mkdoxy-1.0.0.ebuild
deleted file mode 100644
index e0d729e51c22..000000000000
--- a/app-doc/mkdoxy/mkdoxy-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="mkDoxy generates Doxygen-compatible HTML documentation for makefiles"
-HOMEPAGE="https://sourceforge.net/projects/mkdoxy/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="app-doc/doxygen
-	>=dev-lang/perl-5"
-
-src_install() {
-	dobin mkdoxy
-	dodoc AUTHORS ChangeLog INSTALL INSTALL.gentoo README TODO VERSION
-}