gentoo resync : 10.11.2017

29 files changed, 252 insertions, 391 deletions

diff --git a/app-misc/egads/Manifest b/app-misc/egads/Manifest
index 5b4dc4cdb897..fbe0d5dcb5e0 100644
--- a/app-misc/egads/Manifest
+++ b/app-misc/egads/Manifest
@@ -1,4 +1,5 @@
 DIST egads-0.9.5.tar.gz 302708 SHA256 606d68e284540d357115d7c2d2952d22a2b293fe77f00599396aeeb5b47e36a1 SHA512 b3138d31165f25c4b4b83b72eeee5fd0ea80e2d89a1a67f1d6d40c82afd849ef76ebdb5e71165eb80c00c971dd0bb4e9660fcb70ffedb7e14a003be90ce91e7b WHIRLPOOL 90f2795416878f3af3205d251e2a9628c6fa5a0ba37ef467b5b51f10de2a4ea75a459e999bf2972c1c5c7a13f8340468e044641194ae67170cbe1ccbd3b59adb
+EBUILD egads-0.9.5-r1.ebuild 1013 SHA256 bf6323b0a96409922486f6402966465b07009f731d76c301cdab72f0a058f492 SHA512 5f2c413108bb0442bbba029299bc29fb26a1b648daa1070f810526e61769c9f9bd8d371b8baf43cd84d0516128f175ef03638892597fb279ec1a5c44c1091eb3 WHIRLPOOL 394cc711cbd29f9b969b0dae395ac5a9edfcffde5b352f796e8d41640dc0e754241deae9df692fc8b4f25e604c5ef70924154bbc45eebdec4d10b00f708fc8d0
 EBUILD egads-0.9.5.ebuild 1048 SHA256 140b7bb2eb542b68fc4dcfc6842baa59154fdb26252db7da61a32cd69e1601c6 SHA512 6bf5a143d07da7e7f574e8cfb1d5634d3a2bcbf97cbc9ea8e9fda0f3f228864fdec9deef405cbf49f7d4f7a9b6ab502806bac38be5360cb477a9d4cf170fbfb2 WHIRLPOOL cada4c0183d2f9de793969fcc4c56889b90df12f985c43108dec6f4d454182e9c7ac2913139d2f1845ea9044f03c2334933c7e03c6e17f4e44e69949c26963b9
 MISC ChangeLog 2170 SHA256 c9d1fd469fe7165ae79596e1380e575293c5f5c9e5d5d4cf158eafafe5967d3e SHA512 79b830fead2062bc57f80fa8aa9d4c3e99c18ce9ceb0ed3a478a295b0b2933541a9d463b672067e629a151bb3020caf9245970269b6dcd3a6dc7a468baf38278 WHIRLPOOL 0260133cfb5d851f370f11261272818065383a22aeac3b0367060628c309cf7c76b9cabf8ffe45572fe24ba0715512a7dd7123c6a669834936c06c5efa2a99a3
 MISC ChangeLog-2015 1425 SHA256 611a07a3c53609563dc2b2d34520abf4d069cded7d8a466153352b25defce56c SHA512 d6ce9d39ff5919d0b2ceff8d9d0ddbf3223bbae6efe431b10b9b2aa18c53b8a0783a5c9a8469da9b576542a7e6bbb75ce4a24df728895a678dbc74761149c9d6 WHIRLPOOL 1cc881c488a69a24f3b60cfb55cbd5a2a2fcfaf164e0f96a31286049e2120f5d1a43e70ae671ff5dc9143178b4675ca3dd0d3c075c3e339a303b367f997312a4
diff --git a/app-misc/egads/egads-0.9.5-r1.ebuild b/app-misc/egads/egads-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..47f7d23b3a5e
--- /dev/null
+++ b/app-misc/egads/egads-0.9.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Entropy Gathering And Distribution System"
+HOMEPAGE="http://www.securesoftware.com/download_egads.htm"
+SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+EGADS_DATADIR=/var/run/egads
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^BINDIR/d' \
+		-e '/^LIBDIR/d' \
+		-e '/^INCLUDEDIR/d' \
+		"${S}"/Makefile.in || die "Failed to fix Makefile.in"
+	tc-export CC AR RANLIB
+}
+
+src_configure() {
+	econf \
+		--with-egads-datadir="${EGADS_DATADIR}" \
+		--with-bindir=/usr/sbin
+}
+
+src_compile() {
+	emake LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	keepdir ${EGADS_DATADIR}
+	fperms +t ${EGADS_DATADIR}
+	# NOT parallel safe, and no DESTDIR support
+	emake -j1 install \
+		BINDIR="${D}"/usr/sbin \
+		LIBDIR="${D}"/usr/$(get_libdir) \
+		INCLUDEDIR="${D}"/usr/include
+
+	dodoc README* doc/*.txt doc/*.html
+}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 352a5b314a6d..3b43e7d1a09c 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,12 +1,15 @@
 AUX elasticsearch-systemd-pre-exec 221 SHA256 cfe5d1afe9e7395c47d2a39ab85058ae6295fe9d094a8e25dc80a10c78e0b7f2 SHA512 1dc41303da367122779759fc1967540357a21aac6df4f5d8761d36dc643673df660b47e5c1b595ecf9316265fe7684ddcb5290df8369379c1bdbc8c933726644 WHIRLPOOL ae0548c7cc96c7ba91af04af02dd395ebc0a8290200168c014594b71d24954afc4be9d0182de3a4fc6de4a3e893daf42954926351dd1e96ed75c7692b089066c
 AUX elasticsearch.conf 2077 SHA256 ec51be1e6aade76dafebb63183693c4ab2de0e4111d5f358b31ff4ecc75a0b7c SHA512 d386f409e7c7d7e654b43ba42298d0c8d14f0973a656582c06e21dc5e1a93088367725c1ef1644d0bde553912297f1693fca9b461f51ac823be3140f56f9dd5a WHIRLPOOL 24e3fcecd818c0ec2625eb6fa01ff4d3656466334eb157e0675a1a0fcd678a3e407e66ed4cbf4c74fd848e7eed3fe43b11d417cc9d41c6597ab76e5f4ad835cf
+AUX elasticsearch.conf.2 2070 SHA256 d11e1b1706101705971735fcae7ecf1b9a23430fa37a8fa09ee78b7885d3a4a1 SHA512 e10d7699046e7db71d822154be6e21785906977d991cae6709a4fd0439c262915ddbf5499b8dd501da86985644f402b96c92fa5d83feb9d0684d3eec766164f9 WHIRLPOOL 94d0c284378c5f3517da53d71e43e45fb2c184166905c2e1d07dbcf43cc5f321f4d24f9b7be93d6a86d5f632c4d13040f2ccf3ebb5ec5949e6e8e83d27cf799d
 AUX elasticsearch.init 2503 SHA256 d5a3225da5d00eaa6d8dd97bcd31503b8814cbc4e0a8b29e5a7c290ac03bb7bd SHA512 55369ea6fc19979a722528afead2a4a19912fd212db450e4fb840c88d0a868faaa87ff8fe33a8a12370559f68b729771ee4b5fdbf066a263a97bb7944d68b9b6 WHIRLPOOL cc6f72a296f8d612845fe624b29bea4d669ab9a0a5c2ca44f598dac6fff32695c64d19eb7c49a21a9f6bee3d49aaf881ebe348edea50d41e98eb355214a27ab8
+AUX elasticsearch.init.2 1830 SHA256 b7be4438e13fb4db11d1fedf078cc0f65f3b4a9e5238075c783789ca3e5a5aa2 SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a WHIRLPOOL fca8569d1ece09985f56775b0ab8bb55ad4766c1b841d446f78c220d94e6e8091e2f9dff1e895733dc2115fd46ef3bf2afac6306a1ab6add8e1aa67dde532d91
 AUX elasticsearch.service 1718 SHA256 444bf14b63eb2a702afa313d5d0e8a2c322bfceac742fe38844e44c02698bb2a SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470 WHIRLPOOL f34e6c906a13e67b23d66de67466b6545eda413bea150b6da383e59eb4947720e8969ba3617320c3446522a788dc4bb5831c4cc1a1a99343c5b85d2397f3d2c7
 AUX elasticsearch.sysctl.d 24 SHA256 d2130d8587c6a8860d51903b5c2f70703da61cddeb42d526fcda20fd0ec9e99c SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c WHIRLPOOL fadf47db434ba8a1533be79adb7c3045315fca661900608f50a608ec6ccd5ab34032e9a15f6b8ec5fc754ef1123ba44c68d93483c2bef8530c8523a925c9b3bd
-AUX elasticsearch.tmpfiles.d 67 SHA256 61f8ff72a46c7da10a076af305ea545765bd149e221e838ba80c38faa6b5609a SHA512 e64c29879a43ad8cd2c272366e62c99b512f49d3cbfe669991c857c5c852aef28d3244040210da54a2f5b346a83e78e385ea86cb97daca76afafe549b80719a0 WHIRLPOOL 11a4e3a3f3fb52331f8f4ed6f0d1e6074601b0fcde818b4f71d36881276f8049dc81bb14a33c1e343623814c8d6e706f37a33456681fc6874d8c77307c963743
+AUX elasticsearch.tmpfiles.d 56 SHA256 391d807443518cd5568f871e64a970487ac750a43ead260f2e2b213131095c63 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a WHIRLPOOL 0fc897d34569e2786b06eae2d06178ac87e34d9ec24a3229213b038c3314188efecc0876ad39a482f4e0a446b71dfee49d6cbb53db4aa3de0d973c6d131d571e
 DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
 DIST elasticsearch-5.6.3.tar.gz 33774486 SHA256 492b7e59d5204b3dc7eb13b611c33b3db36b392bdd6a4c004ba99c6543fc28f9 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e WHIRLPOOL bda081e6b91d1076a39e0af75b44d7f877f28178281de1f22c5177abf804c9395dacabb3c93ec93aff65223df42353bc955bbf60e74fb07f99320096dd97173a
 EBUILD elasticsearch-5.5.2.ebuild 1618 SHA256 ee4a9297fab6f32f75d8df993f3cce07906328c3b4ce5fb499c495237c989096 SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f WHIRLPOOL 233680704ea7848404d497901ef2ddf723ba4f35915653abb341eda4b03dd378ac37b5950a82e164f2ef6f6ccdccc124d44421e06e9618ecbfcb0ca7d905540b
+EBUILD elasticsearch-5.6.3-r1.ebuild 1688 SHA256 9f5c02c1ee82296988aa542cc90663b2d1cdf3f396b7eacbe66911a1250d4942 SHA512 9a577ae695f21d63fd537a26837987e7c4c6525e937bc4219635890e9daac31f332adf02968a3e94e4be768c51a830726196b97f0006b49ba3b385a65e5c854d WHIRLPOOL 516c8d65586dad4cdfd4c27f357615a93291ed6a8d7e7156da19ead6130755b3b7115e79c4161eae6de78a765281403a6ebeee0384ada5a30c341ea7a4d63907
 EBUILD elasticsearch-5.6.3.ebuild 1618 SHA256 ee4a9297fab6f32f75d8df993f3cce07906328c3b4ce5fb499c495237c989096 SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f WHIRLPOOL 233680704ea7848404d497901ef2ddf723ba4f35915653abb341eda4b03dd378ac37b5950a82e164f2ef6f6ccdccc124d44421e06e9618ecbfcb0ca7d905540b
 MISC ChangeLog 8202 SHA256 1531683acbf9c20038e964e166b7b748c2ec4f12bb8f219d75cc685b7dc8825b SHA512 54cb8dc75318bc52e9c947cec07f8926fc1f022429e9b784b21b51faba3022c6f07f50dc065e9e90529b30941ced47e9a0c03e801328f7e694f6881b0a89e6bb WHIRLPOOL 2d1c8f0e9be37b76175dda86322581da84e07c6745d7b57dfad300f10e3ecd250a7abc90e1737d699b0844961864fbb10a3be00951dbc29d503ca3abd50cab65
 MISC ChangeLog-2015 5203 SHA256 8aa86f4c8b0c8a0c2d099ff71b4886f6e7be91d4e10e22d6f49d8ba1ab0ee7be SHA512 2326fb4073b91dc0a39d18ca0a81257c8995ce7afa0d53e31db1851dd45b3b3a94f7bfa9dda00a82b5ecaf16ad022e9236a07aebe9f2ee6f3b9b024b179039ed WHIRLPOOL 03f3e445a6f763d6e42d6d13b336ab10b4ee1d64c9119f8da2e03710b180db180e8abb702241edcdc56009992bea3a1ba0395eb096e61fb97930298099e4c4ff
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.3-r1.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.3-r1.ebuild
new file mode 100644
index 000000000000..cd91e97f3079
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-5.6.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	rm -v bin/*.{bat,exe} LICENSE.txt || die
+
+	default
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins config/*
+	rm -rv config || die
+
+	insinto /usr/share/${PN}
+	doins -r ./*
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.2" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
+
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/elasticsearch into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.2 b/app-misc/elasticsearch/files/elasticsearch.conf.2
new file mode 100644
index 000000000000..e802448a86ad
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.conf.2
@@ -0,0 +1,59 @@
+################################
+# Elasticsearch
+################################
+
+# Elasticsearch home directory
+#ES_HOME=/usr/share/elasticsearch
+
+# Elasticsearch Java path
+#JAVA_HOME=
+
+# Elasticsearch configuration directory
+#CONF_DIR=/etc/elasticsearch
+
+# Elasticsearch data directory
+#DATA_DIR=/var/lib/elasticsearch
+
+# Elasticsearch logs directory
+#LOG_DIR=/var/log/elasticsearch
+
+# Additional Java OPTS
+#ES_JAVA_OPTS=
+
+################################
+# Elasticsearch service
+################################
+
+# When executing the init script, this user will be used to run the elasticsearch service.
+# The default value is 'elasticsearch' and is declared in the init.d file.
+# Note that this setting is only used by the init script. If changed, make sure that
+# the configured user can read and write into the data, work, plugins and log directories.
+# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
+#ES_USER=elasticsearch
+#ES_GROUP=elasticsearch
+
+# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
+#ES_STARTUP_SLEEP_TIME=5
+
+################################
+# System properties
+################################
+
+# Specifies the maximum file descriptor number that can be opened by this process
+# When using Systemd, this setting is ignored and the LimitNOFILE defined in
+# /usr/lib/systemd/system/elasticsearch.service takes precedence
+MAX_OPEN_FILES=65536
+
+# The maximum number of bytes of memory that may be locked into RAM
+# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml.
+# When using Systemd, the LimitMEMLOCK property must be set
+# in /usr/lib/systemd/system/elasticsearch.service
+MAX_LOCKED_MEMORY=unlimited
+
+# Maximum number of VMA (Virtual Memory Areas) a process can own
+# When using Systemd, this setting is ignored and the 'vm.max_map_count'
+# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
+#MAX_MAP_COUNT=262144
+
+rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES"
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.2 b/app-misc/elasticsearch/files/elasticsearch.init.2
new file mode 100644
index 000000000000..6e572c58da25
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.2
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="--daemonize --pidfile=${pidfile} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d b/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d
index d079f28b9954..a551a1f30d4e 100644
--- a/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d
+++ b/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d
@@ -1 +1 @@
-d    /var/run/elasticsearch   0755 elasticsearch elasticsearch - -
+d /run/elasticsearch 0755 elasticsearch elasticsearch -
diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest
index 60b8d37933a6..996ea57aab31 100644
--- a/app-misc/glimpse/Manifest
+++ b/app-misc/glimpse/Manifest
@@ -1,8 +1,5 @@
-AUX glimpse-4.18.5-makefile.patch 1044 SHA256 a4bbf8b63cd20242c51b3200d150850854da455f17bfc7b8914598aee7d4fca8 SHA512 5b6d35bbdc27e4920ede025d6b44e0c3372b1740809d0639f2538bfdad8ce0fa64296ffe01487fde2a6356ac80ee3ae256c1bf775685e3e5d0b2d06a1db49026 WHIRLPOOL 209c8c9e2da50ba627e9ed4c07eb600132f610ffb5c115059a2a94d72d473868876ba9801af6719a324fd232775d7648228c63e3dc130c57e6398d19f713bcda
 AUX glimpse-4.18.6-makefile.patch 1048 SHA256 c86e7cad73e532b77f8b3189704ad40d9b23e4e999c3492e7b8161b7c203be45 SHA512 568b0cc6f52d8ce79e5ad552a302a814162072b85f1a3b7bd2b00bf18ae2d7526429f68f6910d9fb91ddcde43387a2778f9f61ed3f86f0fb533b69946cfef0b7 WHIRLPOOL 29e0b3056684e013a503f4ed77b2bd8f52c7f1682e48b7f53012f022814dbed526d33beed7a0dd08a8d17c1912ef3fe99d4fdb57e78026d8b1e907fe7675cdb1
-DIST glimpse-4.18.5.tar.gz 402754 SHA256 ef15d43db09d59fdce6d46343ac38a3d996924dfce3287ba63c76e6be93b70e1 SHA512 74cdc44f3eff6da62456f5ff6cf13172386bf73175e05258965ca15408bb77839b7e8bfc07e16c1cd4b4ebfaf499097ee24aac5ec77427390ed7e6e9ae3343de WHIRLPOOL a99a39168848869cf88a7664528f10b110c9b5f71c5859a3f9861599cfd0a887d512ae97f4b2fa84da1415fbe0df236259f16cbdad2c1ddfc85569424f162422
 DIST glimpse-4.18.6.tar.gz 812595 SHA256 0c21d27d6a3fe37dacdc66ef9194623f5a94b2f5d221dff8f187f69f629beade SHA512 884daf2057f46bbe29ad2c3e9000e18a3fcc5101abdcb5193dcf66e5da650e2528a6d2cef05ab4176243f381ba03f533cba989cad329697808d97a61f1b42d3a WHIRLPOOL 9b6ecf23ed3a15f53d9324de0a271722a3d8a6b153d146388a25a2e3878ffda537e16ec3d7a2903dd964acfc889352bf89fb28c8a99309793ceefa215b2f4ae6
-EBUILD glimpse-4.18.5.ebuild 1274 SHA256 89709209ec1f969ed56909110968c85094f60e48d3760a2a6b85ecd7e6e3e133 SHA512 5873fa4b8e31776ec552efef685db7d8edcbda0dd9e783d130b1091744f4a5214b006b6055f4a4aa40f86cb7bb2e77a2f07d4cff3a427f28d7a477d6f32cceca WHIRLPOOL d40433e4238b48b34f9b5fd3355ef796b16b37b34f79a15adb1b78f7227e3d7de60159f96127e4162bb9326fa3609b334da924e1fcd59cff77cb3243866ad481
 EBUILD glimpse-4.18.6-r1.ebuild 1422 SHA256 e3a000b4fd2377cb01fba03caa9e2102eb2f146688aaa7ed696e729429ea8f45 SHA512 d8fc26603642c4732b3beedc8c4747d3fce0ebffea62ac59f11c46d8d49cfaf5618d51c3b0cd5234fd0ed822bf2e3d45659f4278b3c014adc25efc01b9e74e72 WHIRLPOOL 83e3d8bf74c61e19e7f9960f7e979414c16a69dd26c9f2fd21b8ce2ca06e3a8960b2ae6b0367ff626cdc5d7745f9567afc8669374f405155095d19224b8004f0
 MISC ChangeLog 2618 SHA256 6236ff58d1686f4cf497dc4b186305afd66af6e10a6a1e05a753df849fff027f SHA512 6caf7cd69869bc07540ce881df0c0eb5f532b10f0b9c156b74ba4719ccb2974f115e3751da3e51dd1fbbc9840c000c61ad99b5023d2a05b44deabe9e937105b1 WHIRLPOOL fcf14a716528bf40dc83687acf9af882b0ca30d79ce1c58ce5e6bc48f213e7f6d7645f8b58faa5e029af553e9d8f0f547975993f9dcc121e4cce5cac75117ec3
 MISC ChangeLog-2015 4366 SHA256 d4deb1bfb2d8e35b91095f8cd0579245851ebf1f304efc715aadc2ee9b3f2a79 SHA512 d7b8f187936eb57c25cf874309860da3e282d462e6328ca14b6a7bd7c00c8e595f70f73f8bf59a6ec650e17b855f55c3af99a57a1a5d8c26ff6c6943f1363391 WHIRLPOOL 30cf9b48528465b52958d34d955f776ff48ee6ab1042f69bb34fe3129784cd2d14db127adce958907d46399df27b5c25fc12e6b0a4a5ea206f220fe18364db38
diff --git a/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch b/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch
deleted file mode 100644
index 86064099adf2..000000000000
--- a/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.in	2006-03-10 20:42:12.000000000 -0500
-+++ Makefile.in.new	2010-08-12 21:12:41.000000000 -0400
-@@ -52,7 +52,7 @@
- PROGAGREP	= agrep/agrep
- OPTIMIZEFLAGS   = -O2
- INCLUDEFLAGS    = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include
--CFLAGS          = $(INCLUDEFLAGS) $(DEFS)
-+CFLAGS          = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS)
- 
- OBJS		= get_filename.o \
- 		get_index.o \
-@@ -78,7 +78,7 @@
- 		$(INDEXDIR)/memlook.c \
- 		$(INDEXDIR)/io.c
- 
--all:	build-sub @TARGET@
-+all:	build-sub
- Sall:		$(PROG) $(PROGSERVER) $(PROGINDEX) 
- agrep:		$(PROGAGREP)
- NOTSall:	$(NOTSPROG) $(NOTSPROGSERVER)
-@@ -87,6 +87,7 @@
- 	for d in $(SUBDIRS) ; do \
- 		( cd $$d; $(MAKE) ); \
- 	done
-+	$(MAKE) @TARGET@
- 
- # Check target
- 
-@@ -105,11 +106,11 @@
- 
- install-man:
- 	for d in $(MANUAL) ; do \
--		$(INSTALL_MAN) $$d $(mandir) ; \
-+		$(INSTALL_MAN) $$d $(mandir)/man1/ ; \
- 	done
- 
- installdirs:	mkinstalldirs
--	$(srcdir)/mkinstalldirs $(bindir) $(mandir)
-+	$(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/
- 
- clean:
- 	for d in $(SUBDIRS); do \
diff --git a/app-misc/glimpse/glimpse-4.18.5.ebuild b/app-misc/glimpse/glimpse-4.18.5.ebuild
deleted file mode 100644
index b91dcc1c0f1e..000000000000
--- a/app-misc/glimpse/glimpse-4.18.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="A index/query system to search a large set of files quickly"
-HOMEPAGE="http://webglimpse.net/"
-SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
-
-LICENSE="glimpse"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="static"
-
-RDEPEND="!dev-libs/tre
-	!dev-ruby/amatch
-	!app-text/agrep"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s:CC=.*:CC=$(tc-getCC):" \
-		-e 's:-O3 -fomit-frame-pointer:$(OPTIMIZEFLAGS):' \
-		dynfilters/Makefile.in \
-		|| die "removing -O3 failed"
-	sed -i \
-		-e '/^CFLAGS/s:$: $(OPTIMIZEFLAGS):' \
-		{agrep,compress,index}/Makefile.in \
-		libtemplate/{template,util}/Makefile.in \
-		|| die "inserting OPTIMIZEFLAGS failed"
-	sed -i \
-		-e 's:$(mandir):&/man1/:' \
-		agrep/Makefile.in \
-		|| die "adding man1 to man install dir failed"
-
-	sed -i \
-		-e '/^LDFLAGS/d' \
-		{agrep,compress,index}/Makefile.in \
-		|| die "LDFLAGS sed failed"
-
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	econf || die
-	emake OPTIMIZEFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
index 57c45613838c..0b4d81e4bf7a 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -1,4 +1,3 @@
-AUX desktop-entry.patch 291 SHA256 cc1e41d9a426639bc19465d0dbd6b6b041643a8eccdd4a98665f3b27723b0a60 SHA512 f93f41082a6483828dd9c579c00f3b4c39574370d76954223f9b1b17663bab389b941461dfa3c7aa82c045b97d1a326791b3ed8ea6bcafad17bb879db068aff7 WHIRLPOOL 6c08c0ef0afded0072d8cd251488c6c19f7e96c7a8252401d1c3ed22404425e739beb16175a15fc51cd52647a398462e640bd232ebbcdf9ef23b5562f0549596
 AUX gourmet-0.17.4-pyglet.patch 1664 SHA256 134a23df0e5cf5a068719785d546915a5a4fa67b7a1ccc5c65f084f40b5ff15d SHA512 162b6b80b09326b15a1cbc8e045ba1fea36bfc106a6f1182659c890e0c100c0820b4f42f24f154be2f8fe2f457e212ace9c989002f33ea26523b1000b888c66e WHIRLPOOL ec6484301e92f09fe59a310bf7652d4068c888db3d2ce4cbb956292ac8caa094b9727028a055e4ab688d72c9519e64af13d4ba1b4327bf9933d9543240d1666f
 AUX no-docs-0.17.0.patch 338 SHA256 b6fb37e3ea0794e7024cc2ad04e5b8b10b2c10d04f37cbe9465bde39e827b24e SHA512 0e8f3c35411ee7f895490762acca7da2eff6e498de6c35511c90c2dd91dc6872f405b8a73465dd411eb193cbf0c8a37b75a5dd06e89e8601e268bffbe6f674ba WHIRLPOOL f5d086b87d394b8c058daa901c88761c20badd2ba3db0603300363f9dbdd6c5ac3ed01e02d3f7ca16faf13c30d7649180956af387b6cb1c3b03f9f82ea8a3e1b
 AUX tostring-to-tobytes.patch 988 SHA256 107b0cc16de64681702587d19964b5f21c3be665e3011c44854c89cfaa95e9b3 SHA512 72b12c9e775bea34ce82c53a8e808fd212eec523f03ca591735ee90121cc45ec6a6464168fe16d66c9889e92168accf8643b0486bc53ef8d144aa92070f3f94c WHIRLPOOL e8413d4e4ef967666671892970f6c2f934b8c43d023b45cf4eac621c8f38838d3c744134d97dc1cdde3c9a57e01d0f0ece4b5f6232b689caddc529c0f0115ed2
diff --git a/app-misc/gourmet/files/desktop-entry.patch b/app-misc/gourmet/files/desktop-entry.patch
deleted file mode 100644
index b79aa5f7b770..000000000000
--- a/app-misc/gourmet/files/desktop-entry.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gourmet.desktop.in
-+++ gourmet.desktop.in
-@@ -4,6 +4,6 @@ _Comment=Organize recipes, create shopping lists, calculate nutritional informat
- Exec=gourmet
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Utility;
-+Categories=GNOME;Utility;
- StartupNotify=true
- Icon=gourmet
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 1ba25df2fa1f..7cf1600fa31d 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,10 +1,7 @@
 AUX graphlcd-base-0.1.5-gcc43.patch 10066 SHA256 6753e9a1804ae49ef367a97138e04d2e1fb69fa1a7517e4c0d5a9c462b4777d7 SHA512 db10ba52c39a83da198984f8c6f42e0fde5c0fc48865891eed668d31eaa85a7d1bf6e3bf862d0b01042c8207bfa0eb0bf76bcfc01678271d65eaefa821b36071 WHIRLPOOL d03c84b4bae580df45381b2fac000bdb3910bca0975a1663c56eff3cd3ea60c547970f4b3a8041c004edbc686ebff380e074029efb587948638f258fe5589afb
 AUX graphlcd-base-0.1.5-nostrip.patch 3062 SHA256 5a59bc4ad1567d9898cf69e0152a350e980dcf027230fc442813a44a8c358d99 SHA512 10af50a5c223cfde3248e448ec02f1160bef6b2b66e11e6fc24d3f2a5e6c40d82e9808b9c2ddf3865cd8a15223ebb7acbed4c1e4f247eaed977a18595cf9b3a0 WHIRLPOOL 7fd26d5dea2712f25807f49f64007113530e6e900442b500f7fd094b12abf7e72ab7e00b3ec508c01a7aa4cc8768d5168a039cf41693569d8c75c7aaf4478dbe
-DIST graphlcd-base-0.1.5.tgz 99863 SHA256 7b11d1e68aa3f9b65ae437e9d6b5bd8bdaba86f7abf93e4ae5ee6b2427b5a47f SHA512 7556c2504726af1ba1889d4a87533f441a4acbc8936f2638710e364e041d67ef471ca363410a7b271f1677fe60377b95dae44237ae0be62c0885f2e92ad4f237 WHIRLPOOL 274a08f56dc48ad030cabcb041a09f41cce68fe8136661ee35a1a19443474ba465576ef654e6c3409814e17d61bfe8dbe0c3de629cff2d6c882285f13c33ae40
-DIST graphlcd-base-0.1.5_utf8.diff.tgz 5040 SHA256 02aeee8f7fcfacf927c86cb9bcb7a67fa5574ad43871938f1e99e618852fbfcb SHA512 ac9cfed725be4a8d04f6898a8e5810a888e4b50c341f9ab668dbb27798007fb66d160ab021729af6083ec1b5e902520602e871cbdd7edefce1e03c06826e9dd7 WHIRLPOOL 1dd8ba284593173efff7b03e70ce80b58d8b03bdb3cb6653ff5f7f885545a41b45407b6f12090f82141cbdb4a1dff2dcf4fa2ce96e5b8294fc050e9716ebedcf
 DIST graphlcd-base-0.1.9.tgz 130390 SHA256 6579e47150e1a9e79fd7866430f4090a50a1c9e0303251012b3fcb433f538fcc SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834 WHIRLPOOL 8718c6aecab2036412dcaf962d9725cf2e6052b86bac06b7aff63273cca9363a411b4d4255e14c820216c2e035784f51718e3c8cfd980a7a2a82f4a013358da6
-EBUILD graphlcd-base-0.1.5-r1.ebuild 1176 SHA256 8c25753955a85b249613ec6b7e7c0b89f5f6294b9fcf7ad6ca66f42b49179a7f SHA512 9be8f847f52cfed58961998e5e51f03df644d0483f0394a87476c49604ddd4ec028aaaaafa2e1a24f970036345ee88ec7cfe262010702488f8046dc393182f28 WHIRLPOOL aaf75bd73e91b71d50da686610afc7df8783b816da9115f709995a12795236e4231404c8ab152a6598264d5fda47d71026a04f67c095995e9f524a3492e993c8
-EBUILD graphlcd-base-0.1.9.ebuild 970 SHA256 2b80e03e6c8e6b71f42246b08348530f9fbe54d7508a2199432d4431614c6769 SHA512 68f5c181c57853e71255804ca25163522775431518ad4e90fbd6bbf5f762babb7168a7c3f20a05146b73b8d93eed8bc722213b071097864c2dc64f4f5d62d04b WHIRLPOOL d987e1bd6858faaaf4e8e8e85caca75eb6b5fb9aedb847d813cb63c147b2c29e13def76a12ae798419c9240410eb76e93ddd74fe5b1fbca465035bbe9affc93d
+EBUILD graphlcd-base-0.1.9.ebuild 969 SHA256 e839849227b9bfdd22818d041d5c9631a05d51f14ec4beec348beaba9de73172 SHA512 8e4ecbde261c813e64e1707992af8c59a22cfa2105ddb7c6265b496ea7ec61d11aaffa3bc2f31ce5a062a667a48dfbfb0ecfc3b8fb5dafd44967338a171a53cf WHIRLPOOL 64ae24aaf728b4669d1d7af91ccb0f1d58ce3259a9e7b4d947362121e4397743aef96af0c2d0ecaaed10f693ad4d4bf07dfeb85d82e19f7b98049736910a42fe
 MISC ChangeLog 2907 SHA256 daf03c738866d41cca83c5ec35d61126595da5c57a3670cbe695e441a7f5fafe SHA512 46803fd9fb55f10aa11721c873d57b69f1a66cbe0ee59e2117884f33b66eecaf1fcf209c5242950f452fafd50efd14a9d3045412cb72f9291d2ea96e9acaf602 WHIRLPOOL 406a0283eba3dab20e2c4da628e801f771924dd69b08ac9d3f6efc447f190dac0718ec015ecacd88e8a466dfd6b3171435aeaff893d14cbe625ecec7db23a389
 MISC ChangeLog-2015 5147 SHA256 c3079b9358e0ac52357cd37f93607483adda6ee7b78bee0f1ed9e71b465456cf SHA512 945ce36d0fe85fee0dbe8112fc3c5e58fa1a30296c83f31a0c915a51091ad0c9da4339d8aecbe3cc3767e87678a9dae68a18d7a611ccc6a335f8e5c68ae42919 WHIRLPOOL e312622663a631a040448ddf968ae3b12748c41ac4cfffbecd445290be8042f180dbc9097b66345ea0fcfc67ad6d82d691b58bf982902f3ac3d7f1ba0de8a37f
 MISC metadata.xml 464 SHA256 a5b9963beb650fa0d7db41a8d06de8b101294b3ac8a483506d70bdcd4b8f52e1 SHA512 a1c66dfad0b364ba3f03d42701c22f7e67c81fcbd03e8e5228f5072aa78d05ad0b09554173131456d789771cd53d3f77898c46ed853216407ace1786870fbcf9 WHIRLPOOL 4d0b850bee0047d079ac624e9c713000dfc4edb786d66d69b8c4476fa6587ef95b6ac33a168d6a9d242852a8ddcf5b87f3af85a978588f8a7aa7f135263533b6
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild
deleted file mode 100644
index ba9f5904414c..000000000000
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib
-
-VERSION="226" # every bump, new version
-
-DESCRIPTION="Graphical LCD Driver"
-HOMEPAGE="http://projects.vdr-developer.org/projects/graphlcd"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-		mirror://vdrfiles/${PN}/${P}_utf8.diff.tgz"
-
-KEYWORDS="amd64 x86 ~ppc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="truetype unicode g15"
-
-DEPEND=""
-
-RDEPEND="truetype? ( media-libs/freetype media-fonts/corefonts )
-		unicode? ( media-libs/freetype media-fonts/corefonts )
-		g15? ( app-misc/g15daemon )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	use !truetype && sed -i "s:HAVE_FREETYPE2:#HAVE_FREETYPE2:" Make.config
-
-	use unicode && epatch "${WORKDIR}/${P}_utf8.diff" && \
-	sed -i "s:#HAVE_FREETYPE2:HAVE_FREETYPE2:" Make.config
-}
-
-src_install() {
-
-	make DESTDIR="${D}"/usr LIBDIR="${D}"/usr/$(get_libdir) install || die "make install failed"
-
-	insinto /etc
-	doins graphlcd.conf
-
-	dodoc docs/*
-}
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
index 0249fd650684..8a5684039573 100644
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Graphical LCD Driver"
 HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="g15"
diff --git a/app-misc/plod/Manifest b/app-misc/plod/Manifest
index 60c1cb90148d..b50553c35e8d 100644
--- a/app-misc/plod/Manifest
+++ b/app-misc/plod/Manifest
@@ -1,7 +1,7 @@
 AUX plodrc 54 SHA256 3821b32173d64fe680c0bd9266e92a5dafc5a9030a3c19582c57e3792193cdf0 SHA512 2ad257ddb80bc94cd53e83dbe861ada8ea583eb419472f4488b4b567effa33ea8ada8c450dcf08c42a84c8874e5db85f1c4076b96e2f6228d0b14937830bcec2 WHIRLPOOL e293e58f7cc99078da032edab56cdd9ec4d083eb1aaf4bfddacdcfbef6fae9b65daccea70c0206686bd07184d6bd865be01b0e2eda6cc86e646095a9143ac455
 DIST plod-1.9.tar.gz 29551 SHA256 e8f33c1d039ea52593365877ece67013438f7888a80306012ed89666ab8e2535 SHA512 0cf1365963ee0f5a8db445c16ce37890429a4c951ce547560e845316950b4f485ecdc0885e2d35cb240bf9d7bec587c0d913774b05cfca8a145c1837281cad88 WHIRLPOOL 32918454f2c4f8ee4335a8cb49ee19e7f7dcdbed83fad45f831e36b35866bd4d67804143017dce6f97433ead1103e125a9f1368d2c12a8b6b9abbd80caa6a9fc
 EBUILD plod-1.9-r1.ebuild 616 SHA256 d414fe8c728431f9d263bb7ec67fa5b2de2aa2209c5c85d459ac13366530a5fa SHA512 2f62b93dcd33537001e725c51a19847c32a207cd120987386266e9c4e144ee2a2623f419a735cdf33d3c5de052b8a2ac15007dcd51a231bd8835c546ef644aee WHIRLPOOL f8a1aa85987464ae40ce1761a4931c1d3157e33223e667ac2e6fa7a5b6a84b2fa380aef4f6eeb75dc1ed84682e54ee5f7daac316634bf67beb45fc0d70f6a720
-EBUILD plod-1.9-r2.ebuild 768 SHA256 06d93ed0c5ecb1c27e482115ddc3e842f1da9141103545af7c19cf3c7c28c2d9 SHA512 50c743841a4dca7ccd2d421e7f5d9105da234ef0f3a9dafff6b4c9f2fd12c241eac4aa3a3b0151b84648c83388b70fd38d4b1c69f585d73ba5d241e4d240ec47 WHIRLPOOL 682bb7d3518d86ceca40677ae171dea4e4f6740da1b04d6b235afd88191fe27a1c6653c602ca60f719c0d6312f2d99bafb5bbac813dd4e3cc43e401ea197b1c9
+EBUILD plod-1.9-r2.ebuild 767 SHA256 4eb38315415c6af74aa392748f82f1b3ff79bc3f700c377ae6d428650c156e89 SHA512 2f80d52d23a87728fa4421e735c0d1459e80a98b8ff84946ac991041980be864ebdad7ea08b1f10a92e569049c32f8145cdbcb10f2a5b6fe4e94f8f494453af1 WHIRLPOOL 7a16ab7d210d46603e8e4e038b7e1b0c91a4c39c8f68ba63d850ec02463d8810c2259b4b8ec44644743691ec995e67aa07dca8a06ede9ce9fb5b428ed8b3bbcd
 MISC ChangeLog 2524 SHA256 3ef03b5325a88b4c93192fed729829d36e51647dcfe3f94166d410ab527e2487 SHA512 e3c005318376e457e520d917c9d5897779e4b9f92c99ecfc49c8cb2795fe428a6847c47af6f9fc03949d5c03fece9e866541f3eeff456c2c8c379a54cb055e2b WHIRLPOOL 7ca7bd00ef697055c970cd1bbf3ce604dffa2c5b1f738987954cf0f87198ba9d3a69113008eb4d645c853c0f911d5fdb2cff045d43f05cfbc00fbd1672a45237
 MISC ChangeLog-2015 318 SHA256 51a0309852872faa30adfa5d01173aa107ea411e80a3bf1817acaffa9048cc46 SHA512 4552a6a5630a06b959df0b9c8a1aa156ef3ace53ea31b2ebe7758b82e224bd94a3cf17cd1b5bac7b8d7798ae1b6f66350a8605b190b55f94787bdd846606357e WHIRLPOOL b11f9f0c37f7b225fbd7777034e24e2f0bb71d5268c7c54e33f7c85daddd386ef70f4ffc1ffd19a864796e5cd4ee806ab942ca19e1201e0775fcaed29c63eaf6
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-misc/plod/plod-1.9-r2.ebuild b/app-misc/plod/plod-1.9-r2.ebuild
index 3bb385546efd..525085dec18e 100644
--- a/app-misc/plod/plod-1.9-r2.ebuild
+++ b/app-misc/plod/plod-1.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.far2wise.net/plod/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="dev-lang/perl"
 
diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
index ee2410d675f6..2787d15e514a 100644
--- a/app-misc/pwsafe/Manifest
+++ b/app-misc/pwsafe/Manifest
@@ -5,7 +5,7 @@ AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 SHA256 858865706f8cdb30712f210
 AUX pwsafe-0.2.0-printf.patch 1868 SHA256 927afd52a65d582cd089f1aba3298d17a7d356403ad323c3d2e7526db1279279 SHA512 7567e666f7dfb9c798aa2e6368ea1abf72f749c953da42bff7ef1b61aea6bf2faca96ef702ef9f7a9ceeece90999c066763006e549c5f2ec365cbf9358547449 WHIRLPOOL da2dc316d88ca010f39b30d4eb0e1868ec41b9988c4d33e1d4f013d234658c905659a5f52180e5d03721edbaa488c119cbf7cdb04b7701b981a4311f3d7c28e5
 DIST pwsafe-0.2.0.tar.gz 127433 SHA256 61e91dc5114fe014a49afabd574eda5ff49b36c81a6d492c03fcb10ba6af47b7 SHA512 e8d3684f523f83def6317ef5561a02d1493685cfbda18707644bf335b7f45b1a548aae17a735838d9f6df345ddb17934607162a6e99348df625b34a9ad5f4cf3 WHIRLPOOL c80ef8c398e5cb68920b11815e0aa042adf2ddaa78c75157e346566b210f5aba000f71c4a2172d6cf2c5a9707fe82af8a1379dbf9bb3ac2f71b6e12aebbbb975
 EBUILD pwsafe-0.2.0-r2.ebuild 905 SHA256 98e8e78dc97923db9bb23e7ef6fa96ce80c4fe50de35759d25489e0c79b7eb13 SHA512 ea570ed13a7c3316a38d9c3760b36b3a54bcb837eedc72c6252eedcfbea8a1b911dd8c3c939a6f54af362d9f130f96ebcc950d4bc2d85768f49b47c67be94b94 WHIRLPOOL 59bd659b230aa0fe87145863cbe298a3336d4241500f1628aabcff926cfbe7e404817144ca22f1a7d5b87b375cf59ad4646e69ce1e039634af06adb013ee720f
-EBUILD pwsafe-0.2.0-r4.ebuild 1018 SHA256 700893f187c485462917d7100e30cab20b5b57004f30c42e3250713363ac13cf SHA512 e1d12d8607794c94a81aaae7fcdafc4928890f1e9536a88a205c5f04c7b2f76ab223a6a9c3ac3f807261aa5d1ef924378b3413936e1b8f4447b87f71b911f79d WHIRLPOOL 161a10d411578139f18c7d70945c81e89dfe34c4b3cdcf38c1a3c00bb3b6480e4d281bfb9d330c45f590be6c2e475a0e6cd726356669d42069cc166074685e38
+EBUILD pwsafe-0.2.0-r4.ebuild 1017 SHA256 6be75cad098b9ed508ac78d44f59256cd282060678b8170a44b01b5980f363d8 SHA512 3a58950a8f72c0696cdee221c63b75536bde0f5095b609dd260442ef204675ee7f673ce4d7e2d94a40c1094ef34039d141126f402c952274a36672e28acd657f WHIRLPOOL 67fdd7e119443a6c263c4a02578a8b10ae7d1d0588664bf72f8f19c5bfd12fa76cee6a8b6d1e3af5cdbf4d116a18540739b41c83d0fb772b61cb636bb318227e
 MISC ChangeLog 3247 SHA256 e68591068deda28f723e77415893918930e9bc9d64e34f5021c7c758b9e2fbfc SHA512 a3ff6887d3fe5a249cdd7fc937c60bb9134f15a29e1dd7ac6e17c27172588136c79d2beb53fd7f63d3ddc3ecb48ebd65c2102bf20aa457e30cf0ad21bc60cfa7 WHIRLPOOL 9ac6db5cc7489414f690ab1227e828aa4cc4d02207c565ab17bd4a35f38995bc8e39cc127f1a950ad795491b0b03ef18cf95fdfaa5978e14bfe330770bd95ea9
 MISC ChangeLog-2015 2728 SHA256 2e2f5c5891dde9ad6e02b5e8c72686c9206f02fe75a99520d48d6351cbad6523 SHA512 2e6205b98250a69293a687cac701436342c969da8fb5be6ceec3168e1c2089d79d750ec717cd009d76eb4ece27e3ae177f968dfc71238dc63c662586264db268 WHIRLPOOL c2b7ba2232a9b4836051f3787d82a44d4be0860ec1154ca8ff8666da0c9256834aaf2cbf654ea01d24cf9402a2ecb9417b431f2c36e81f793b62a80d478f97ec
 MISC metadata.xml 959 SHA256 e65094c7e58e383616aeca6c03ccd0f958cd59ceec3076a038617d714625ced6 SHA512 c4724594e4782281676d98634f9966b78af472f3171d17f86d448d65bf4a543126e89616d0d83a4fa3acac4f7c49c77c1c061f276ef2a906e06623c300920269 WHIRLPOOL a443ce87918fba02ec0b9fa80e9ef7c5db7d27818d6ad278670a78222c3fff8346733316326dc2c6bda3cddff995e87e0ab16a6eadb5e97c38a0e4200444d4c0
diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
index 0ced0a097b81..cd66440a6669 100644
--- a/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
+++ b/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://nsd.dyndns.org/pwsafe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="X libressl readline"
 
diff --git a/app-misc/sleepyhead/Manifest b/app-misc/sleepyhead/Manifest
index b34bc7656a80..5b338c7a42b7 100644
--- a/app-misc/sleepyhead/Manifest
+++ b/app-misc/sleepyhead/Manifest
@@ -2,12 +2,7 @@ AUX common_gui.patch 246 SHA256 a82ebaaa8001590ceff4cf34f39488c2030b1d68cf36a3a2
 AUX gitfix.patch 602 SHA256 37aa5bbf7c6710f4a73ce1c2b51b7262ef7eb872bb035d014678c71d1392a74a SHA512 55ce2c1913dafd333875fd471d6dccbdce2b6eab4350234240b6078ceefb433e0847ab5bd76ca7e07fe567ca8fb8f30ed5f86020d9b9123d6011ab57cf6ff879 WHIRLPOOL 0298c6e10159532a798b4d13b113b420138dd1b96d386b02761e7e11da9f7a73afcbec7313aad0ba0725e2fe03d295837b96cbafdfcda338e364e597b2a69310
 AUX prs1-64fix.patch 497 SHA256 ff6c5ea462f2dfbe1b6d16bdcd6f3639c788830498ebca0718be9b744ba6daf5 SHA512 fb5019d0fa2de29cfd90ca58f57a1208487850479f3ed7252527a575cfb81f1c3f88932210d421b54fadef70d837bbce17cbd171847020b5b07cfc1b36973de2 WHIRLPOOL cad6ad26bcaeaca232fe204ca6266433ecf8461e24fa8b1e5700cffcd51b2e2e105f04a99eba1c4c04600e5e0a6dc30ddec0ac4514d039931324a85a095dd64f
 AUX prs1-code8fix.patch 570 SHA256 9e31538b50afef77feed1112330d11274536a38ea6bd4f8bd0814a08c3cf0f98 SHA512 5226c9ee67cf7bf130cf36b5b9b5db03ba75d571b408614d554ff9d85da98a2b4a67161d5d5cad2e02e2c042ef1eda9927717debaa2701358b5c3c2f4474f244 WHIRLPOOL 97c1e3175e7dea3b8f5f2923beec08284557dd0cf39a3e299cebb658f97b6f878bce559584de3cbaf49cda0955a785ce04f3f7b9c4d6a8741d166ee57085ab9a
-DIST sleepyhead-0.9.2.2.tgz 1399077 SHA256 49bcc7cf2b8351026a1f30b44d71a8500b9c74c6f6ac1aeeb14ca3b039ee7123 SHA512 bb6219c8575b8723b2db063d9a40b164d1aa50223b63468457c85b18895aefc74835d55bcd1f7d0e48e942531bd77041a749e44d870189d9ba011ad85d13c7fa WHIRLPOOL 3e1955aa2d1ab96da8a4f091f15538ba2bd091d935a2b9acaa012c7aadf304e7dcf5cf0f3284e0ed4c29d11f39420f236144adcaec0646f0f4d879c375a822c8
-DIST sleepyhead-0.9.3.tgz 1804053 SHA256 b807f12c3f767037dd2e5bfdeb1f353e425ad537509be4cf3918ec61cf2efea2 SHA512 e50476e9b64ce056d33a55798a86b26fef6db4e8c6058e4e6c5c547e15acb745ea5d79bf3978713583da943626b2395894ed8109fa30a55ca15fa53ff29a2ac9 WHIRLPOOL 5759d97c0309a5c9f312ae9fde85531bc718da4fffe375d6f08b06dd2f34877e935339fa56634f482a3bfc66877c0ad0f4577832f3f89a64ec24dc18b880b826
 DIST sleepyhead-1.0.0_beta2.tar.bz2 3404013 SHA256 db6152a47df69c5cf85a75171d64c2208a953d838ea5c974c2399e8d7cc94353 SHA512 147a853bd77e6277b70d5d70f9b82f46c3f6328283c30b38d77e698146519367c9fa02f8fb21c687237657ceb78d7bc9ee07e4e8ccdbe41652ddd8dc55049eca WHIRLPOOL f07f7dc916e93e213998daecdb469b838e10c642ce87bbdba415e89eccbdab3392b5cbd8414e391270ccd8687b2cdc1c7777ebc8e098ec8eac43ab5d6702a2cc
-EBUILD sleepyhead-0.9.2.2-r1.ebuild 1178 SHA256 f30821ac670f7564be35ed19c7d9edcad87fafb5b44f746c9ccc6ebf5c2e6386 SHA512 0417d552f27802ba31aaeda31c6d41c0f2980621381b47109f1e3d06bc76bf8166abaf4b159f551db2d50c60fb958c90d09b580e5a567fb705b15c613330cac4 WHIRLPOOL c74fb31e95ee3b7d51271af34c82323f4e3fb88c14bc41393b5b55bc573c670edc790d10705b7b0ef2d64de2be0327df48367e10085115ff63bb1ed8e1ece341
-EBUILD sleepyhead-0.9.2.2.ebuild 1096 SHA256 11bed55ec21d179ea7ac894b4976b4875d706d6ab42886a7f55af92048f48c73 SHA512 e262848e0e3bbd893d02644e0e935bcf767ef17992d272d773db73c7ac17725247dd7c61ce5f0a4a7d17f987b6cad174ae1e64c19a2f85465447d7f44cf5d44d WHIRLPOOL 59c3796e8ebb93d3b675aa381d4d3bef3d872db083071b1985f6267226f8a6e0f0c1d25ffb8e8fe4863bddbdfc2ed2cf6ce8db767e89293118d21b7ad107b583
-EBUILD sleepyhead-0.9.3.ebuild 1078 SHA256 f16e61906d48f6e0d81ef7566e3e23dd0d2d442046dc47a7c854edf4cecb86a4 SHA512 8014dcde0c0acd2cbffda364b62bb5654a2d74d1ac289422781d5aab6ff2954900d646e0f0ccb124e7834a442c9d4accab82e93feecfc346e54a57ff53cd7de5 WHIRLPOOL ae4e5ab0b0b3803abc22728bcf6cef573485c96533eac6788135ff11d0b174b4ff14c6a842575256a33773a2ba3a8f57becccf6db63cb8c719334d522bcde209
 EBUILD sleepyhead-1.0.0_beta2.ebuild 1177 SHA256 fcfe10d849ff97ccb753b4e6a5dd71646cee7ac42e915913a628d2f5e2f74e25 SHA512 cc0e8514e6eec60d3aaa0aa0571ee779b79c4ef53237b34288cf3a05973ecb0d321ce6c74511e03d3e40cbc7abe1bab221cef5755b69df18cdbcc2469b7126c9 WHIRLPOOL 74bfaaa4f38b6f4f175eef0f630339bf32e6ec924e0e3c09f61d134250299c3c74da798f3cbf7effdee6c3f03d06aefc3154fc8a31383ae7932791e253416764
 EBUILD sleepyhead-9999.ebuild 1046 SHA256 139c4819c7fba3e568ceec79ebdec984578c082c1b1066383d1f4f9ed7701e7a SHA512 b5bb294779a48a520740e88083d7b9cafe0d5f442f141a746534df8ad3b79c94680b74572e8d3ea824de897fa34da224a5292b4dbfc9a4eb024ffcfdd4f6ec90 WHIRLPOOL a43235cc7fd4c4681677738941dea9100810c672b47bbaa6e377470051c3ea538b934ef2046d6ea6df91e6d478f2335e89169710498befb6f86edad3696d621f
 MISC ChangeLog 3263 SHA256 9445506113044f9129ecbef8e4b6d9f5221112e0987fab4a1702f7dc8f814731 SHA512 352e8012f99d2854cadbe3dbfaa5202f7fc852d597a4b0820d5238d344e6dd80af61ce858f061dd1538585ee4f6fae7620c7a1b0e655a82313e5271cc8c54b54 WHIRLPOOL ef34132d03eeb02020deacd1685ac114487f941491dbeb96f03e36e08d72b0e305be8446a2d127c3d66325a46f9da8663392a33804c2ba53ae506883d69adb77
diff --git a/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild b/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild
deleted file mode 100644
index ca723883d466..000000000000
--- a/app-misc/sleepyhead/sleepyhead-0.9.2.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils qt4-r2
-DESCRIPTION="Software used to analyze data from CPAP machines"
-HOMEPAGE="https://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Main_Page"
-
-# Point to any required sources; these will be automatically downloaded by
-# Portage.
-SRC_URI="https://github.com/rich0/rich0-sleepyhead/tarball/${PV} -> ${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND="virtual/opengl
-		x11-libs/libX11
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		dev-qt/qtwebkit:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/rich0-rich0-sleepyhead-86250b9"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_prepare() {
-#	qt4_src_prepare
-	cd "{$S}"
-	epatch "${FILESDIR}/gitfix.patch"
-	epatch "${FILESDIR}/prs1-64fix.patch"
-	epatch "${FILESDIR}/prs1-code8fix.patch"
-	epatch "${FILESDIR}/common_gui.patch"
-
-	sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \
-	   quazip/zip.c quazip/zip.h quazip/zlib.h
-	eqmake4 SleepyHeadQT.pro
-}
-
-src_install() {
-	cd "{$S}"
-	dobin SleepyHead || die
-	dodoc README || die
-	dodoc docs/* || die
-}
diff --git a/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild b/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild
deleted file mode 100644
index 1ece62067ecb..000000000000
--- a/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils qt4-r2
-DESCRIPTION="Software used to analyze data from CPAP machines"
-HOMEPAGE="https://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Main_Page"
-
-# Point to any required sources; these will be automatically downloaded by
-# Portage.
-SRC_URI="https://github.com/rich0/rich0-sleepyhead/tarball/${PV} -> ${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND="virtual/opengl
-		x11-libs/libX11
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		dev-qt/qtwebkit:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/rich0-rich0-sleepyhead-86250b9"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_prepare() {
-#	qt4_src_prepare
-	cd "{$S}"
-	epatch "${FILESDIR}/gitfix.patch"
-	epatch "${FILESDIR}/prs1-64fix.patch"
-	sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \
-	   quazip/zip.c quazip/zip.h quazip/zlib.h
-	eqmake4 SleepyHeadQT.pro
-}
-
-src_install() {
-	cd "{$S}"
-	dobin SleepyHead || die
-	dodoc README || die
-	dodoc docs/* || die
-}
diff --git a/app-misc/sleepyhead/sleepyhead-0.9.3.ebuild b/app-misc/sleepyhead/sleepyhead-0.9.3.ebuild
deleted file mode 100644
index 0f42e2e1ab29..000000000000
--- a/app-misc/sleepyhead/sleepyhead-0.9.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils qt4-r2
-DESCRIPTION="Software used to analyze data from CPAP machines"
-HOMEPAGE="https://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Main_Page"
-
-# Point to any required sources; these will be automatically downloaded by
-# Portage.
-SRC_URI="https://github.com/rich0/rich0-sleepyhead/tarball/${PV} -> ${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND="virtual/opengl
-		x11-libs/libX11
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		dev-qt/qtwebkit:4
-		virtual/glu"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/rich0-rich0-sleepyhead-34e0b92"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_prepare() {
-#	qt4_src_prepare
-	cd "{$S}"
-	epatch "${FILESDIR}/common_gui.patch"
-
-#	sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \
-#	   quazip/zip.c quazip/zip.h quazip/zlib.h
-	eqmake4 SleepyHeadQT.pro
-}
-
-src_install() {
-	cd "{$S}"
-	dobin SleepyHead || die
-	dodoc README || die
-	dodoc docs/* || die
-}
diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
index c96c99b2773d..5f91e197bc35 100644
--- a/app-misc/symlinks/Manifest
+++ b/app-misc/symlinks/Manifest
@@ -1,7 +1,5 @@
 DIST symlinks-1.4.tar.gz 4942 SHA256 b0bb689dd0a2c46d9a7dd111b053707aba7b9cf29c4f0bad32984b14bdbe0399 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f WHIRLPOOL 4161680c79b58aac890fbc60e48e1659b253a88c67ea8684fd3d2efc216d20c74b0bfb770a1c74cab49a3e9753be484f350f9726acfdcafcd76260f579348da8
-EBUILD symlinks-1.4-r2.ebuild 828 SHA256 2c192e55af3fa9daf41e1635624800610f7b1527e22741bb063f182f3d584a62 SHA512 400667af4a251dffe8be16979423ebc23e222a9d98b55ae86bb6b76e34a12237d83d86faec195606cc0f7f9cdaa46790665cea9fe97591edf5abfe4f727fc725 WHIRLPOOL 34615b2298a6033a82325fa593f3b0c750a5bc270c5e0090329e3f24aa0eaae2187cdd02daecb27e75d3e5eb2f18864bcfec9772359be5df866498ad03edaa0f
-EBUILD symlinks-1.4-r3.ebuild 838 SHA256 2c3817f2c8ba7d978aa9c7241aa57963134372d69ddc1023359f4537e79e212b SHA512 d0415832d55ac358eb804c6dad925075f294663454da30faccfbc1a0aa2772a3a6e474f756df3edb58ce7292e4bd68e9adc7af979ad6163373a30af0061a152a WHIRLPOOL c81be9ca6b9fc8106544efc3c89dfaa16167faffad30e8b2d920a563ceeca519c25de03b902dd6c827dd5da971050434d09b106bd1c5f419d11ab2aafb16b3d2
-EBUILD symlinks-1.4.ebuild 756 SHA256 6f3b2169fa5b50fc6b30fbed7c322091a6074f7905e90be0ad6b6d160559e8e5 SHA512 b56ba3fd70829262894a9e809d75f27049ede6a15270b73d3cb4dab0b69a75ae1da27be7941e0bc28ffe6205657b6a88417a67ba1d7841cfd07276c332108263 WHIRLPOOL 8699f5894256fdc4c485aa51d6b9478df51f5daf68879088899572c85b52ba8f1f155570cd88cd07c508cff4e6d57ee633a04c9fedb9f93babc1255ef5b40ee9
+EBUILD symlinks-1.4-r3.ebuild 830 SHA256 bbcc43d8b80e5168e9e0d85fcec6932124457c7792cb1301a3dc54a10c80dbf6 SHA512 5350e9cac341906ae71e710fd1e588395f2c267dfcefe772a161ec07e512341837fc8a583d667c3ebc785695a41cb2abe497cbb6352a2d8dc622273469dd6602 WHIRLPOOL 2752b16ccb9301d4fa94ba4dfced2df14d37e8c620577863b6d18bb2878cc5b70c0b9117a8bd411e692e0960439b0e6583f9eec6fa8f5afd936b2194db168fc9
 MISC ChangeLog 2724 SHA256 b8b11b9379a5b2f60c4ae79c4a04a4abc69ecdd4e71981bd7efe63c92cd495f7 SHA512 8d1caae2aa86d282b0cb0e3f013f6e4ebd019026a6a35711e71f3995c3b6b873fd79c23ef9d2ef30bc2bbf30c2a7e1a4d438a6704d46ae7ec99c83ccff7086d9 WHIRLPOOL 0fe08dce6a6d81b18f17d600937ece6665122f7c2fca99a43b30c23e277640ea460ff86b95fde169051085259564a9c7f1a3167e35919a029c2b9bbdab42825c
 MISC ChangeLog-2015 4321 SHA256 ffddc024216c8874f38c040e8b725b3bb0f02c691aac372d1adb26620044cadf SHA512 f2d4b5f2e1ac50e69ae986ca33e523e9d6137d3cc92a103e3711be862d767b1d357cc1c96ba1acb4a0747845bb68cd86717105555726359a80c7634f68f4fbc3 WHIRLPOOL c05c161d5a32570c7e755be4c1f137527a51d2a0b8a4f6e615fbd28c820e165142fda173365ed1ce562353b1bc6a88cf08da152f766af196682230689ba21cf4
 MISC metadata.xml 631 SHA256 7b4b801ad19ac13728a648dbd61d16d58645bdc355160efb12a7fe19191c1469 SHA512 69594f3511101cf9f9b3d172b0767a3b6de62a22157517ee8d55fd6dec41ff942c54563058eb0a3fd49f024ae331b143e177c026ab778dbc86f7081b6ab3051d WHIRLPOOL 858e67730051003953e8a0ef72d1d82e85e8777d16bbed167888230ac51f5b70e6b55c7836690bea7fbbdae5166d8b79dc41fb778649a601c4d09acacab53b29
diff --git a/app-misc/symlinks/symlinks-1.4-r2.ebuild b/app-misc/symlinks/symlinks-1.4-r2.ebuild
deleted file mode 100644
index 09abea25c0d3..000000000000
--- a/app-misc/symlinks/symlinks-1.4-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Scans for and fixes broken or messy symlinks"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/utils/file/"
-SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
-
-LICENSE="symlinks"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
-
-src_prepare() {
-	# could be useful if being used to repair
-	# symlinks that are preventing shared libraries from
-	# functioning.
-	use static && append-flags -static
-	append-lfs-flags
-	sed 's:-O2::g' -i Makefile || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin symlinks
-	doman symlinks.8
-	dodoc symlinks.lsm
-}
diff --git a/app-misc/symlinks/symlinks-1.4-r3.ebuild b/app-misc/symlinks/symlinks-1.4-r3.ebuild
index 16be009b907d..30d018d3bce6 100644
--- a/app-misc/symlinks/symlinks-1.4-r3.ebuild
+++ b/app-misc/symlinks/symlinks-1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
 
 LICENSE="symlinks"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static"
 
 DOCS=( symlinks.lsm )
diff --git a/app-misc/symlinks/symlinks-1.4.ebuild b/app-misc/symlinks/symlinks-1.4.ebuild
deleted file mode 100644
index 19890b510609..000000000000
--- a/app-misc/symlinks/symlinks-1.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Scans for and fixes broken or messy symlinks"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/utils/file/"
-SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
-
-LICENSE="symlinks"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="static"
-
-src_compile() {
-	# could be useful if being used to repair
-	# symlinks that are preventing shared libraries from
-	# functioning.
-	use static && append-flags -static
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin symlinks || die
-	doman symlinks.8 || die
-	dodoc symlinks.lsm || die
-}
diff --git a/app-misc/ttyrec/Manifest b/app-misc/ttyrec/Manifest
index 8d7b58c1581b..41df8e33ac7c 100644
--- a/app-misc/ttyrec/Manifest
+++ b/app-misc/ttyrec/Manifest
@@ -1,6 +1,6 @@
 AUX ttyrec-1.0.8-flags.patch 591 SHA256 a7500040b86a41c7dbac7b5a84fb6d45877dfd3f75adf0c8fd6b35d4cf3fae95 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c WHIRLPOOL 948911ee3ba4b50449f91138c2b4f12b5b8c105a9da2cd7291a00fb770999ce85eeed77afd4dea4d55731dafd305170ead59e30ccd594972c9217e8620401b8c
 DIST ttyrec-1.0.8.tar.gz 8528 SHA256 ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611 WHIRLPOOL d8f51ea4c88082b0f272170fec7aed0fa14d153b145f17958dc6101b5e383bbf7dfc4c5ed9cdbac23c08cef6baf25f4b65f3db13f7575bae65bf9ca3f58d48e3
-EBUILD ttyrec-1.0.8-r2.ebuild 690 SHA256 3f7f53bae95f1e41752c119d80b709ae6b433f8edb0470380721e36a9e91b0f0 SHA512 c5f6da7622abfa46111992ac0870b15ebee7f828fefba18b13649e013d40be2d464d97e93ffe34646028530afb8a31266838f1488d9c36b61de6b9aa953ec1df WHIRLPOOL 227379c05ade20f8be649bf6bdec5efb0840cf4f305368be1c75f17e9d58d4d420c7d88980c343bd5c5894cb9b7d159eb72fac4190618b85b03f95242227a23f
+EBUILD ttyrec-1.0.8-r2.ebuild 689 SHA256 3d1eb96d5e3cb9a3d72c634aa753d6830a3ec7af076f8d1c3dc9739e047ca1c3 SHA512 6a28b0eea12baae32d1b2ebde1bee98459e325c7168207e9ac61ff56d69ce42c9086034ca7db86f98a6f73dc0dc28d5f347d88e42bad843cd026484eaa708f4d WHIRLPOOL 4112fef7f283d61f5971f8e69ad5d39365377d83e5e7fc92c17d8f95884696c7c2f13534f29be29c7d7f3b4e00e3e12e9346ee677cbf1c8ad682dae893af2034
 MISC ChangeLog 2560 SHA256 04eda61f241c162d03859e38bc8815f72f8ef12f62e15f5d688074948b337f05 SHA512 c6e2ad1150421b6dfe44200e9920304e7531c0bcf2ae48d4db0f6432f6be716771cfd4375a52c90015dd4070b82887424f71c93b725241a9de8db0f3a4ba0cfc WHIRLPOOL 29e0e105acb674ad79912b4c5f737d08e704348c2e3ae169b66dad4d47db5c367139655c90abf5e329ff38500d5d09c4994402da9e064d55d85eed5a0ef9dfdb
 MISC ChangeLog-2015 3181 SHA256 556555b8b3f9eeb9e89672e9b602bd12cd7fb13e844f7558b3ebb7c0e9d1959c SHA512 efccd026856a7bd9b93e0436f893e771b8bb272404ffd3cda853b3b93ca425487cf6023679d626eab769d28d68ed5bf80c77a12770ed210594031edab510df91 WHIRLPOOL 4b88e585f7b8be8d28ed0892ff4d521697edaf53b13ce8e4d297187c85326acecb03e37cf68b5d3ca0f7965d42d0c213732b20f0085d04daaa04c9b57ed20030
 MISC metadata.xml 575 SHA256 43d494a91bc668699a2f6fa128e1fd2971668d92f2e136765c359891589776a4 SHA512 57adba15d5ac7ae8f49445e81c7aefd99a840721b8636505908493e3e76ed12c24eb5ae87970de701395415c096ca360ad81fe27139fb4db79cfc3da1b7784fa WHIRLPOOL da0fa028a2e557e1a440ff090f2f7610dcd470887c414b3289469de23b5ec6ee3d1dd47920872ef05362dcaca889be5a9c4043515f462860401c05fc1e1b1d48
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
index f7bcd16972b2..bd3f42ed9ef3 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 PATCHES=( "${FILESDIR}/${P}-flags.patch" )
 
 src_compile() {