gentoo resync : 21.12.2017

14 files changed, 6 insertions, 328 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2140ae8aa49d..7c8ebe9dbd8d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 5a788023b26b..736c7987f730 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,3 @@
-DIST bijiben-3.24.0.tar.xz 830884 BLAKE2B 7b982ef6b318d9b425b5bc2b6352a4674a8fe4a1e44da663771b834a083f946b055ab091de3fc0dadf25c4bd45496611ff9bc8322b747e6e84082d1f6faac480 SHA512 aba794d275b05f2267b7dfdd3f3933c5197d3596e06e72b0ae3d1f9855310761e5ff1b42ec7088fe7c90f55a6ffc64f6c508d72edc389d74256a9bcec90767d1
 DIST bijiben-3.24.2.tar.xz 843548 BLAKE2B 2441e3e9f672c7a9796dd1786bedf29ae1b5a6c4563b07943c4bfc252dc2ad9be0e8ab0569cbceb2b2c839a93d45ef3cd671d68d9b6717f880ffbb3f80d3392f SHA512 e5571c793fc75b1038a024f0f73b539079ca4415c7f4fd0756314a14baa1fe679d9513bf8c291aa20170f35616be409ebd0360e3d3ec8f962f2d3d143e02185e
-EBUILD bijiben-3.24.0.ebuild 857 BLAKE2B 52520d05517e8321223c5ce0853d5f8ce28d95be841e4cbc936209c1668d322f44e7c9e5a5300430e9a91dd895802612a4974495f678433ad3f47ebebe626afb SHA512 8356398ceefc060a72632e6f77bd0221e152e25060da61e7223cf4b4d0080512e0474136cd2dd268aa8dbeee34ec18337b26a91a0127d4104d387aa02b88389d
 EBUILD bijiben-3.24.2.ebuild 914 BLAKE2B e12f3b3c65d9527afe15ec443cedb2b4acf1c8966a9a12a4b270e9e32a9050ae69a964fa75e6f3659ce5dea64919458c812a676ca1423d49d8f8ed984595d6b4 SHA512 07d5b7a736034ccc7b8898ade58aa1a4134538f5777afe4a8bb4ab13be5f6d89191fe2a7d604cd05acb58f53e87ea94b64fd098e66f772757b3dd9c85c4acf48
 MISC metadata.xml 363 BLAKE2B a4f7c4f3811e2cecfb5f7977ac819be969e120c12e8c0a0d2cb006f68dabb8e64fe9c9a8258792690b3da217c30d422b37691276ee84d76b487307b0d94715cd SHA512 e891b4270a6c2c77ffe9e5efd945c6e6d7fc058e6315fac0793fbf86ca68251fa9a3d2fce796419fce6be1ca0fca215d50b77e9a4da6667475d0e0a155bcc747
diff --git a/app-misc/bijiben/bijiben-3.24.0.ebuild b/app-misc/bijiben/bijiben-3.24.0.ebuild
deleted file mode 100644
index fc573ec4adc4..000000000000
--- a/app-misc/bijiben/bijiben-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="zeitgeist"
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.11.4:3
-	>=gnome-extra/evolution-data-server-3.13.90:=
-	>=net-libs/webkit-gtk-2.10.0:4
-	net-libs/gnome-online-accounts:=
-	dev-libs/libxml2
-	>=app-misc/tracker-1:=
-	sys-apps/util-linux
-	zeitgeist? ( gnome-extra/zeitgeist )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Needed if eautoreconf:
-# sys-devel/autoconf-archive
-
-src_configure() {
-	gnome2_src_configure $(use_enable zeitgeist)
-}
diff --git a/app-misc/evtest/Manifest b/app-misc/evtest/Manifest
index 335bc067f737..7ed40985aab4 100644
--- a/app-misc/evtest/Manifest
+++ b/app-misc/evtest/Manifest
@@ -1,12 +1,9 @@
 AUX evtest-1.30-autoconf.patch 974 BLAKE2B 704e0b7114651ec950ccabf34206c10c6d6fc93e494b30dd1db2edc3cbcea4f8fa6cd601c5f61f9936927a98e1c915a53b5d463f6f0d03c2a71f04ed04ea9eae SHA512 7b4fc165bd5d9dccd34ad47bcab017da08e4efb47783925c75a68de4dde32a873018a19089b01e845ea55769d943b3eaddb962a2bd99fb1e62d4444c28c3630e
 AUX evtest-1.30-xml.patch 1362 BLAKE2B ac7f9c1e190b6292d2282ebea9f88ad5b6c5354b6d422a3f07e24d19b98229cf39a3f0f612c1f8e626551b4947bb334f82553f6e473d86a6f71b8e38a3a79959 SHA512 b558f97af8f14e7d316990f7657a7429b26b0df2d54a5adf849ee3237d1613e0d629f36f72963b31baa7fdf78db8bda0e687ff5925cb86a8afd0dbc4058b3c30
-DIST evtest-1.29-mans.tar.xz 2108 BLAKE2B 39dcd75df1ead8091ece91a1047bb75fd99944a9a90db9036ec5db9ff9a817d2f0496b2dc4f98015796b32d98a9157f119a6b721424764db6f05910d0f25743b SHA512 d32786fde7ca20cad445b6cce35f603fff8d39f51e6a0f7569f4cc020def77240686b3a12a969c5176c5cfc0e34270f169c4429cb9e6aa5f0684fa2c50abdf85
-DIST evtest-1.29.tar.bz2 21930 BLAKE2B 610ec49676bb16ea31152c9fa4362b25d6e67bfecf72d3b7df0d434e57e3d5b6384ba52f33cf6c5d48d97f3ea90f26f9b8b6c0880a33338a31ece2d6ee6cad42 SHA512 ddbda6f1a34363a844b3e2e206afec6f6aed18c2b8c97f6e5bc9c57c1585fc00ee99ded8aded2d2674e58cfaf48c8028953059cc3024e04253f4cd961a1da2e1
 DIST evtest-1.30-mans.tar.gz 2112 BLAKE2B 63981baf8c69993850d974f9bc94a9b96a45c3bb51379a6788e18715785475d8f3324134d5906b7188c950bf0d05fb138f4680e3a191cdfe6f13143eab44bd13 SHA512 470ac504091f9826023dd2cc62a1c0169f98bf2d6e9c4c3986e3719d67d02bb587023aa347a3fb26b0d06efae8eccdd05d88ae74556f3819416a6f6c905c4618
 DIST evtest-1.30.tar.gz 25556 BLAKE2B c396940af72faeb27143472cd62c3ada3016fea67184bdac2708a6d6347b07e4cc5a994b5c585263faa00d82003ed4f4859f51ed53a374e985389dc8102f8dff SHA512 ea995c37c0cf8dd8a4c493895bd039e4adac5056a06e9e0275e879ca1e774e98b5cf42bc77f1ad34225b15282cc4edb6dc088cb6fb16f82250bc35fb3975c4bf
 DIST evtest-1.31-mans.tar.gz 1661 BLAKE2B fc7763703299a7129e7332378df6190d42089776e9b2f88d1e9bd42592e2945313046e798862590869f7eb76e56136cec6d575ec9301d5cd9af44b810e13c676 SHA512 b3cd5cc8aaf6620a3243318ae42e807a8819a25082606707787ab8b1ac75f1f6dfc8b544d38a74b489d348981489153c33841ba0b0466ace3e3a83b031754321
 DIST evtest-1.31.tar.gz 17968 BLAKE2B 09ca1cfbac40f84d6715625a932839d8095caeae26b2dcfab73f66651d7d315381ccb92c50aa5b9b68f9495a4e48f2ce6d0fe2b7243b7ec91e4e4acee530e49b SHA512 1657d880c531c6c8407bf7a66ab159a5992c9ab70b840e600e91ad3a7429a07ec2c2f3bca6848614ebbad01a4a5993e43e4388705455f9d31f8b60b06c04a7c4
-EBUILD evtest-1.29.ebuild 965 BLAKE2B 5e8aada1e362e382d2e43229c67e1c150b77e692a8fd0411eabdc9160773df541aeb31418382e4af4fc5e903a4098b727cb7583946a9677b291666068231654d SHA512 87ebd6668836aeab05065eb76d56f14c42ff28985d5ab57b5668dddafc4811e7ae2648042d50db85281bba7e32900da0c64c60c5e115bffaae46f43b641c803f
 EBUILD evtest-1.30.ebuild 1137 BLAKE2B e0dc80254b8be13b6cb5ac242b32f411ee34800119ccfc0df13f35b1ce24d7274fa372f646bcd7b62632bc617602069f9b754705a64da84e0f2c62da2f3474ab SHA512 43300763245c9d70a104185f20f38b70390d2a978d6fc9dfd7f5c10309c4869d61abc04b15c9452fd8281f612e0892262b767e335b61e4ecec672d270b791877
 EBUILD evtest-1.31.ebuild 1014 BLAKE2B 67bce706b3636e29a64a35901a11ec505a0f863cf07bea3d78aed0ace27b422b8c12de9532d4c9c3828e673224c3c8121646e36743b0313119bcbca7414159b7 SHA512 e6e3ae4b6cb3a246ca0c8953ddec187907b3300e535dce3255f1abbbcb9eaf965761cf11886e2acb5846d390073fe0661bd4af610f1ccec3d2be574335a027a8
-MISC metadata.xml 214 BLAKE2B fc5a99766d5c17f43465948f001cb0c4e1cde6863eef7ef8e41cd7cdc0f5b0ad2fd119d2a881320d196f24c28c3e9592c46e1e62a1995e47b5f2a3b4ea965bcd SHA512 ac8342ba1f8eaf027f23e677b348b4da59f5d6b0d9ddf434def5413c6f7c9b3d803fe2c8141fd7aaf8c8d9ac2a0fe800e3d0c41017c28dbd9104e34f83ca24f7
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/evtest/evtest-1.29.ebuild b/app-misc/evtest/evtest-1.29.ebuild
deleted file mode 100644
index e5ee7c50722e..000000000000
--- a/app-misc/evtest/evtest-1.29.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="test program for capturing input device events"
-HOMEPAGE="https://cgit.freedesktop.org/evtest/"
-SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${P}.tar.bz2
-	mirror://gentoo/${P}-mans.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="+xml"
-
-# We bundled the man pages ourselves to avoid xmlto/asciidoc.
-# We need libxml2 for the capture tool.  While at runtime,
-# we have a file that can be used with xsltproc, we don't
-# directly need it ourselves, so don't depend on libxslt.
-RDEPEND="xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# No pretty configure flag :/
-	sed -i -r \
-		-e "s:HAVE_LIBXML=(yes|no):HAVE_LIBXML=$(usex xml):g" \
-		configure.ac || die
-
-	# We pre-compile the man pages.
-	export XMLTO=/bin/true ASCIIDOC=/bin/true
-
-	eautoreconf
-}
diff --git a/app-misc/evtest/metadata.xml b/app-misc/evtest/metadata.xml
index 1021f53d6e8c..6f49eba8f496 100644
--- a/app-misc/evtest/metadata.xml
+++ b/app-misc/evtest/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
- <email>vapier@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index ef81f1ef696c..81402455e04d 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -2,13 +2,8 @@ AUX 0001-lddtree.py-work-around-pyelftools-API-change.patch 698 BLAKE2B 89d5cd05
 AUX pax-utils-1.2.2-linux-2.6.32.patch 2152 BLAKE2B d068e7fbcab2ca3c61dc186f28132e9efa063db05a4a6df1c04aef6f978a6ead67d11a867e99ddab1ca78dd024097cf5e805c3dd95ca6320a0617f4ac607a676 SHA512 3a39e08e327e5389fb4a249dc27049a716695bd310197eafc54b62458e167eba53848e9fa3b0aa05e224a8f468fc130b979d0d314ca1dc8cbb0c5c494d67b352
 AUX pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch 2032 BLAKE2B 29af365d08618cc85ad57dce8a041857f1d04164a4b26c6184a2009b02f09b3ed9977c90031d359492dfd947ba09033d76211f310169207171639a5a189567b1 SHA512 b0e0679c726acc56686b23b6d4720cd5b7e4dff3f007e0443e3ec37a434ffb2def2c351c81ef960bf8e1008769662851017ef9aaedc9b52890578db4d313a54e
 AUX pax-utils-1.2.2-solaris.patch 5673 BLAKE2B af1fe089d469029922b09be19fe2e9d9271f9ee7ceac9826282d2eb3461a656f21c96720cdbc8b9c91661ac23327a8e5053ed7675afd47d7d8a037525a6d992d SHA512 df5cecdafe796fa7616767b93def2cd51d82a8911f7b195ca25048fb93a067a819cd362d3f5b4b02308ce67a688938a40aa2ecb04570d7bf3db83cb9847f62f1
-DIST pax-utils-1.1.6.tar.xz 647308 BLAKE2B 3cec06e1ac9c87a6a020cc550c51a1ada2f0438e2b4c4ab49de74e16ec67bf8c9d6283575bb294fc4729b261c8d7847c82accc2b6a03e03518de935956f5e840 SHA512 c5bdb3ee076c5f4d026f811a59329014c539e3bb3ab45aec92564dcc4abcedaebc50bec55c37aeccfe9e31c554ec7789426fcb3d6f67a8d805843f32c5993f94
 DIST pax-utils-1.1.7.tar.xz 648376 BLAKE2B 676551b2391b2ba27281d26fba61da7d0d277f3b562c9d8365ea5a6b5bfa4327bad66cf1f62cb626f8b6ec3ae693cab713683b81142dd71920f3b6300951f6d2 SHA512 cec176cf5863b15acc058cbd99639f5f456346136d0551ce5875cb66c28dd0f6e7f5077b0c06751a3a68984b5c4386c232d3db8b76aa4f4b326b0b692835fdeb
 DIST pax-utils-1.2.2.tar.xz 655964 BLAKE2B 5e43b52648f1f0cc1f46616ebd9a554cf2e5909292337c84f9ee0e2eceb4879a5f16ca20700e5a16267b38ffea529814949817ea6054cd1b2ea38e267455de00 SHA512 6bafe93f3b84d4595b6adfa09b46a3dd249f309fe836d90115e9aa5fcc7da37b03f743e80719dfe6bcdb739ce6ec3843170a5513e196c348721f850e19d3e38c
-EBUILD pax-utils-1.1.6-r1.ebuild 1637 BLAKE2B fd5791abbc5d4125af031c3edfe4a7dd76c954bc194ebf291c0dbbbada383dd5661befe294e04bf2e6ead1fc802262bf38ed9567348ed3e2f889d7c5cf6d1421 SHA512 bac13439a4dd3124333a1660a616510328d3bd458980ddc70b2fc72944f51dc0d429d5f0fac8d3093b8a20c9f3472be509ff18343988f1cb8b2ba44f476a5d6e
-EBUILD pax-utils-1.1.6.ebuild 1416 BLAKE2B 54c8e272871450f2c7707ad93064259bd3aed467557162f10efb5f454ca6a68cb0e29df65d4988dad129a2c892968c1c1c3696e43ae597b9b192280b1d148cb3 SHA512 74497bc240519378ec564f2374edfe39da3eb79d35666bae424c94b62c24ed65ebeb172bb0b6bf19c1786653b82da14eb354d9bc9126f505875c3c5644163925
 EBUILD pax-utils-1.1.7.ebuild 1484 BLAKE2B dbad63c811298b53512fa3e104e25068906855df00a43b0d75dc3f6c7092d3077742a08a5ab69a30209a7e17deaec55f2c453e54a16345be67aff722dd792376 SHA512 b4974eb1d8e2c1a7958cdbd8ebc33c5120fe84b6050094400bb86ec7ba8c883a2b06171c8aa8a7cc7f66bd5a18057cabfa6a3afc1662cb5b4c6bca95da39592b
-EBUILD pax-utils-1.2.2-r1.ebuild 1572 BLAKE2B f6455865f9c9d27addf770f570606de38a4b8c33fec11f64e39a7bccfc0f4fd1726a86e2bd93b83e83844ef7ae2f33e68c904ed3e2a6651014db0ce19fb82c16 SHA512 72474cd91e454c095154b8841410b922cf120370b4b2cb1a5451bcb71a6c94a880d5373b6fc50157e2e4e5a7e32a0eb3df250a71d64af533c7989e5ad585650a
 EBUILD pax-utils-1.2.2-r2.ebuild 1648 BLAKE2B 4532b7cacf3ec1bba302db18025a9b1e160b29e7f404ca6a53e2791b44f843dafdea1606671242e83d33a6a276d68a5ee97c57530b0f477bf1a07b542da13d09 SHA512 9da01fc5f44e983de46d7ec2003d05ba295e762a573a2db9c4fc722fe4e7dac5ff4fd4e9d86a00ce604e19fa01e63e8735735c02caa7d7a64622fd39a561adc9
-EBUILD pax-utils-1.2.2.ebuild 1497 BLAKE2B b152915f9d78997aeb946918c5d307fa72ac1378a9794f66bca7deda02a73f305bcbb54df312c9031d4daf1c32b2ff3b714b5d2a5fd27366dc1de6f8b0b36657 SHA512 1e8c25973b57212ac6ccea812e20e444fa45488acf5def5bc661aa4b23a8cf50e48815f9470febab3a825bb06582824f009aa7abf2a18b0c5d02de4eea8b30fd
-MISC metadata.xml 584 BLAKE2B e0c70243f21152b056dfddb161b54650b14c543b478293aed26a53e47f4e318c2dd866d3a48279829855d26177c117bcd6dd6a64eb2bb5711da77f44df2967eb SHA512 d8458090413d52aaa38b6867edf0a9f996e08b36f9750bfa2469c2aa7d6b0718157feace3dbbb3c63c2795e977ddd6a9c637223192dff90e8ca87facb730bdf4
+MISC metadata.xml 489 BLAKE2B 2fcc27d5145a496d5bec7bf953b4007760a85471f66027b6a842ac5907e063522189ca5c107e8080e8b43aa9acceebc228f796d96d9b3b35c7424148f60dbcb7 SHA512 ada40ae17d53809394f87a89876b52df9c1c88ac231282cb9cf9f27e9314d3facc65f95c20ea03b3e994e19dbaae8fa5dcd20684b52812aaece02da76f089bc6
diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml
index 73cd9cec1c9f..0e2626a05dc6 100644
--- a/app-misc/pax-utils/metadata.xml
+++ b/app-misc/pax-utils/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-    <description>Maintainer</description>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files.</longdescription>
   <use>
     <flag name="python">Install a more powerful/faster version of lddtree</flag>
diff --git a/app-misc/pax-utils/pax-utils-1.1.6-r1.ebuild b/app-misc/pax-utils/pax-utils-1.1.6-r1.ebuild
deleted file mode 100644
index e5a993a7e987..000000000000
--- a/app-misc/pax-utils/pax-utils-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~solar/pax/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? ( dev-python/pyelftools )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/0001-lddtree.py-work-around-pyelftools-API-change.patch"
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-}
diff --git a/app-misc/pax-utils/pax-utils-1.1.6.ebuild b/app-misc/pax-utils/pax-utils-1.1.6.ebuild
deleted file mode 100644
index 3696902fdd35..000000000000
--- a/app-misc/pax-utils/pax-utils-1.1.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~solar/pax/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? ( dev-python/pyelftools )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-}
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild
deleted file mode 100644
index ba368f7be676..000000000000
--- a/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? ( dev-python/pyelftools )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-PATCHES=("${FILESDIR}"/${P}-scanelf-fix-out-of-bounds-access-in-ia64.patch)
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-}
diff --git a/app-misc/pax-utils/pax-utils-1.2.2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2.ebuild
deleted file mode 100644
index b40fc4f31b49..000000000000
--- a/app-misc/pax-utils/pax-utils-1.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? ( dev-python/pyelftools )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-}
diff --git a/app-misc/supercat/Manifest b/app-misc/supercat/Manifest
index 6ec608e91d39..f5eb20f0d607 100644
--- a/app-misc/supercat/Manifest
+++ b/app-misc/supercat/Manifest
@@ -1,4 +1,4 @@
 DIST supercat-0.5.5.tar.gz 103545 BLAKE2B dfe8b823307fe39762d050e8676ff3f296b0ba206a618695fd3c699bc51d1c52cc552764ba52c45cc2eb0af2e8565a5dc4f86871489f082f15ba579aa80a51f5 SHA512 24989935ea7b863638165f7102ae511b9be00ff4399f433fc9ec2fc33543eea907b8bd46e819d815344c8c8467bc702b9a5b32aa55bd21be2670237fa1d711de
 EBUILD supercat-0.5.5-r1.ebuild 559 BLAKE2B 57c084a098cd29b363358f0a7b67df5c28dd9b18655a6125484eeff84f5b578cfbc471b95abcbffce092f0b2afcb93e6a5ad9d22129990e7ff55494bb746d800 SHA512 49e8e63eef13a42cbb81e3ae752f6b6498c26c98b9c14de3d097d969679ec8e61a562bccf8d42179bb2a69c53efead3d66cae89d2afcbc2ade3fdadd9fb91998
-EBUILD supercat-0.5.5-r2.ebuild 480 BLAKE2B 5d3df04f978fc96d75c73b43be111694b70f452da064c957d840953bbd6022fd6f4dd6394b3ab5efe39fab07266770e0c1a3c58e1c8c13933d293baaa302b2c4 SHA512 83fb29c6ee6859e4ba73753a77c8e8f89a4f0702337f742730178195aa167356f6d6125cc26eb5010ff0b594515586935f7bedee05d3c226d16efefe960d618e
+EBUILD supercat-0.5.5-r2.ebuild 479 BLAKE2B 7a8c74f6370a77713935ba89e8146a891047ac7e21c25b1bb23f0e9847e71f693254736f5bc199533f2e456b590e9152b587dac7c889c883ef312d88082408de SHA512 c99d305b65374271096b7b76f688e92f1f51846dcca85b80344a86c7ad3ac8edaf410c4b14f23cad50d55c9098ae8d0d336d13dbfa0daf7e29ceffee0c1ff1dc
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/supercat/supercat-0.5.5-r2.ebuild b/app-misc/supercat/supercat-0.5.5-r2.ebuild
index df1963a767e0..1047bd7acd06 100644
--- a/app-misc/supercat/supercat-0.5.5-r2.ebuild
+++ b/app-misc/supercat/supercat-0.5.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 src_configure() {
 	econf --with-system-directory="${EPREFIX}/etc/supercat"