Merge updates from master

16 files changed, 8 insertions, 451 deletions

diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
index b9809d2a6b86..3d6f77e84463 100644
--- a/app-admin/clustershell/Manifest
+++ b/app-admin/clustershell/Manifest
@@ -1,2 +1 @@
-DIST clustershell-1.6.tar.gz 950548 BLAKE2B e6b2eb236537b23e86f0942b56db3bab7d970870febe76b7dd80719f90d5cd8ac5c0b059695110f966fc3423b77c289c0b951e8c329f33905175004ee811b723 SHA512 d94979bf5b5ead406f49e4ba691cf8541c03398913eb2fb9da724f50ba8b47059b76ddb6058dc5aaea86bbc8588b4d9c75cc34a8a7a94dcfa184ca73250c3b02
 DIST clustershell-1.7.3.tar.gz 345447 BLAKE2B 45bf059670a71724d8614f9b084c5e865daa1fb8dd2268e572d1a30b4d69259162fda8ee22eb2cc22261773c4e34849d345147de76c1628422f6c326b746724d SHA512 acb8e8a5b4a576ee93fbe23a8d903bab813f4182b50d9cd752b3684c743e611d3ee3fcfde31818c0a92495a3ee7640094d4568a03fdbf543e398a1b741a978d4
diff --git a/app-admin/clustershell/clustershell-1.6-r1.ebuild b/app-admin/clustershell/clustershell-1.6-r1.ebuild
deleted file mode 100644
index faa5e3e63f9c..000000000000
--- a/app-admin/clustershell/clustershell-1.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: test phase
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit distutils-r1
-
-DESCRIPTION="Python framework for efficient cluster administration"
-HOMEPAGE="https://cea-hpc.github.com/clustershell/"
-SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc ; then
-		local i
-		for i in $(ls -I man "${S}"/doc) ; do
-			dodoc -r doc/${i}
-		done
-	fi
-
-	doman doc/man/man*/*
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Some default system-wide config files have been installed into"
-	einfo "/etc/${PN}"
-	einfo
-}
diff --git a/app-admin/clustershell/clustershell-1.6.ebuild b/app-admin/clustershell/clustershell-1.6.ebuild
deleted file mode 100644
index 6a13780d51c7..000000000000
--- a/app-admin/clustershell/clustershell-1.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: test phase
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit distutils-r1
-
-DESCRIPTION="Python framework for efficient cluster administration"
-HOMEPAGE="https://cea-hpc.github.com/clustershell/"
-SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/openssl"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc ; then
-		local i
-		for i in $(ls -I man "${S}"/doc) ; do
-			dodoc -r doc/${i}
-		done
-	fi
-
-	doman doc/man/man*/*
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Some default system-wide config files have been installed into"
-	einfo "/etc/${PN}"
-	einfo
-}
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 71e6298b0ac4..36883d5ef749 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,2 +1 @@
-DIST cdw-0.8.0.tar.gz 849851 BLAKE2B 395a8cf527c676da6056dd5b887625c2d6a7ac214651351e6412e846cb435c179785c406a9e4306a72c9a7982eb8e1a0600719ca481307a8efdee5da6e626089 SHA512 67fd9e397800187baafff425fd77ae9ba679a7b396736004f305accea3c3c9ca215d70dac0410fd8ef9ed016f7ce11c3859c84bfa04e3234cee84201605175d0
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild
deleted file mode 100644
index e716ed75db54..000000000000
--- a/app-cdr/cdw/cdw-0.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
-HOMEPAGE="http://cdw.sourceforge.net"
-SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	virtual/cdrtools
-	app-cdr/dvd+rw-tools
-	dev-libs/libburn
-	dev-libs/libcdio[-minimal]
-	sys-libs/ncurses:*[unicode]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-uclibc.patch
-)
-
-src_configure() {
-	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
-		default
-}
diff --git a/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch b/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
deleted file mode 100644
index a639e21713d9..000000000000
--- a/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -44,7 +44,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __UCLIBC__
- #include <mcheck.h>
-+#endif
- #include <signal.h> /* sig_atomic_t */
- 
- #include <dirent.h> /* PATH_MAX */
---- a/src/tasks/cdw_create_image.c
-+++ b/src/tasks/cdw_create_image.c
-@@ -21,6 +21,7 @@
- 
- #include <inttypes.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- #include "cdw_file_manager.h"
- #include "gettext.h"
---- a/src/utilities/cdw_utils.c
-+++ b/src/utilities/cdw_utils.c
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #include "cdw_logging.h"
- #include "gettext.h"
diff --git a/kde-misc/rsibreak/rsibreak-0.12.9.ebuild b/kde-misc/rsibreak/rsibreak-0.12.9-r1.ebuild
index 1de954239c98..451c2934bf5e 100644
--- a/kde-misc/rsibreak/rsibreak-0.12.9.ebuild
+++ b/kde-misc/rsibreak/rsibreak-0.12.9-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5 eapi7-ver
+inherit kde5
 
 DESCRIPTION="Small utility which bothers you at certain intervals"
 HOMEPAGE="https://userbase.kde.org/RSIBreak"
@@ -17,7 +17,8 @@ LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="sys-devel/gettext"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -36,11 +37,8 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
 # bug 587170 for frameworkintegration
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	$(add_frameworks_dep frameworkintegration)
 	!kde-misc/rsibreak:4
 "
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 44a1084a0618..8a9626ab08b9 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,2 +1 @@
-DIST bino-1.6.6.tar.xz 822680 BLAKE2B c863e16a4f576bffb3abf3ab03d8e4cd4ab9db0b0cc73ef2c255b18f103294a9f7e2bf382b286bb7d1d3cb9278c06965772cfc6241a7f23d2f4edc0a47059d92 SHA512 43a17f390881fcc8b7721b21ff8524b89992cd7fb0cfc467769bdddd0ad0c0d2536d161475a7fce6d4d3e758e017a38f671648dfaa4a345dc02127b7b192c8c0
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
diff --git a/media-video/bino/bino-1.6.6.ebuild b/media-video/bino/bino-1.6.6.ebuild
deleted file mode 100644
index 8d2731215ba0..000000000000
--- a/media-video/bino/bino-1.6.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Stereoscopic and multi-display media player"
-HOMEPAGE="http://bino3d.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc libav lirc video_cards_nvidia"
-
-RDEPEND="
-	>=media-libs/glew-1.6.0:0=
-	>=media-libs/openal-1.15.1
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	>=media-libs/libass-0.9.9
-	libav? ( >=media-video/libav-0.7:0= )
-	!libav? ( >=media-video/ffmpeg-0.7:0= )
-	lirc? ( app-misc/lirc )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Qt5 now requires C++11, #649282
-	append-cxxflags -std=c++11
-
-	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" \
-		&& append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib \
-		-L/usr/$(get_libdir)" && append-libs "Xext"
-	use lirc && append-cppflags "-I/usr/include/lirc" \
-		&& append-libs "lirc_client"
-
-	# Fix a compilation error because of a multiple definitions in glew
-	append-ldflags "-zmuldefs"
-
-	econf \
-		$(use_with video_cards_nvidia xnvctrl) \
-		$(use_with lirc) \
-		$(use_enable debug) \
-		--without-equalizer \
-		--with-qt-version=5 \
-		--htmldir=/usr/share/doc/${PF}/html
-
-}
-
-src_install() {
-	default
-	use doc || ( rm -rf "${D}"/usr/share/doc/${PF}/html && dohtml "${FILESDIR}/${PN}.html" )
-}
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index 2b4ef4e77e10..b05b5f8cfe01 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,2 +1 @@
-DIST openfire_src_4_1_0.tar.gz 103449811 BLAKE2B 4635da8c1c59f66b488951aa8844a4517e7a2a644dbb97f88ff508237127d8852bbaacd9eae7bc608839ccbe9a679a11da3d5539642d478c15b9edcb7b10e90c SHA512 3a4e26c260f6a91ece6e6d3fc7c3302b6f1735725ce2686bab8773981dad63ef653a25748852c32e4df8f6bde2882db4043d94b69eb774a5280285fd5b7cd96b
 DIST openfire_src_4_2_3.tar.gz 113557155 BLAKE2B f01bfb57ee76be4dfea11d450534f66f1b50450095cf2d752f910352057ab421f72603b8a79f809f1e9aef20004bb90e9514e68dccb95de709083de9410e4a57 SHA512 8b968c94fcd779544c90de34172b00d472dc2e42142f2aa5eda01f0e0c3dda903a3b9b6d82286916bb1ae8f97fb12f0a94aeb42fad1df0b2dd47e951e03b8523
diff --git a/net-im/openfire/openfire-4.1.0.ebuild b/net-im/openfire/openfire-4.1.0.ebuild
deleted file mode 100644
index 380dd1027786..000000000000
--- a/net-im/openfire/openfire-4.1.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.7"
-
-S=${WORKDIR}/${PN}_src
-
-pkg_setup() {
-	if [[ -f /etc/env.d/98openfire ]]; then
-		einfo "This is an upgrade"
-		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
-		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
-		ewarn "they can be downloaded via Admin Console or at"
-		ewarn "    ${HOMEPAGE}"
-	else
-		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
-		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
-		ewarn "For more info see bug #139708"
-		sleep 11
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-
-	# delete nativeAuth prebuilt libs:
-	#    uses outdated unmaintained libshaj, does not support amd64
-	rm -rfv target/openfire/resources/nativeAuth || die
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}
diff --git a/net-libs/ccrtp/ccrtp-2.1.2.ebuild b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
index d4d85f86a109..3a37c3fa5214 100644
--- a/net-libs/ccrtp/ccrtp-2.1.2.ebuild
+++ b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="GNU ccRTP - Implementation of the IETF real-time transport protocol
 HOMEPAGE="https://www.gnu.org/software/ccrtp/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2"
 IUSE="doc"
 SLOT="0/2"
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 45a1a89c3258..254099599401 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,3 +1 @@
-DIST miller-4.2.0.tar.gz 3373505 BLAKE2B 5051f310a70ad151aa8fd80dd4b885e78561dfb1fd14fa3a49ffb9928ce55acb59220b2b122b798256a0d258fbe4216470cdf8aec37be2fd26ac5ecb1f80e982 SHA512 f176dc2ce4e733ac1e4e331f17554d4ed089344a5f571bcc9d4b3b227f6c950fa0355f1a5b934e4f9467d9a22448e2842c586a4e6c424a98ec89170cd70b1714
-DIST miller-5.2.2.tar.gz 5024653 BLAKE2B c13b6fb03404ae93f436997510aaaced2e11616b42fe132b9a267b1e71c2b7ada5bd310a20bd0bbd50ca6edaac915ebd68885ef4de1558aea63d9753b9f69125 SHA512 64ab35db6382cd9bf819249a57b88a142fccf7d6facdc6b9fdf3005b82bb2567f57b64d52a29b5f9d44c941974803339eb4a34c6648fdde2c82cc7c2f98e727c
 DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945ca3bf97c078c89b9d2811067fa4bca2403f8ad239f8245e050acb10305d351b1db4177541a4fa9ed9a4bc1396c SHA512 4c557d97eb1cda2e52093fa097677602491895dea3093776a03af56114022b8c0917df9fbf26071d4d1a3c1360f520c82e33b32635c7b4207fa62869ab564712
diff --git a/sys-apps/miller/miller-4.2.0.ebuild b/sys-apps/miller/miller-4.2.0.ebuild
deleted file mode 100644
index f0f66106e3db..000000000000
--- a/sys-apps/miller/miller-4.2.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
-HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
-LICENSE="BSD-2"
-
-SLOT="0"
-SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 arm x86"
-IUSE="doc test"
-
-DEPEND="sys-devel/flex"
-
-my_for_each_test_dir() {
-	local test_dirs=( c/{reg,unit}_test )
-	if use test ; then
-		for d in "${test_dirs[@]}" ; do
-			pushd "${d}" >/dev/null || die
-			"${@}" || die
-			popd >/dev/null || die
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	local sed_args=(
-		# respect FLAGS
-		-e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g'
-	)
-	find -type f -name "Makefile.am" | xargs sed -r "${sed_args[@]}" -i --
-	assert
-
-	# disable docs rebuilding as they're shipped prebuilt
-	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
-
-	# disable building tests automagically
-	use test || sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
-
-	eautoreconf
-}
-
-src_test() {
-	my_for_each_test_dir emake check
-}
-
-src_install() {
-	local HTML_DOCS=( $(usev doc) )
-
-	default
-
-	doman 'doc/mlr.1'
-}
diff --git a/sys-apps/miller/miller-5.2.2.ebuild b/sys-apps/miller/miller-5.2.2.ebuild
deleted file mode 100644
index fc4af1f10878..000000000000
--- a/sys-apps/miller/miller-5.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
-HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
-SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc test"
-
-DEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-
-	# respect flags
-	find -type f -name "Makefile.am" -exec sed -i -r -e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g' -- {} \; || die
-
-	# disable docs rebuilding as they're shipped prebuilt
-	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
-
-	# disable building tests automagically
-	if ! use test; then
-		sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_test() {
-	emake -C c/reg_test
-	emake -C c/unit_test
-}
-
-src_install() {
-	local HTML_DOCS=( $(usev doc) )
-
-	default
-
-	doman 'doc/mlr.1'
-}
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
index 4a4263307e67..7b9185bd136c 100644
--- a/x11-misc/peksystray/peksystray-0.4.0.ebuild
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc x86"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11