gentoo resync : 18.12.2017

15 files changed, 47 insertions, 272 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 65ac6551e06b..86f2cf27ee2e 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
index 6a2c84a3f50b..8b3150097504 100644
--- a/app-text/crf++/Manifest
+++ b/app-text/crf++/Manifest
@@ -1,6 +1,4 @@
-AUX crf++-0.54-gcc46.patch 297 BLAKE2B a284ca06af5d752adc6017344abfede30b6e6939b316197f904081baa426e8558be862956d400a0b9434891c853f7d7b4464c1a66309f5906da41fa5d6c2e193 SHA512 3390be3aee788af08969a02ebcc4a645537d635e47091da528a6fa1a3d43a20e677287d47070bdc97b3b0c4f8aeabd5a5c107d598919a5e9882ef180f704c390
-DIST CRF++-0.54.tar.gz 809008 BLAKE2B ed23b998ee5a37afc3f429ac04a8e6f57febb93dec469c68c7db1fbb3dfb1d1df7a2ddeb48ab758a6548f60bc920b8c7a3d6f418776a2a110812457245a3f6e9 SHA512 4198ad9423776a44d02db51a655a35f36db767ec623f55de426b3415179ac7187b91d23c6ef9a2cf3d1c38e14507fc7681006ff2ba50dcfc771a7d5e9d1c5760
+AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca
 DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
-EBUILD crf++-0.54.ebuild 1118 BLAKE2B c7e9750fe440add09c74750ede0b930cea6d978658d68225b0e4adc0084d178b637ebd122b756ac7695d5ece1f52919333dd9fe58c76c3de3a4b3dd310a22ee6 SHA512 7ae040f57b491421e2c6689f0b54ba3d963aadd1e67721177ed44aeb6539e3d40f229f652a695fe863fe752634b8d3600f00e6e78e8ec4ae807fe36971c414e5
-EBUILD crf++-0.58.ebuild 1097 BLAKE2B 53f3ec7866c58afb271e3b13b0d30354393716850ada6dfc4d645308e12a4d45a7fe8a11b74b7bd293006dd76de245cb8798c67e2036b937e8c256ccc700b97b SHA512 2b452d9e7be197a3100061040d606fac3df07bc61deb3a3fad69ff65fde3ab7b5e3fdcb2a57b45b29f7a23f8459d987a00be51be6a02874d6b15a27415bde91c
-MISC metadata.xml 666 BLAKE2B 01126fb5d24a9c8dfa3d8aca0516a132245bef92219100fd9970415153abbd80414cddcb1948a82617164f7515687fe01a950b326b200bdb71901a5bb9fb7312 SHA512 922c14845da38ed461a50f654bd858f1d1de04642bdd40ba353f87000fb1d0150dfe9fa2e52ed5b4d8dd2e8f64b636c94577cf74a9c138f0aebd1a0d9da462d8
+EBUILD crf++-0.58.ebuild 1142 BLAKE2B f3b9572d8fcedf2245d7e1ad51e5c43d9b13559c1894b47d9ca784fbdd447507e808f9df5c2f708f29dec06758740e0180770319ead3ddc56e77516c9330e707 SHA512 ecf7045059470e8a318fc8c46ae38af0eac567382755d29f5594d6f87f30baf35fb9c86a0a79d87f2b300c3675684924791a0656463a4191d94327c099bbbc30
+MISC metadata.xml 669 BLAKE2B 12280d15998c56ac4c2e3bd3e80fd2a22eb150b979836d8600df3d5a36008807f0cc7fd91b84cd3717c379c9ca603ce110a88c3f86b48e29be983f99faa1b6a0 SHA512 d479bf4332884e2dfdd57b6c496b585f7e55adad2200dd22684a9fe6f1cc1c69049fec20d3ee0683543119c4f4935c83cda7d6a501b44e51e612249283fda7f3
diff --git a/app-text/crf++/crf++-0.54.ebuild b/app-text/crf++/crf++-0.54.ebuild
deleted file mode 100644
index 204eda151148..000000000000
--- a/app-text/crf++/crf++-0.54.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit autotools eutils
-
-MY_P="${P/crf/CRF}"
-DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="http://crfpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crfpp/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="examples static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
-		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in || die
-
-	# bug #365921
-	epatch "${FILESDIR}/${P}-gcc46.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) || die
-}
-
-src_test() {
-	for task in example/* ; do
-		(
-			cd "${task}"
-			./exec.sh || die "failed test in ${task}"
-		)
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -type f -delete || die
-	fi
-
-	dodoc AUTHORS README || die
-	dohtml -r doc/* || die
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example || die
-	fi
-}
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index 7518e894e2e9..c358043e7e8e 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -1,55 +1,61 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
-inherit autotools eutils
+EAPI="6"
+
+inherit autotools
+
+MY_P="${P^^[crf]}"
 
-MY_P="${P/crf/CRF}"
 DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="https://crfpp.googlecode.com/svn/trunk/doc/index.html"
-SRC_URI="https://crfpp.googlecode.com/files/${MY_P}.tar.gz"
+HOMEPAGE="https://taku910.github.io/crfpp/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="examples static-libs"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch )
+HTML_DOCS=( doc/. )
+
 src_prepare() {
 	sed -i \
 		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
 		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in || die
+		configure.in
 
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static) || die
+	econf $(use_enable static-libs static)
 }
 
 src_test() {
-	for task in example/* ; do
-		(
-			cd "${task}"
-			./exec.sh || die "failed test in ${task}"
-		)
+	local d
+	for d in example/*; do
+		cd "${d}"
+		./exec.sh || die "failed test in ${d}"
+		cd - >/dev/null
 	done
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
+	einstalldocs
 
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -type f -delete || die
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/example
+		insinto /usr/share/doc/${PF}
+		doins -r example
 	fi
 
-	dodoc AUTHORS README || die
-	dohtml -r doc/* || die
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example || die
+	if ! use static-libs; then
+		find "${ED}" -name "*.la" -type f -delete || die
 	fi
 }
diff --git a/app-text/crf++/files/crf++-0.54-gcc46.patch b/app-text/crf++/files/crf++-0.54-gcc46.patch
deleted file mode 100644
index 93cb54020cfc..000000000000
--- a/app-text/crf++/files/crf++-0.54-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur CRF++-0.54.orig/path.h CRF++-0.54/path.h
---- CRF++-0.54.orig/path.h	2009-04-05 20:42:35.000000000 +0900
-+++ CRF++-0.54/path.h	2011-05-31 01:31:43.845198215 +0900
-@@ -8,6 +8,7 @@
- #ifndef CRFPP_PATH_H_
- #define CRFPP_PATH_H_
- 
-+#include <cstddef>
- #include <vector>
- #include "node.h"
- 
diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch
new file mode 100644
index 000000000000..afff7edc0707
--- /dev/null
+++ b/app-text/crf++/files/crf++-automake-1.13.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -240,6 +240,6 @@
+ AC_MSG_RESULT([yes])
+ 
+ AC_SUBST(datarootdir)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
+ 
diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
index 4fea4cf917d6..edc6c2bf83c2 100644
--- a/app-text/crf++/metadata.xml
+++ b/app-text/crf++/metadata.xml
@@ -13,6 +13,6 @@
 		Information Extraction and Text Chunking.
 	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">crfpp</remote-id>
+		<remote-id type="github">taku910/crfpp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 8ffaf6a851e5..891e3e57a5fa 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,5 @@
-DIST dos2unix-7.3.4.tar.gz 640991 BLAKE2B 143ba62d859105147a0095732dd83f76cfe6a0e2ebcdd6753d8ea3ce47dcbb8372c0006da8be4c4e4efc2af93ba365a4a8d8bc8d451cc562944cec0251e523fd SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.0.tar.gz 710339 BLAKE2B 629c4a410f0cbb0b5b0fdb89c03fbec1965759a747309ad8a4459820bf2151d1861f4040d67ce6934ca27cfc3b6d0495eccd0966045803f065b10520808d9686 SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
-EBUILD dos2unix-7.3.4.ebuild 2026 BLAKE2B 4a38cbc0ce58d756615ecc1fdb1c699f81bef3219eb8716e4e72fbfe969b4e9aeaec1cd8ed445acf6ce215af1db523baa6dc0c29957aa4c5d77a87e71efd5618 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760
 EBUILD dos2unix-7.3.5.ebuild 2037 BLAKE2B edfc091f5ae520b92c58aa58b5273a1748c07741a64ad37fa9b06458c257b2e394fd43c56ae46c562f40a8331c9360e486f7d1e27957bff1f6e0c783b4f5a0f8 SHA512 be9ba30896b2e246b978ec3184c593c85e06e3b223fcdce599874645477f35c4161a6a1261379dbed08db2556eb9c472f6a89959a636887cfdd51ff924377dbe
 EBUILD dos2unix-7.4.0.ebuild 2046 BLAKE2B b76c15a3753bcfe22324fd3caafd4e4a1286d6d96bc379a3e23854dcc9bb7bb1344e7661cbdcc846caa1e740bee2a428f88408dea8ea6298735d15e2d8ffbfc5 SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.3.4.ebuild b/app-text/dos2unix/dos2unix-7.3.4.ebuild
deleted file mode 100644
index 3b4310036b01..000000000000
--- a/app-text/dos2unix/dos2unix-7.3.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
-
-inherit l10n toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
-SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls test"
-
-RDEPEND="
-	!app-text/hd2u
-	virtual/libintl"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( virtual/perl-Test-Simple )
-	dev-lang/perl"
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror "po*/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	rm_loc() { rm po*/$1.po || die; }
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_prepare() {
-	default
-
-	handle_locales
-
-	sed \
-		-e '/^LDFLAGS/s|=|+=|' \
-		-e '/CFLAGS_OS \+=/d' \
-		-e '/LDFLAGS_EXTRA \+=/d' \
-		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-		-i Makefile || die
-
-	if use debug ; then
-		sed -e "/^DEBUG/s:0:1:" \
-			-e "/EXTRA_CFLAGS +=/s:-g::" \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-}
-
-lintl() {
-	# same logic as from virtual/libintl
-	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" \
-		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(usex nls "" "ENABLE_NLS=") install
-}
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 959ebd0edbd1..b017afac520d 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,6 +1,5 @@
 AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r2.ebuild 1002 BLAKE2B 583400dc99c191cf10c68aaafb1e8bc76f2541df978017cff7d746d381a0dbf9203b1eb7c2f35c2458d57c1f08da3a571faf7da829cec6209bb531ba3dbf1e56 SHA512 01b3277af28ec70dd8bb6afbaabf6a2410787ef032b189fde69c40ca61323b2a76b03f8555c4be840174b47a6a59e78eb10103b4acb1061f7b09ab4d7a838e7f
-EBUILD psutils-1.17-r3.ebuild 1000 BLAKE2B f6595e96bba6c1117b5c42f43ffaf6042e84d36d78a89ea65740c423f56819e31de1ec15795b8b3573bc7f6b8316896831cac7432ffab8256a5ed2ba4c4c408c SHA512 b0fb5b9acec3d19be87b68c0577136ffec43fa881fdd203f9074e4377bf3a42b7147d2787c921cdd46d43a040975fc6b2bd000a71a8ee2a30a355169c23a824b
+EBUILD psutils-1.17-r3.ebuild 999 BLAKE2B 283c673f8eed7948d71baa0a16af860cbb93c97bebf63519a44f9c8aee340a14b8153718aa91f60d5d02f64c1d9971c61af718b93e2939f56b7154c11ee14d87 SHA512 78143446eabfdfb5400e80ad6576086918259a68987627f036d6f557208369746087020ce5d1ccd613f17060045fd57bf10e11626e34364dc6835380cb75dca9
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/psutils/psutils-1.17-r2.ebuild b/app-text/psutils/psutils-1.17-r2.ebuild
deleted file mode 100644
index a91ce6307be9..000000000000
--- a/app-text/psutils/psutils-1.17-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="PostScript Utilities"
-HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
-SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
-
-LICENSE="psutils"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}.orig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-no-fixmacps.patch"
-	sed \
-		-e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \
-		"${S}/Makefile.unix" > "${S}/Makefile"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install () {
-	dodir /usr/{bin,share/man}
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index 201879533dcb..551a8ecd7021 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
 
 LICENSE="psutils"
 SLOT="0"
-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 ~sparc-solaris ~x64-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index bcd28dd33826..789082e576a1 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,5 +1,4 @@
 AUX 1.0.3-libsablot-expat.patch 286 BLAKE2B 07728a2d174343133946519934a0b10aa0ea0d2c7e5ba73401b8c16ead71f059f78b24236bc96e17baf2467a5765ce0d82e67e97bb48225a9ba0fc5ac8a163d0 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r1.ebuild 1057 BLAKE2B 5ab7ab0806b504ac8f477813056c3ee3a415b98011e8110be9da2a8a408ea2c17bdbba605d7339a823229a5026f83927064e83bd9a4efe6f031563c58b8f688a SHA512 62772d0c8409284fc2d02c6e8cf7e303912c62f1a8544ab7de085069353a8bb9d60e3b52b4689cdb66de0e630acbffb97bf0d9630dc51199dc7461247c7ed3ed
-EBUILD sablotron-1.0.3.ebuild 1092 BLAKE2B 698260be8d4fcb56c980c857769bf6ab9bb0f2fff072cbe1f04cc4095ee3cb7ff25ee2aa4764a732c86670a1b83349143901fa4c7a2b4b3af38f394eb0945dbe SHA512 99577a5aa616f985af56735a42928ca36a6367c86e0b191fc699b4b2848b04f40f24616f7afdd7e70c44217e707d1fb8c40430362109547bb2c06c702292432c
+EBUILD sablotron-1.0.3-r1.ebuild 1053 BLAKE2B e969fcfc506eaf71ca7534edb4e2bfdf7fec8c2813fb156511d61e99dcc860e0f5c3e0ae574dc50bb885cd8f03cc24530fa06f0179549815b0a6f98510d62225 SHA512 a3145154f2be9d371e1cbf33589f6da3723ef3106c38a6f278c3840043f58137bd7d072af0602c065665773ebf471a711fdc81dbadf400f8619aecd5e0aa21eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index ae7713536658..622e9320de00 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=dev-libs/expat-1.95.6-r1"
diff --git a/app-text/sablotron/sablotron-1.0.3.ebuild b/app-text/sablotron/sablotron-1.0.3.ebuild
deleted file mode 100644
index c9118189fdc2..000000000000
--- a/app-text/sablotron/sablotron-1.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit base autotools
-
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An XSLT Parser in C++"
-HOMEPAGE="http://www.gingerall.org/sablotron.html"
-SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
-
-# Sablotron can optionally be built under GPL, using MPL for now
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="perl"
-
-RDEPEND=">=dev-libs/expat-1.95.6-r1"
-DEPEND="${RDEPEND}
-	>=dev-perl/XML-Parser-2.3"
-
-PATCHES=( "${FILESDIR}/1.0.3-libsablot-expat.patch" )
-
-src_prepare() {
-	base_src_prepare
-	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable perl perlconnect) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	dodoc README README_JS RELEASE src/TODO
-}