gentoo resync : 23.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-23 07:00:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-23 07:00:28 +0100
commit: e23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch)
tree: 5a4ac448a3b288b731c24d947e0ce52df3cab07b /sys-apps
parent: 8187a741807f3e9a9e26304973cf18087dcf2560 (diff)
63 files changed, 556 insertions, 1438 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fa8d0cbe41e8..2f2dcdacf97f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index df626d41dde9..97e307acdcf1 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,5 @@
-AUX acl-2.2.52-xattr_header.patch 4777 BLAKE2B 8903fa3bcee96d43f9e142d70ee78fa59b9a6dc3618fb853352caff263afd05a83afa77f4ed70ecb010b32d113597a8c40ea711aeda14ac7bf387a0b407fb8ed SHA512 356eaedccba561d92f5a518dc1cba27c5e525bd9063ea852ed1f0597bb379996d7c56ae97c4a19e20e569dfe5cb2406b32453866f40466680e6fdc63e5a75906
 DIST acl-2.2.52.src.tar.gz 386604 BLAKE2B e8b7b555cec93f84579aac846ce64235e356d73770844e88898564d1742fcf3d7c314511f0321aefbad33bdd85800406102178e8ab6414bc9c883891442d3188 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7
-EBUILD acl-2.2.52-r1.ebuild 1403 BLAKE2B 14b7b9e8d4aeb17c6dfad20b4c8369da6880bae09aafe811bbd22238d22c960e2ac04e25e258522cad7312586e657078c60837b7d44f395c0ef63d624cb8a7e9 SHA512 43e6f0ddceaf2da55a1bc5bb39b1a5ec3b9d6270c9d47a841b6341881fdef966d5e9659963e9bcbaf025cdbd4ac62efc8eb8016d9107d484cd5119930c1f4b98
-EBUILD acl-2.2.52-r2.ebuild 1523 BLAKE2B 993d5d0790231e9afb2777812000c916519c307a8d1b9490e7d0b2d96c7d44ccc55d7a5247690c58510554bc948483e9de86f96881c1bb3bf4da81f8bfdab6f4 SHA512 d4ae75c33c5f93ead215360d69d7458ff1f6ea85aedb444a1ecd513c433da6f7826ddfc4942d8dbc2dcaecc2055b080cf6c257e7a7979c6771ac775a883e3f3a
+DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
+EBUILD acl-2.2.52-r1.ebuild 1377 BLAKE2B 8c134c96e96ea7970deb77a16edcc73d9171fcc71b6ddc417125062bb803c3e1064b23bcb31773d5536cfa2ba750765855fcb50531e91a6071c9fea9953b240c SHA512 d807c7634485af07d7255cce0ac3d876dc0df17e3b1e973e55d8ec3239d80851a622a3ec2c6c8e70caa648acb89c6fe0fd45c882289477346f11f48f282a1b99
+EBUILD acl-2.2.53.ebuild 1074 BLAKE2B 28a51d83257e314535b576b8c5b9d5c1764f7f4f3a6ce3a5f695df5625884d2a8252195425edaa1eb0a78946a82b51d627fef0123eaa6022636dd5521e963985 SHA512 64c946db86fd5d7eb9a9b5c50cef290407a535266dfdb31665e672b7b8af1c416d427fa304bfa68cdf60fa97ed75f79c1dabf814f88a9b530721799f0f3e2f6f
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index 762f4a985238..64fd600c0cc1 100644
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils libtool toolchain-funcs multilib-minimal
 
 DESCRIPTION="access control list utilities, libraries and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-apps/acl/acl-2.2.52-r2.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 4bc0d2945f1c..11b1ee043a3e 100644
--- a/sys-apps/acl/acl-2.2.52-r2.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-inherit eutils libtool ltprune toolchain-funcs multilib-minimal
+inherit libtool ltprune toolchain-funcs multilib-minimal
 
 DESCRIPTION="access control list utilities, libraries and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -20,41 +20,23 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-xattr_header.patch"
-)
-
 src_prepare() {
 	default
-
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die
-	strip-linguas po
 	elibtoolize #580792
-
-	# same as https://savannah.nongnu.org/bugs/index.php?39736
-	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
-		--enable-shared $(use_enable static-libs static)
+		$(use_enable static-libs static)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable nls gettext)
+		$(use_enable nls)
 	)
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib
+	default
 
 	# move shared libs to /
 	gen_usr_ldscript -a acl
diff --git a/sys-apps/acl/files/acl-2.2.52-xattr_header.patch b/sys-apps/acl/files/acl-2.2.52-xattr_header.patch
deleted file mode 100644
index 052941f92c82..000000000000
--- a/sys-apps/acl/files/acl-2.2.52-xattr_header.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-Backported from:
-http://git.savannah.nongnu.org/cgit/acl.git/commit/?id=79f563779b9b9ba89cc2352d70e3cdf27acff513
-
---- acl-2.2.52/libacl/acl_delete_def_file.c
-+++ acl-2.2.52/libacl/acl_delete_def_file.c
-@@ -20,11 +20,11 @@
- */
- 
- #include <sys/types.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "byteorder.h"
- #include "acl_ea.h"
- #include "config.h"
--
-+#include "libacl.h"
- 
- /* 23.4.8 */
- int
---- acl-2.2.52/libacl/acl_extended_fd.c
-+++ acl-2.2.52/libacl/acl_extended_fd.c
-@@ -20,13 +20,12 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- 
- #include "byteorder.h"
- #include "acl_ea.h"
- 
--
- int
- acl_extended_fd(int fd)
- {
---- acl-2.2.52/libacl/__acl_extended_file.c
-+++ acl-2.2.52/libacl/__acl_extended_file.c
-@@ -20,14 +20,13 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- 
- #include "byteorder.h"
- #include "acl_ea.h"
- #include "__acl_extended_file.h"
- 
--
- int
- __acl_extended_file(const char *path_p,
- 		    ssize_t (*fun)(const char *, const char *,
---- acl-2.2.52/libacl/acl_extended_file.c
-+++ acl-2.2.52/libacl/acl_extended_file.c
-@@ -20,7 +20,7 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- 
- #include "__acl_extended_file.h"
---- acl-2.2.52/libacl/acl_extended_file_nofollow.c
-+++ acl-2.2.52/libacl/acl_extended_file_nofollow.c
-@@ -20,7 +20,7 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- 
- #include "__acl_extended_file.h"
---- acl-2.2.52/libacl/acl_get_fd.c
-+++ acl-2.2.52/libacl/acl_get_fd.c
-@@ -23,7 +23,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <stdio.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <acl/libacl.h>
- #include "libacl.h"
- #include "__acl_from_xattr.h"
-@@ -31,7 +31,6 @@
- #include "byteorder.h"
- #include "acl_ea.h"
- 
--
- /* 23.4.15 */
- acl_t
- acl_get_fd(int fd)
---- acl-2.2.52/libacl/acl_get_file.c
-+++ acl-2.2.52/libacl/acl_get_file.c
-@@ -23,7 +23,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <stdio.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <acl/libacl.h>
- #include "libacl.h"
- #include "__acl_from_xattr.h"
-@@ -31,7 +31,6 @@
- #include "byteorder.h"
- #include "acl_ea.h"
- 
--
- /* 23.4.16 */
- acl_t
- acl_get_file(const char *path_p, acl_type_t type)
---- acl-2.2.52/libacl/acl_set_fd.c
-+++ acl-2.2.52/libacl/acl_set_fd.c
-@@ -20,7 +20,7 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- #include "__acl_to_xattr.h"
- 
---- acl-2.2.52/libacl/acl_set_file.c
-+++ acl-2.2.52/libacl/acl_set_file.c
-@@ -22,7 +22,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- #include "__acl_to_xattr.h"
- 
---- acl-2.2.52/libacl/libacl.h
-+++ acl-2.2.52/libacl/libacl.h
-@@ -17,8 +17,13 @@
- 
- #include <errno.h>
- #include <sys/acl.h>
-+#include <errno.h>
- #include "libobj.h"
- 
-+#ifndef ENOATTR
-+# define ENOATTR ENODATA
-+#endif
-+
- typedef unsigned int permset_t;
- 
- #define ACL_PERM_NONE		(0x0000)
---- acl-2.2.52/m4/package_attrdev.m4
-+++ acl-2.2.52/m4/package_attrdev.m4
-@@ -12,17 +12,6 @@
- dnl
- dnl You should have received a copy of the GNU General Public License
- dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
--AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
--  [ AC_CHECK_HEADERS([attr/xattr.h])
--    if test "$ac_cv_header_attr_xattr_h" != "yes"; then
--        echo
--        echo 'FATAL ERROR: attr/xattr.h does not exist.'
--        echo 'Install the extended attributes (attr) development package.'
--        echo 'Alternatively, run "make install-dev" from the attr source.'
--        exit 1
--    fi
--  ])
--
- AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
-   [ AC_CHECK_HEADERS([attr/error_context.h])
-     if test "$ac_cv_header_attr_error_context_h" != "yes"; then
---- acl-2.2.52/configure
-+++ acl-2.2.52/configure
-@@ -12416,26 +12416,6 @@
-     fi
- 
- 
-- for ac_header in attr/xattr.h
--do :
--  ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
--if test "x$ac_cv_header_attr_xattr_h" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_ATTR_XATTR_H 1
--_ACEOF
--
--fi
--
--done
--
--    if test "$ac_cv_header_attr_xattr_h" != "yes"; then
--        echo
--        echo 'FATAL ERROR: attr/xattr.h does not exist.'
--        echo 'Install the extended attributes (attr) development package.'
--        echo 'Alternatively, run "make install-dev" from the attr source.'
--        exit 1
--    fi
--
-  for ac_header in attr/error_context.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "attr/error_context.h" "ac_cv_header_attr_error_context_h" "$ac_includes_default"
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index b14728106a86..8b7868d02745 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,6 +1,7 @@
-AUX attr-2.4.48-perl-5.26.patch 635 BLAKE2B 474a08f4dc2ebd1f6c234461645985dc1dbe5bbd33d8a073a76a74846a3dbefd27dc6803f3f671c9c143e6dfa840e7f9df2e763026895e12d9ac894b51155453 SHA512 1a04e4e3fd733dd229049c5c1e1300a5fb7bf9ff90d5ac51fd9a636fcf40b833073c9c9adae9df46f492e07933a136faa775b22b351f04ae6afa85332cfd4f45
+AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552004c7b7ce224898ffd8a362342703225e7015f896d2c97013194ea3a8e61768174265b42d6dc565187aaf1712062 SHA512 af131267a4cc22322df8234ce4abf8a27f917aeb801a423696a51f935ee40bf155206cf40b7f510849e1a276808502ab48ade0a520b3f06969c5df2415055fe1
+AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.47.src.tar.gz 343692 BLAKE2B af4d509f156cb2e693f0faebf1a6cfb4a27cbdd3fd7f8b436cc01419c905ff9ac36214ada2ca8269e49c2e276917b1178dcda97050cf25cecd65382f22bdf9bb SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831
-DIST attr-2.4.48.tar.xz 346292 BLAKE2B eeffc17bf485749b5d0a1fce4ac3702c33a0bacce3ad635400e8b0b52981f14c5e750ef570f8fd19657e460e51e6e09f972134ef8a3e6efc15c2a7203682df75 SHA512 78b8160303aec9e01f63b5cf725a9e16432ff1d4a6e0065ce1a52715ae1266572e0c01f9be25c938c484deea288fdff2ce27981c3aea578753ad854084957e8b
+DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
 EBUILD attr-2.4.47-r2.ebuild 1721 BLAKE2B 59cb46b36bdb2ad79feb1fb4249940f05fd9020580db49778cb7c64e3358b7f7480473e17c8527c1c22f4a191a217073393bba98901cf1a8a6f71b401abde6b2 SHA512 8c6415eaf04fc1e2fcc42fef529db9db3536b6e71ac1acb652ca4e2b1b053e1a1f6e7061dd903071ed28e433a21c4939eeda087a5c97d9b490419ac4667b3d9d
-EBUILD attr-2.4.48.ebuild 1441 BLAKE2B ec4c81afa4dece6a95f91e3851db45ec99446d0ad57243d4e2f6abb8a9adce2b0908b24b14bb5acc324f0e5eb2c7ac85d5ca0f027786fdb96cf6bf2bfe146316 SHA512 fd786dabba25d3d57f5b66a093e9ab4fabf9a7432c5f9f00653c83827a069bb69d5668d5db8f08abf511119cb6615bb1205141c8e1c340a386468e0fb823604d
+EBUILD attr-2.4.48-r2.ebuild 2107 BLAKE2B 30edbd1e955c03f5d4423da4fb81120ac82d0071d92c72b97f2468dd0a4bdd5bea2561412c7d38d1fe3cab49a3fbd3b0c9e53fbc1cb2e92ee6c6dd6f4c7a16da SHA512 1541b465d7a55e730cb81d059fe507df05d3ead02c1322643f22966a844469a2727da1c475ea1f295228bea4bd7e45f1a3bf2480b717eb1cf904e09f2569d82d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/attr/attr-2.4.48.ebuild b/sys-apps/attr/attr-2.4.48-r2.ebuild
index 378bc2b6cd46..0b5b137eba15 100644
--- a/sys-apps/attr/attr-2.4.48.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r2.ebuild
@@ -1,25 +1,20 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 inherit libtool ltprune toolchain-funcs multilib-minimal
 
 DESCRIPTION="Extended attributes tools"
 HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-# Self-hosting as savannah does not provide a tarball on their download
-# area and the tarball in their git repo requires autoreconf to be run.
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="debug static-libs"
+IUSE="debug nls static-libs"
 
-DEPEND="
-	sys-devel/autoconf
-	sys-devel/gettext
-"
+DEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-perl-5.26.patch"
@@ -39,7 +34,9 @@ multilib_src_configure() {
 
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
-		--enable-shared $(use_enable static-libs static)
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable nls)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable debug)
 	)
@@ -49,10 +46,34 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
+	# Sanity check until we track down why this is happening. #644048
+	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
+	if [[ -e ${lib} ]] ; then
+		local versions=$(readelf -V "${lib}")
+		local symbols=$(readelf -sW "${lib}")
+		if [[ "${versions}" != *"ATTR_1.0"* || \
+		      "${versions}" != *"ATTR_1.1"* || \
+		      "${versions}" != *"ATTR_1.2"* || \
+		      "${versions}" != *"ATTR_1.3"* || \
+		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
+			echo "# readelf -V ${lib}"
+			echo "${versions}"
+			echo "# readelf -sW ${lib}"
+			echo "${symbols}"
+			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+		else
+			einfo "${lib} passed symbol checks"
+		fi
+	fi
+
 	if multilib_is_native_abi; then
 		# we install attr into /bin, so we need the shared lib with it
 		gen_usr_ldscript -a attr
 	fi
+
+	# Add a wrapper until people upgrade.
+	insinto /usr/include/attr
+	newins "${FILESDIR}"/xattr-shim.h xattr.h
 }
 
 multilib_src_install_all() {
diff --git a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
index 6f3d2a22c140..49b4c1a57665 100644
--- a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
+++ b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
@@ -1,13 +1,17 @@
+From 406eab7aa09da9df787a964d3c152c0bda6e23c4 Mon Sep 17 00:00:00 2001
+From: Troy Dawson <tdawson@redhat.com>
+Date: Mon, 24 Jul 2017 14:42:06 +0200
+Subject: [PATCH attr] test: escape left brace in a regex in test/run
+
 ... to fix test-suite failure with perl-5.26.0
 
 Bug: https://bugzilla.redhat.com/1473853
-Upstream: http://lists.nongnu.org/archive/html/acl-devel/2017-07/msg00001.html
 ---
  test/run | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/test/run b/test/run
-index 4b1f8d0..07e916c 100755
+index 4b1f8d0d6134..07e916c41947 100755
 --- a/test/run
 +++ b/test/run
 @@ -106,7 +106,7 @@ for (;;) {
@@ -20,4 +24,4 @@ index 4b1f8d0..07e916c 100755
    if (defined $line) {
      if ($line =~ s/^\s*< ?//) {
 -- 
-2.13.0
-\ No newline at end of file
+2.16.1
diff --git a/sys-apps/attr/files/xattr-shim.h b/sys-apps/attr/files/xattr-shim.h
new file mode 100644
index 000000000000..88a12354318d
--- /dev/null
+++ b/sys-apps/attr/files/xattr-shim.h
@@ -0,0 +1,9 @@
+/* Small shim until we update all packages. */
+#ifndef __XATTR_H__
+#define __XATTR_H__
+#include <sys/xattr.h>
+#warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>"
+# ifndef ENOATTR
+#  define ENOATTR ENODATA
+# endif /* ENOATTR */
+#endif
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 8b35b2acfaad..9d7302358282 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,9 +1,6 @@
 AUX diffutils-3.5-fix_macros.patch 928 BLAKE2B caa78e408cfcdf299277d5f8ee24be3d255571377d7c711bd90cd0ed710016929d7b9a68934d852fc9c9410b73e144259a2cc2264b2751ca444403b9ae37c065 SHA512 ad0cff0aea2ac560b3c0171141b6d1975d2ffb8684a20697464471355cdb161dea5967b72732b4de5ff9375a2ba2f29aae532967abe5311820de817afaf354ba
-DIST diffutils-3.3.tar.xz 1197832 BLAKE2B 8819e84f6d1d9ae30dccba01934ba506fd9e2033cc7ac8e2dc827868f6b8ce54c76129167d8754215d0637f9e731ca1176ffa83abd80eb95e37a29776e29afa1 SHA512 b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
-EBUILD diffutils-3.3.ebuild 1437 BLAKE2B c2fc69bfbfa2dfd0953b9f1cb80a4a7a4980740dbc5cbba631e3311e4ee548fcbee51c3c191709b890a90e8f46409689c217762a64cbdef672383bcca23c4aff SHA512 d0f286f68b667e5049bd0713336308f43f6fd75353e285d9753a2f1d43a94e218beca55a6df58d834dacc968c672d64e0daa0229c3654da4239da57c99004bcf
-EBUILD diffutils-3.5.ebuild 1247 BLAKE2B 49832f42580e2660ec1d772997044d9634549008507213efb82085d83bedc3b0ee41520bc32f470d0015983226ea8fa00e80cbbaaa015f41c2822bffb6c12dd3 SHA512 f3a2ae443bd782fd4c2079ee0817771ee1b07ff8b45c86012de2440895accf9248719c966b253e7df7a1162926dd1a62b584abc2e53325b997f755db1ce768ef
+EBUILD diffutils-3.5.ebuild 1246 BLAKE2B a0fbe671325f6a5593ebf54a84a97115464167f6279290baaa4582b8c7232defe0224c98ab44c3e12c6c67cdd19306ead9be32c89a3081c6721dfcd07f6eb73f SHA512 8b9f2c83ad6d6c2b2ac005396127d9f1bea5962c9455aa4bf7b962ce76cf36d05d3c08764dcf3b89c4863b3b9bd352fac04c7fb0bf54d098d46b84045a389d8b
 EBUILD diffutils-3.6-r1.ebuild 1262 BLAKE2B 84ddcf13a502dea3e94ef2a3b3cc0fccad1314d058d8f3f4776c8c1f7afdf03b523c0dbb9cad4f7c6ca5e8d85bb2fe166b8ca9259b4f7cb68b13f13d1168af6a SHA512 7b044025f77a91eab38517943c6cecadb2da6309001cde7160e113d39a37af62c1a3373b9ea4d8925301bb6d179f1653a647129932e431ec5ae28a2c2d2cca13
-EBUILD diffutils-3.6.ebuild 1166 BLAKE2B d4c28e6a0eab8b9c66fa6c07199c4ee6d7b862e0c4fdee27dc2bac56e8bb3a0ba87e7ca91605f12bacd9b3bc2695cb4987523465003009bfb20674dc10ffdd89 SHA512 2ac74317252603d3da51aa5a038ad3da40c77ac94a53bea59e82e93c66a64a7dff87c10beb8ba469e83c016f57cbf8fd23d5b08a87d92939947547916387bd9a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.3.ebuild b/sys-apps/diffutils/diffutils-3.3.ebuild
deleted file mode 100644
index ebe4d3023998..000000000000
--- a/sys-apps/diffutils/diffutils-3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu-alpha/diffutils/${P}.tar.xz
-	mirror://gnu/diffutils/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	# Disable gnulib build test that has no impact on the source.
-	# Re-enable w/next version bump (and gnulib is updated). #554728
-	[[ ${PV} != "3.3" ]] && die "re-enable test #554728"
-	echo 'exit 0' > gnulib-tests/test-update-copyright.sh || die
-
-	sed -i 's:@mkdir_p@:@MKDIR_P@:g' po/Makefile.in.in || die #464604
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/" \
-		$(use_enable nls)
-}
-
-src_test() {
-	# explicitly allow parallel testing
-	emake check
-}
diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
index 5a731d693b20..af38207bd6b3 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.6.ebuild b/sys-apps/diffutils/diffutils-3.6.ebuild
deleted file mode 100644
index 58f25710df80..000000000000
--- a/sys-apps/diffutils/diffutils-3.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	mirror://gnu-alpha/diffutils/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# explicitly allow parallel testing
-	emake check
-}
diff --git a/sys-apps/duc/Manifest b/sys-apps/duc/Manifest
index 3fef843eea77..8c455b2048af 100644
--- a/sys-apps/duc/Manifest
+++ b/sys-apps/duc/Manifest
@@ -2,6 +2,6 @@ AUX duc-1.4.1-tinfo.patch 751 BLAKE2B 2928f2a12dc8755c5b43ce8255958ceac4b85dadd7
 DIST duc-1.4.1.tar.gz 325689 BLAKE2B 1e23204b60d1dd67eb094c1152c5056d0abc1fc6037a3811df5be18cbc4d61ccd2077b175f8f75559f368e2633476990e0c453cf88cff03c8aa3fc1796a42440 SHA512 88aa8f51651adf019c3a91c83eca308b822ff7569d6f6d30cf91338740ec9b0bd21c4f5dd783cf46c8d67aad6b03ad908cd7ed472e5db6feaf66ee02582d9f88
 DIST duc-1.4.3.tar.gz 363507 BLAKE2B 8d4364d48c247d7a83c8c5dd900b1c36ec78c68fa7d090e178a0e3209583e433c2e459d192f65ac350038c7e0d5a57df2c5c0d649cc9f554d7af74ad960c8db5 SHA512 5eb3e862e7003838e012dd1faab507a9b58607b77bd2af70a662005b6e4008ac44d1fb2e17b99da8e42ddfadb1cede2a468144ace7a72c12d0825fc7df4d18cd
 EBUILD duc-1.4.1-r1.ebuild 1749 BLAKE2B 17bba3460f3e11451315cde56b1428e53c1a43f405f47037edff35bdf8fa6af3018112aae6318fdbd78a07ec99c0a250cee01b936459bd60e42183413e0a9a35 SHA512 341c0fc7bdc58c3326e96ed1f924aedeba77d67ddbc7c6d7ff227bfb01bc8eb0594c2ee169a674e4ffb64eba17d422949d8e70a5b37a1053b89e9d32dd424808
-EBUILD duc-1.4.3.ebuild 1800 BLAKE2B 9a4d39aa899f8e604de6d317e3a194c0a5eecd95044589168d6ce972625689b520c2d64bfda9e29bf030090daf51395b30ee753c06a0d61e5d08c5c3906adf25 SHA512 44a8972a14c6efed140ff0e5d72191f1ce76dd80c649946abe8ef8007df0f1a9119de7ed45041bd26509c9d3a0ee57842990c07ae966be579c32f3dfeea8732b
-EBUILD duc-9999.ebuild 1800 BLAKE2B 9a4d39aa899f8e604de6d317e3a194c0a5eecd95044589168d6ce972625689b520c2d64bfda9e29bf030090daf51395b30ee753c06a0d61e5d08c5c3906adf25 SHA512 44a8972a14c6efed140ff0e5d72191f1ce76dd80c649946abe8ef8007df0f1a9119de7ed45041bd26509c9d3a0ee57842990c07ae966be579c32f3dfeea8732b
+EBUILD duc-1.4.3-r1.ebuild 1802 BLAKE2B 579ae303743de52fad8e72a909dab568e6fb746c4846d9b94e54df5e32d0b9ec9b8a512d95c3746e934b7ffe86e125e894a4164f4149107023dd9ff86097ac78 SHA512 f02b1de439393de92acf3a987725e68b6fec294d2694e61f3387cda80fb601f955687c0dc27f7946d13ad3f17f8fec69796e0263fd24d89b4ca5fb7a02db2af8
+EBUILD duc-9999.ebuild 1802 BLAKE2B 579ae303743de52fad8e72a909dab568e6fb746c4846d9b94e54df5e32d0b9ec9b8a512d95c3746e934b7ffe86e125e894a4164f4149107023dd9ff86097ac78 SHA512 f02b1de439393de92acf3a987725e68b6fec294d2694e61f3387cda80fb601f955687c0dc27f7946d13ad3f17f8fec69796e0263fd24d89b4ca5fb7a02db2af8
 MISC metadata.xml 899 BLAKE2B 390fd22c6c48feb24433dee58f2f7b96ea75ea41fd77e35222e68f8cb7cb5bafb694af00074a98c0a18a50359ce635fb814de4d12798c5349a1ad8cc99880eea SHA512 44329c606478e5335f5566e9a2b8660e4135c77e25c769916fa0a10129a097eec1820e154bcf6edc785c579fbb8273e21d8b36d114d077f642f9cffd4df56c6f
diff --git a/sys-apps/duc/duc-1.4.3.ebuild b/sys-apps/duc/duc-1.4.3-r1.ebuild
index 55fa313bfe3d..0c79dbc7abe7 100644
--- a/sys-apps/duc/duc-1.4.3.ebuild
+++ b/sys-apps/duc/duc-1.4.3-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 		)
 		!X? ( >=media-libs/glfw-3.0 )
 	)
-	leveldb? ( dev-libs/leveldb )
+	leveldb? ( dev-libs/leveldb:= )
 	ncurses? ( sys-libs/ncurses:= )
 	sqlite? ( dev-db/sqlite:3 )
 	tokyocabinet? ( dev-db/tokyocabinet )
diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild
index 55fa313bfe3d..0c79dbc7abe7 100644
--- a/sys-apps/duc/duc-9999.ebuild
+++ b/sys-apps/duc/duc-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 		)
 		!X? ( >=media-libs/glfw-3.0 )
 	)
-	leveldb? ( dev-libs/leveldb )
+	leveldb? ( dev-libs/leveldb:= )
 	ncurses? ( sys-libs/ncurses:= )
 	sqlite? ( dev-db/sqlite:3 )
 	tokyocabinet? ( dev-db/tokyocabinet )
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 6fc04b24537f..e476ebf17e40 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,9 +1,11 @@
 DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d19d02c09b6370b1cf92c5c8a6e97f5048c98dfbb3a72b8c5889302538d8f11b9771120724b53949f9aedd11c6 SHA512 d0f881b88379b959cd34949c924b0e4d4fb1af0873192cdf8ec9cc2d2d677a4de13021efabb0a1aea1932ef38a6952d9f3eb040c478a9af770054a6170777789
 DIST ethtool-4.15.tar.xz 219408 BLAKE2B 7667f3e24f62c6dbaeb2590e79b59198d15ee44a46440c9af917154a5e5b6fde5f29b88ada03fdc195a642c2585c16ae503cf04b1be941d98413a596e4396ee4 SHA512 7ffd76b17b56de4182a14c2a77bf3026715f4af4c60809aed192f5631cb72173ed3c5d451e54711a73b65fee8339d58c857e83ddf60b85057bfed20863476527
 DIST ethtool-4.16.tar.xz 220676 BLAKE2B 12eb2e69493bb83b3789747a8019e3f8b7d6d39dbff7b1fc5fa6352943334881dd47c35d355d53a07ba517e91663aa623afb5ecdc1a1f57137dd44f20f492954 SHA512 c0cd28ca34e7fdc9af3335fd0b666b4b879ecbaf0c0bccf032aa36fdd66cbb01b6ddf16c6b60823d46a81f9b5f377047422ac88cc7cd0a869e239a3171966c66
+DIST ethtool-4.17.tar.xz 221516 BLAKE2B f2548b3cc89898024b884c94c2b6be110c39aac450f0f2e2bbf7b2e4908318d5110e6cfbc5f19073d0b930970ad768aad8549fb8bce432e14edd7a125084c9a0 SHA512 9c8f72e32c480ec4ece7ca49acb8af668989e1e32fb1e6b884bbb6f2ffefc2a5241b5f278766e51ab01772b4f7437d7556354583c5bb63fc59ac6daecb046e8e
 DIST ethtool-4.8.tar.xz 214932 BLAKE2B bbfbc7eb23a7fe057e28f22fad962bc8b46c581e4c6fc35612c345863b300478232b95569a2e35fd26f76eb48f824bdf7dcd0cdb8bdcc136e7494c5d39361f2b SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96
 EBUILD ethtool-4.13.ebuild 453 BLAKE2B 039558a1279ee3cbfb7c11005761705fd30f8248d97cd79d089be6d7e9b27aec8f9cba28ed58bc6f80e2a33877dee10e67ddf09211d27b30371e2e2fffdfb81c SHA512 46b487cd70ed8f5bfb656a9371ef185f46761c4dcc1ad2f9cbbc20abbc5c9e2d32f6f3a52f0ae709b2444ab8514d4ada9cf66b5fdec88c342bf6ca367cd525a4
 EBUILD ethtool-4.15.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.16.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
+EBUILD ethtool-4.17.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.8.ebuild 453 BLAKE2B 46fd2c76b13b3ac09bf91980870c7eb70a2600ea46d3146b006b54d1b21dd72bd50cd01f29504ae9329db8be393fce2cf1bd540a006278e0d2530278b3a84ca7 SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2
 MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
diff --git a/sys-apps/ethtool/ethtool-4.17.ebuild b/sys-apps/ethtool/ethtool-4.17.ebuild
new file mode 100644
index 000000000000..373b38775050
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-4.17.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index 5487b17b1360..4c7e674cb09a 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -61,4 +61,4 @@ DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST zoneinfo_compiled-0.4.5.crate 7260 BLAKE2B fe461bb585de1a606e8fe800b4df763a988be643a1499e6d4ec182cdd43ea0721ebbea30ed70da4b79fedb2376d2328c4a2bfff993a13046427f85465ad73225 SHA512 1b4248c68d12e2edab047e6067876e5d662b9dc5cf9bab33188082cee0b7aff6162d6288dcad4b08da85baeccbb0f8df81e426448aeda7027544518e3e7850dc
 EBUILD exa-0.8.0.ebuild 1669 BLAKE2B f2ad99b840a0dbd3b05fce4f09db569020f6d7d9a51879e5ddb691bb0610bf0f3c350e6cc80b1e519adf5aa8d5fa0f72a6b3abc5a40a80c5f7c1a84d5776afa6 SHA512 4aee6693ae96f120843150ef215b25bf860d9dc1d2527d764c565fb840d1443399a8ba2b8757e46b6e0746bfc55f8b34715038627022832acd89f26c37be230b
-MISC metadata.xml 913 BLAKE2B d26c55294e0cae46c603da093b4338a46a9a06e9a7325d941f98226492a02bc6aeaeb5154f4a9b906367fc06a173e65dbc7d9cb5b40de7c8750dcfc700c2a7b5 SHA512 d6f4e457bb47bf54656b1c2092da998e6480ff83cfe5f52435783c2f6825b09cd454d9d2b6d3eaf66754dca77b31fdd906362816bbd46f9e13afe9c99a7b2595
+MISC metadata.xml 801 BLAKE2B 26cfc79f2f068d554e61d425c1f74aa0196009a7664b6e76f10e19945ed909c91931bd711f444477fd60269c11e0c6304b4df03770c9332f08707c9dbf5b12db SHA512 aca6729adb1889417932bdea2e39aa4e3430617cc3b4e56665fc0a5518c2174fb44065d77df2386d131c03284ac031ae9da83a51dbd7050621d959818ff2553d
diff --git a/sys-apps/exa/metadata.xml b/sys-apps/exa/metadata.xml
index e3789dbda9f5..40e778e6f25a 100644
--- a/sys-apps/exa/metadata.xml
+++ b/sys-apps/exa/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ya@sysdump.net</email>
+		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>	
 	<longdescription lang="en">
 		exa is a modern replacement for ls.
 
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 7a9eed18ccdd..c10b17a2cc58 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -49,4 +49,4 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fd-7.0.0.ebuild 1729 BLAKE2B cf06811c45557da6b87ab6cc95c9e67b24a2e1b6bf018ef474cc02850e2cc61a27ee150dafec30c9dbf02f2b74f9871f918d944bd6e43fe9dc1e53a3eccfd4ca SHA512 010cc2bc198de47c71892c3f3e5dad27c91ede6f269f952adaf837d6bd715bea1e5e8c763f08b821ca4ae535e53afdeed3cdbea53ba7e60acc31852fe8875b70
-MISC metadata.xml 686 BLAKE2B 2355f085f8e589f3170a862851395dc7177e21e5bf97912e0ebe05531d877dfed77c362e4f9b4a7c76fcb81ad58b368c4027c1fe6dedb62829be64301b8eb35e SHA512 0b51730521a361cd1561282cee79f9d30a9f7aaecb371ba96f9b438d2d6eb21ba76a518006c4204799f2e699698be903171700bc2150fde09c4b9ba685fc28ed
+MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758
diff --git a/sys-apps/fd/metadata.xml b/sys-apps/fd/metadata.xml
index a027f78cedbf..163db25b7535 100644
--- a/sys-apps/fd/metadata.xml
+++ b/sys-apps/fd/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ya@sysdump.net</email>
+		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>	
 	<longdescription lang="en">
 		Simple, fast and user-friendly alternative to find.
 		While it does not seek to mirror all of find's powerful functionality,
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index a246a22a9319..3848a33e46dd 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,8 +1,5 @@
 AUX file-5.33-CVE-2018-10360.patch 538 BLAKE2B 78c6006285e3ba254cc2dcb1196fe95217d1ccda46b3f652cbc99c9750b74a47ddbed33f01ef01e7f8c58205dd4c1f9669cb982e08679dd0b45214915883fb75 SHA512 7f6fd05fe29081039c57d22f5122364bf6ccfe869745f1306ceff13e876cb88e03263d2f11558ccbffebe227bcb9c2c6872d1fdb9b2823d16b001f6598f25c6f
-DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
 DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
-EBUILD file-5.32-r1.ebuild 3011 BLAKE2B 2ee0d868685cea29a4941fe9f7f2c215b015f455f0cbf735df8926c8edf275f2de1ccc950853e4cf8021d2c03f314512da4ee254fa5abcc08a65661820666e45 SHA512 78c9afc3203a567f009cb88e823a4a644c23397178926db44148ebd82ee3337899b756a2da4bb2633f158910a73594eebfb80457f9566c723f41544a70851ff3
-EBUILD file-5.33-r1.ebuild 3068 BLAKE2B a2211f853b5a9457e4f514f996d186679532c82ba99b7b8111d9ef842fac2f6e228521976326550a743a41b108a9a712dafb08f4d509bfaf5d2aac10f8763ba9 SHA512 f6b5750df767de41bf0cbbfcc63984476816fc84f637f7f1e9bb2137b4df35f000ee4bbd61cb327aa45e151de493cc4b77a94b24a14544bee06d131d2ca13422
-EBUILD file-5.33-r2.ebuild 3117 BLAKE2B 6323b0e9bf96cc05efc9f1844a78f8ae0d71efbf22c815a03b5560dd44efbd3f987e6eec6221fc46fe52f47eab9de09cc97b4a80c6e16eec27c8a41c3bcbc150 SHA512 266f721aa0924e57c9457659b88359964d0841a0703ea73fc41a8e795be093fd27181c149f2e166263710c02601468828bdb923d86214492d1d2977380712bf9
+EBUILD file-5.33-r2.ebuild 3108 BLAKE2B 6fe4ebecc9cc975d3ab46abf7fc2cd5a18e78fa1094e3f93fd4987b638af867adfe776e45baa7f71e6fe89a5e61ae3331cc66df52d436032fbb5de6654d25612 SHA512 f17969fd656652da3032aa00324d140537ee060db77191720b7be5cf336856411e5a8763cd945d8955131934f19e2b346da20cde77d98265b8d311cc7105170b
 EBUILD file-9999.ebuild 3141 BLAKE2B 89cee448db824b8746f088e25ae2e4e1ac6951a13b5ea925283f4395b683203a90406caa523be5e96238666b0f000288f8d46f5f867074d6e55351e703b40ff9 SHA512 733e1e18d808031be18afe662079a7f130f2cb61e6c071c00ca202d7938ea9577dbdafb99fc6d534ba84f485c1b8de645e67e1d92c1dfeb0caf645ff863857a3
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.32-r1.ebuild b/sys-apps/file/file-5.32-r1.ebuild
deleted file mode 100644
index 389e0e1c2d7f..000000000000
--- a/sys-apps/file/file-5.32-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README{,.python} || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		tc-export_build_env BUILD_C{C,XX}
-		ECONF_SOURCE=${S} \
-		ac_cv_header_zlib_h=no \
-		ac_cv_lib_z_gzopen=no \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} -static" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		econf --disable-shared
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	# Required for `file -C`
-	dodir /usr/share/misc/magic
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	prune_libtool_files
-}
diff --git a/sys-apps/file/file-5.33-r1.ebuild b/sys-apps/file/file-5.33-r1.ebuild
deleted file mode 100644
index ffec3650582f..000000000000
--- a/sys-apps/file/file-5.33-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README{,.python} || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-libseccomp
-		--enable-fsect-man5
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		tc-export_build_env BUILD_C{C,XX}
-		ECONF_SOURCE=${S} \
-		ac_cv_header_zlib_h=no \
-		ac_cv_lib_z_gzopen=no \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} -static" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		econf --disable-shared --disable-libseccomp
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	# Required for `file -C`
-	dodir /usr/share/misc/magic
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	prune_libtool_files
-}
diff --git a/sys-apps/file/file-5.33-r2.ebuild b/sys-apps/file/file-5.33-r2.ebuild
index 6d923ebf535e..c01383f72055 100644
--- a/sys-apps/file/file-5.33-r2.ebuild
+++ b/sys-apps/file/file-5.33-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index 541dc302238a..f2466666eeeb 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1,3 +1,3 @@
-DIST IPMICFG_1.27.1_build.170901.zip 1667230 BLAKE2B 6411f735fed2e66f8dc012c480e6f9a4c2c9223643074514ca6fbb0db62df06fd78714c4a95ce92edc22a4473734a1d41a6c3bdb61268c73a628f08e7dc87c0e SHA512 9ed01a8a1eae7a7e41fafdbb3b666e7760057c960b65da547f0cf197b30b1a535fa2fe8357e13e6ccda0e0dd4474170b43ca3bc89f55c2de5df0160adde9377e
-EBUILD ipmicfg-1.27.1.170901.ebuild 1425 BLAKE2B 130cfa8b7cf23f2316fd45f174bef028c7c6e5c3b3344b4651b93339258cd4c1d28cc2ca335ac649a995c65b049881bcaf131f69d8fab2fcbf493d0c4f251a4e SHA512 572e8b141d38c2421e020b0453d8e859182c9d9a37711ff7292aab3f837e9b08e559b814050c1b3b48e78999460a70b78602535d6aaade957564f296f1e0b7a0
+DIST IPMICFG_1.28.0_build.180302.zip 1722771 BLAKE2B fde93f75714aac9f79cb76e0a11f4747a933f28eb06c4daf09113e75e0fb26c57e8cf54ad58cff040d3a37427c74d699eef9532db256fe5ae2344667a542b342 SHA512 764103de5cf7109a20216d5277ba038747cea16dc78563876b38a8c830d8437bcdf06e0e55db68ad44b32b2a3043535f5c307b3bdaca40bcb04ee05bd097610e
+EBUILD ipmicfg-1.28.0.180302.ebuild 1425 BLAKE2B 130cfa8b7cf23f2316fd45f174bef028c7c6e5c3b3344b4651b93339258cd4c1d28cc2ca335ac649a995c65b049881bcaf131f69d8fab2fcbf493d0c4f251a4e SHA512 572e8b141d38c2421e020b0453d8e859182c9d9a37711ff7292aab3f837e9b08e559b814050c1b3b48e78999460a70b78602535d6aaade957564f296f1e0b7a0
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild b/sys-apps/ipmicfg/ipmicfg-1.28.0.180302.ebuild
index ce0d6c434345..ce0d6c434345 100644
--- a/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild
+++ b/sys-apps/ipmicfg/ipmicfg-1.28.0.180302.ebuild
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a83341f3433b..0e7c07f80069 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -19,5 +19,5 @@ DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce5
 EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
 EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
 EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
-EBUILD memtest86+-5.01-r3.ebuild 2408 BLAKE2B fc6fdc809f71a7b4a3f1dfe674620e5fe5db0a625e052ce383b6b243e8b53a2007738909e1ddca083f18e6291e1b336ba4fd54d79010e75ff035a08eb1f2e625 SHA512 8bd022e82a78e0832a97700499ad2842a6c1d9b4816a0a86418e443ddabfd231c35a9e4bb8fcdbc2b5f768dd2add1bc37f15c1aadc1f93a2dbb87c4e5200faf9
-MISC metadata.xml 476 BLAKE2B 04c497fd2a119d193e675c9ad1059c4f709f755b40f415d31027f7b486153c5d5f456b948c096ab2c63c73173c8a9f51c639a92fc68745c8305dbc8b8b0f0572 SHA512 2db5664e0ed634a23de2a1b03cec34a7ffb262730b2f561890ba1ff135296ce493cb13f83b4ef7b72b36ecd72f58d68905ddc408b02c3a152281e93086e11e1e
+EBUILD memtest86+-5.01-r4.ebuild 2803 BLAKE2B 7a403c8b07e6908975ca3c645d23889f84cb454b6ea1bf07ef5a96ff4532447006887c8c6a6ec2657ca308c6314bde760e6680390ff9fcbd0f18a4528a949ada SHA512 49fdc3ef564b050e5a07b9271f536ace2567cdab70f841bb0574558293aee6ce841421c9d8ff3a257ab51793a7290ca604acbcc0a930eed261c80a2531ad7fa1
+MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index 54b1ab6e21dc..e9528e637a87 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit mount-boot eutils toolchain-funcs
 
@@ -12,15 +12,19 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy iso serial"
+IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest"
+QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
+QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 
 RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
 DEPEND="iso? ( app-cdr/cdrtools )"
 
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
 src_prepare() {
 	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
 	epatch "${FILESDIR}/${P}-gcc-473.patch" \
@@ -39,6 +43,7 @@ src_prepare() {
 			config.h \
 			|| die "sed failed"
 	fi
+	default
 }
 
 src_configure() {
@@ -56,7 +61,12 @@ src_compile() {
 src_test() { :; }
 
 src_install() {
-	insinto "${BOOTDIR}"
+	if use boot; then
+		insinto "${BOOTDIR}"
+		doins memtest memtest.bin
+	fi
+
+	insinto /usr/share/${PN}
 	use iso && newins mt*.iso memtest.iso
 	doins memtest memtest.bin
 
@@ -71,20 +81,34 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
 pkg_postinst() {
-	mount-boot_pkg_postinst
-
-	elog "memtest86+ has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub.d/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest.bin"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest.bin"
-	elog "    > label  = ${PN}"
-	elog ""
-	elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	if use boot; then
+		mount-boot_pkg_postinst
+
+		elog "memtest86+ has been installed in ${BOOTDIR}/"
+		elog "You may wish to update your bootloader configs by adding these lines:"
+		elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
+		elog "   as /etc/grub.d/39_${PN}"
+		elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
+		elog "    > title=${PN}"
+		elog "    > root (hd?,?)"
+		elog "    > kernel ${BOOTDIR}/memtest.bin"
+		elog " - For lilo:"
+		elog "    > image  = ${BOOTDIR}/memtest.bin"
+		elog "    > label  = ${PN}"
+		elog ""
+		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	fi
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use boot && mount-boot_pkg_postrm
 }
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index fc17238d1174..1745d86466f6 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -6,8 +6,9 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name="serial">Compile with serial console support</flag>
+	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
 	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
 	<flag name="iso">Compile an ISO image</flag>
+	<flag name="serial">Compile with serial console support</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index d8368d91f2ef..37106b316cd2 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,4 +1,6 @@
 AUX pick-1.8.0-cflags.patch 204 BLAKE2B 1760b019fe93b1288ba12c01557b6de9e43adaca2c437d6e519acdf660fbf621d10d602da9a31e849e044df4964de320a9b5ba4611d0edde46277fac605f5df1 SHA512 63d5700af23b717641845db6c5d6e2bc6d94f1af4108b28fd7243fd7a46af5687371513fd9e423896b5c6e6245d5c575da5b4645d2db2cdd7c1fff10244fca26
 DIST pick-2.0.1.tar.gz 108010 BLAKE2B 3fae7cfbbcf6913af9cf695e44f171aef58737038e94c779f0cedbe2e386577b4661cc9a55ad657b1a11873fc06bdb7bdc8eac032b6ca584778fe695f8ad4e68 SHA512 616c7889e2ad5d5bb267f683530327e9e121a678db4bd04d5cd720bb8bd81ae14e6bd83e342b33863ef18bd10943e6bbdef177c9639af513456e0146f9b73226
+DIST pick-2.0.2.tar.gz 132174 BLAKE2B 1f186d7dd0fc628d7a1b5fd41ad8c4b0c81f12c1855418354e77376232beb9fa500f43172d8d75f55972ee2589feafbefa6d777cb2149e4707509df355542744 SHA512 92d74fa62f6c829117c6c3faf6ec39fc5dd66465516be396d21d7b0a92ee10761a1d3f43aa4a454f8d19790ac02a4a1af145139d488344c97a511805c5d6965b
 EBUILD pick-2.0.1.ebuild 547 BLAKE2B 6e3e7ac4dd81c7511dfdba5716cc00b4439904ffc7e00552eab3bf46875dc8b644fdf5777c92552f7b7f659c991ac370cb5dcfa942bb24e3a2d4548cc1235de3 SHA512 f12167e04fee7a4fb0e38a796271afd6c334e9756a1c0a15ad2ee91f41da324df760ffdc64d6921c5b9b8bea46a335ba66e849051a21af79b7c52ad973de8730
-MISC metadata.xml 331 BLAKE2B caa7ff5395d6d05faf4752c4ef3d7e5b12c3171e8a3b7d4fd5f5af95c9242edb4083c23a7905e5208ab0898f76d7332d6353ceeaf8c6a257acf1c0639b4a10fe SHA512 1cb3d78ef16d0587d81c649e338e4ff6136e57f6a735198a790935ed3b301292caad7dd1040e532f4892d65f12b9bc36050b18676014feeaccd463d65d04f5df
+EBUILD pick-2.0.2.ebuild 474 BLAKE2B 18c4fc6a0a9d6f4a689a61f9795e999ae426632fedbfe01cd87cde32e30376c9d479111732ea1c4745c44206ec0eac117b0adc6b8391fc85d140cd42a32a8091 SHA512 8096684f81b5d5d2db728c8139dd89acdd9d0eeb6f2939a2657b6eb7d6661140e643664edc02b0356368881dd08aef3bc59e3007dbb881218be53099c092a3e3
+MISC metadata.xml 321 BLAKE2B cf582dc1cffc92fb52c01e5bcfb10de03968dc95987f8676a3b50e4adb68e39602df57a462c6d0149690b8b67e23efef66e1c679bc053c2bfbc4f1458341af4e SHA512 aaf81ef88f69bac040cc61485986d8f52c01ffbe0ba499da510f378aed1e778ea3634e73b0e3a1d16bdff5b2538c0ec60ed8dc39ed05ebf7ace29622f3aef403
diff --git a/sys-apps/pick/metadata.xml b/sys-apps/pick/metadata.xml
index 10fe2acf6f32..6eab74ef0029 100644
--- a/sys-apps/pick/metadata.xml
+++ b/sys-apps/pick/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Tim Harder</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">calleerlandsson/pick</remote-id>
+		<remote-id type="github">mptre/pick</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/pick/pick-2.0.2.ebuild b/sys-apps/pick/pick-2.0.2.ebuild
new file mode 100644
index 000000000000..54ee90179479
--- /dev/null
+++ b/sys-apps/pick/pick-2.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="a fuzzy search tool for the command-line"
+HOMEPAGE="https://github.com/mptre/pick"
+SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3483209b19e3..da993d37169e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,7 +10,7 @@ DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
 EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
-EBUILD portage-2.3.40-r1.ebuild 9953 BLAKE2B eb060b5615c09738798ba233c5f4e180fbdf10fa409e177e1ef0ac64a047eb7e344037fbcde2fa6088aa1754496d55c68b0c3e966669cb439995904b4faac609 SHA512 23051db511f38c8a8d2093db014d9e956d54635d32d5fa0d25e51fd1708dcd739ba2a10ee47032c35b7e294c49c7d0785d3fa9cbed2a413148e4d599da63376b
+EBUILD portage-2.3.40-r1.ebuild 9951 BLAKE2B de2bafe395fa6ecda5d82a412d7c61165967f903238fc7d3cb22295fc0e014032792924a7d20366ac26b409927c218b2772fca039f184b87db94dcaf4bed86ff SHA512 8b788b7a29586cccaf87893db60d78789e29b9a45f88721a2f1cd49d1d29b8d28b21e9bfbb1249884899f18b662540d4b2e8ebcb3cb7daba75bd27e4fb5a2ba8
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8829 BLAKE2B e28682fac496521e83599633424ae0cad64dae33849acc131c3641bfc93627f343b4b44404ac833b91c2214f4b7a23e5e58b9a631d544a93996cb9384c23ac36 SHA512 7d6b0e36d43dab7d824c420d6a7a0f1aeaa736e5e153be5c57f30c91018b89629ee4be3d05e2b3179f1cc1d841fee473683f8cf194b6de6767d576607a1702a9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.40-r1.ebuild b/sys-apps/portage/portage-2.3.40-r1.ebuild
index fd63d281a271..1272e6845db1 100644
--- a/sys-apps/portage/portage-2.3.40-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.40-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 97002c9175db..31db12e0161e 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,11 +1,7 @@
-AUX s390-tools-1.23.1-build.patch 4719 BLAKE2B 78280f0500af40af1ba5606a3fa7a57ca71705fc37acedcbae474464c21a4970e962cf64922b0ce4c429ccdde756389544456cbb190d78f2fea1357a80acc34f SHA512 ffb379479276a86e6b23e495beed69ad4fe49ce82b2096323216a371feecdd7a4056db46328bfe8423da70bd42168b8e1e1c1588bc51019e7f0ac535dda5d6a7
-DIST e2fsprogs-1.41.3.tar.gz 4365234 BLAKE2B 44875ed5890d6f7a690efc5148edc39b45489ee5b4c152d6efa6b3f204fed0397229366fb0e3ff35d1493e0dafdc2e331a62fa384441024d357e49d86ef30027 SHA512 2ab8eafe00b1706658b45b024adca91c3c01970b5b1888b193df30feea84fe209f684df6a24afcad48109cabe451e22d41f29d24fb170bb564e472fe440f4b37
-DIST linux-2.6.27.tar.bz2 50355835 BLAKE2B 7f3a20b510e1127894871e7eabad13fd8b26888110a6cf0b64348667299ba3f7a8018995b0ed41d3a7bc32e802e0db2093e35ae4f889022d04fc911952140e0f SHA512 fcafcea4148e15ffacb57e4eef731d8a2655bba15c6445a84f7345579bd6b6b9a68ad1a44a58f78e78a619efd84ce79c63ce3de3931ae7857af647a06ac052e2
-DIST s390-tools-1.23.1.tar.bz2 625295 BLAKE2B 657ca9394468605ed26b9e4eb24239971076cd741837913109745598c25ffc4fc024c22af376f1da4f3236da3df31da93ccfdd6766e61dc3c004153913b0abca SHA512 c1f0fe79cfcbf6217e1aba74172e7644eee25f8886b70885e8558ad48342d6b41b35cefd398c3f5ff430d382ea6103b93ed8f666f0038d4f5abc3c3bc787d0eb
 DIST s390-tools-1.36.1.tar.bz2 827505 BLAKE2B 5774062699331c6d5958fef44f6cbb048e05aecc190c2519a29dc9c43b0d0d000d8be8183a447eb81b7affbf236edc21105bfe6a689e23b2f519feea0700b9f0 SHA512 83b3456bce8af0d5e1f6a1b96335809a21b676b2371ca101e5f588a18e0de65b8e15a9a973a7dcc2cad800341ecf5997e8230a68b9670751cdf1d6f8d59be22c
 DIST s390-tools-2.2.0.tar.gz 1047199 BLAKE2B d23cfb277d341b4fe73ca92eba0a7bf49420d3303737d871979a93814d1c0cb53884a6fae78453fe69d4a8a8e35923fe9bf2433a412578f8d7696c9defd8570a SHA512 f029b92f18f95b49e189a4f5ad78c02ee629e630a93a8bbfe6966030fe8aaf069e86582d77213d68b447300b73317e4dbcb228df5ff0795a2785f6735087ceab
-EBUILD s390-tools-1.23.1.ebuild 1515 BLAKE2B 1f9bdfcad5886a1616e8b2e503266a1e3d83c8eaedbc66e48e19a8b7958ae6c92a07ac9ffab32e60e3ffbdb54f56d0b09a7a24a0e297e604e23e61b55de8f43e SHA512 b232f60652deaab96d3230288faaca2c0c8968ac399822f73c77f6d5b2a778a14513e2bbf7f00872f920ccc85f775adf009e07f98578542b061d919b5af14f9b
+DIST s390-tools-2.4.0.tar.gz 1084322 BLAKE2B 1e603433937a5ebe664bd7e4fbd5da7fafbc556f9fa809a07badda2bccf5819d69a2a3c5f62a0698693cd308dae30663bb2f2e1f1bc4b2598b9bf6085d29bd03 SHA512 de4d89f505567fe313df3c9110242d9476d0e20ff9b6f31ecbaa99c8a4e2b4bc959ab29ec6faf8b47c4e669f2eaa736f29a9e9908c95ced2e33db25b1c620c84
 EBUILD s390-tools-1.36.1-r1.ebuild 1385 BLAKE2B 118abdf8d51d926bdc9916a0cf6e4de68e3cdae10ac6652aa569c879bb3a9812d6df6d5f262a1fadabf2ff71a1c22fd2880460a72c823451cfbe6e9ac8120a70 SHA512 2e68aff8976ec3d0e060e01eb403e2473377734fd2ca0733e859ef0eb58ad9633585aac90cf3a78239dfebe4c0f3e0580c3d4452a43a708c1dabce6803f90079
-EBUILD s390-tools-1.36.1.ebuild 1233 BLAKE2B 584bd7cd17a25da1b8e7477295084230fabf6e1d102379f8254c8abf8b6cb86de87aa5929844bd440dd40e07aacc696ad42b0116a6fcbb16103b34d01bac0833 SHA512 3553f385580bcb910e74230188b80800cc9bf05899a18b30a23008b372c3ba6871ef4238e04ea3d2e695cd05dac8439b312fa4f4fa83665254427cd38475eb9b
-EBUILD s390-tools-2.2.0.ebuild 1238 BLAKE2B 00808526cc323eab063ddb459b15a249d6547afbd99749868d00651c3ce02a5c9fca989c5348c062656486ebd8dcef476ed187d36569c834ab15a78daef48fd8 SHA512 505e06e0021ced5049f99bc7e39112387f24dff3928d4d70ecf22bab0b0fbeb3a495b7beff1b7110de204e99ed5b1509988f0eb29eb3a1c1c6c5640086180caf
-MISC metadata.xml 795 BLAKE2B 27e39c453bd207d7cac8a38d5422735a0a581e7b72000452b98f406b00e2c2e7287abb2be992ada611f645b8f7a97c497d905278017b4862193475a34654c810 SHA512 23cd50f27b3b968621713e813ca1a822afccd90beb2f5641344ddc7abd2418d153d86309b690d0d1a84c51b47bc92e57a253a0bdeb34f22b5883a26035a53074
+EBUILD s390-tools-2.2.0.ebuild 1237 BLAKE2B 3539949f21345952571e92df3c4466fb015b6f49aa833ca838a1854ef31c8aa3a07da33163fdbe94c2319991ce4d6fa0b41ddd5271df5ee895ac2d18dfe6e214 SHA512 26e55d3bb79595359e1c86a697f478e48c70f686a7f570f62de47e0f04aa026c829c4f7a01f326d7e932828c8da8f40ec21907e650b6bb274e08a27d60a9fcd2
+EBUILD s390-tools-2.4.0.ebuild 1238 BLAKE2B 00808526cc323eab063ddb459b15a249d6547afbd99749868d00651c3ce02a5c9fca989c5348c062656486ebd8dcef476ed187d36569c834ab15a78daef48fd8 SHA512 505e06e0021ced5049f99bc7e39112387f24dff3928d4d70ecf22bab0b0fbeb3a495b7beff1b7110de204e99ed5b1509988f0eb29eb3a1c1c6c5640086180caf
+MISC metadata.xml 726 BLAKE2B 3d8b378dc8713cacadd8c7a16657bf7b49056284f1cea9a71151492fa8fdbb34ab00673b71c142057b19c520477ff17ea17417941d8939427f71bbb4f003c091 SHA512 9fe97ad8e4d179da9351268abad46e38f0c7d19dd93f35b8b86669c7a636b186b575b8cab72634492f176d174292892be8b3ac29f7a279c401e3f4350e43e385
diff --git a/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch b/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch
deleted file mode 100644
index 1733f13f78e0..000000000000
--- a/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch
+++ /dev/null
@@ -1,153 +0,0 @@
- - fix errors in subdir makes
- - parallelize subdir runs
- - cleanup flag handling
-
---- a/Makefile
-+++ b/Makefile
-@@ -9,19 +9,19 @@
- 	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
- 	   ziomon iucvterm hyptop cmsfs-fuse qethqoat
- 
--all: subdirs_make
-+SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS))
-+SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS))
-+SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS))
- 
--subdirs_make:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd ..; \
--	done
-+all: $(SUB_DIRS_ALL)
- 
--clean:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd ..; \
--	done
-+_subdir   = $(patsubst subdirs_%,%,$@)
-+subdir    = $(shell expr $(_subdir) : '[^_]*_\(.*\)')
-+subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*')
-+subdirs_%:
-+	$(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget)
-+
-+clean: $(SUB_DIRS_CLEAN)
- 
- install:
--	set -e ; for dir in $(SUB_DIRS) ; do \
--		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd ..; \
--	done
-+	$(MAKE) $(SUB_DIRS_INSTALL)
---- a/common.mak
-+++ b/common.mak
-@@ -17,10 +17,10 @@
- # Cross Compiling Support
- CROSS_COMPILE   =
- AS              = $(call echocmd,"  AS      ",/$@)$(CROSS_COMPILE)as
--LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc
-+LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc $(CFLAGS) $(LDFLAGS)
- LD              = $(call echocmd,"  LD      ",/$@)$(CROSS_COMPILE)ld
- CC              = $(call echocmd,"  CC      ",/$@)$(CROSS_COMPILE)gcc
--LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++
-+LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++ $(CXXFLAGS) $(LDFLAGS)
- CXX             = $(call echocmd,"  CXX     ",/$@)$(CROSS_COMPILE)g++
- CPP             = $(call echocmd,"  CPP     ",/$@)$(CROSS_COMPILE)gcc -E
- AR              = $(call echocmd,"  AR      ",/$@)$(CROSS_COMPILE)ar
-@@ -41,14 +41,13 @@
- ZFCPDUMP_RD     = zfcpdump.rd
- export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
- 
--CFLAGS		= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
--			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
--			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
--			-g $(OPT_FLAGS)
--CXXFLAGS	= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
--			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
--			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
--			 -g $(OPT_FLAGS)
-+CFLAGS		+= $(WARNFLAGS) $(OPT_FLAGS)
-+CXXFLAGS	+= $(WARNFLAGS) $(OPT_FLAGS)
-+CPPFLAGS	+= \
-+	-DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-+	-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-+	-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR)
-+export CPPFLAGS
- 
- # make G=1
- # Compile tools so that gcov can be used to collect code coverage data.
-@@ -76,7 +75,7 @@
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
- 
- %: %.o
--	$(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
- all:
- 
---- a/zfcpdump/ramdisk/Makefile
-+++ b/zfcpdump/ramdisk/Makefile
-@@ -12,16 +12,14 @@
- 
- all: $(ZFCPDUMP_RD)
- 
--CFLAGS += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include
-+LDFLAGS  += -static
-+LDLIBS   += -lz
- 
- $(ZFCPDUMP_RD): zfcp_dumper
- 	/bin/sh ./create_rd.sh $(ARCH)
- 
--zfcp_dumper: zfcp_dumper.o
--	$(CC) -o zfcp_dumper -static zfcp_dumper.o -lz
--
- zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h
--	$(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c
- 
- install: $(ZFCPDUMP_RD)
- 	/bin/sh ./create_rd.sh -i
-@@ -29,6 +27,3 @@
- clean clobber:
- 	/bin/sh ./create_rd.sh -r
- 	rm -f *.o
--
--%.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $<
---- a/zfcpdump_v2/Makefile
-+++ b/zfcpdump_v2/Makefile
-@@ -6,12 +6,13 @@
- LINUX_DIR := linux-$(LINUX_VERSION)
- E2FSPROGS := e2fsprogs-1.41.3
- 
--CFLAGS        += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT
-+LDFLAGS  += -static
-+LDLIBS   += -lz
- 
- all: zfcpdump.image
- 
- zfcpdump: zfcpdump.c zfcpdump.h
--	$(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz
- 
- e2fsck:
- 	tar xfzv $(E2FSPROGS).tar.gz
---- a/zipl/boot/Makefile
-+++ b/zipl/boot/Makefile
-@@ -3,9 +3,8 @@
- 
- S390_TOOLS_VERSION_EBCDIC := $(shell echo -n $(S390_TOOLS_RELEASE) | dd conv=ebcdic 2> /dev/null | hexdump -v -e '/1 "0x%02x,"' | sed 's/.$$//')
- 
--CFLAGS  += -I../include -D__ASSEMBLY__ \
-+CPPFLAGS  += -I../include -D__ASSEMBLY__ \
- 		-DS390_TOOLS_VERSION_EBCDIC=$(S390_TOOLS_VERSION_EBCDIC)
--LDFLAGS = -O2
- FILES	:= fba0.bin fba1b.bin fba2.bin \
- 	   eckd0_ldl.bin eckd0_cdl.bin \
- 	   eckd1.bin eckd1b.bin eckd2.bin \
-@@ -16,7 +15,7 @@
- %:	%.S
- 
- %.o:	%.S
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
- 
- %.exec:	%.o
- 	@STAGE=$$(                                  \
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
index ae19b1043df6..7b20e7bd55f8 100644
--- a/sys-apps/s390-tools/metadata.xml
+++ b/sys-apps/s390-tools/metadata.xml
@@ -12,7 +12,6 @@ zSeries (s390) Linux kernel and device drivers
 		<flag name="fuse">build cmsfs-fuse to read files stored on a z/VM CMS disk</flag>
 		<flag name="ncurses">build hyptop monitoring program</flag>
 		<flag name="pfm">build the cpacfstats tool</flag>
-		<flag name="zfcpdump">build the kernel disk dumping utility</flag>
 		<flag name="zlib">build the zgetdump utility</flag>
 	</use>
 	<upstream>
diff --git a/sys-apps/s390-tools/s390-tools-1.23.1.ebuild b/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
deleted file mode 100644
index dfdc088e6655..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils udev
-
-# look at zfcpdump_v2/README
-E2FSPROGS_P=e2fsprogs-1.41.3
-LINUX_P=linux-2.6.27
-
-DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
-HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
-SRC_URI="https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2
-	zfcpdump? (
-		mirror://sourceforge/e2fsprogs/${E2FSPROGS_P}.tar.gz
-		mirror://kernel/linux/kernel/v2.6/${LINUX_P}.tar.bz2
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* s390"
-IUSE="fuse ncurses snmp zfcpdump"
-
-RDEPEND="sys-libs/zlib
-	fuse? ( sys-fs/fuse )
-	ncurses? ( sys-libs/ncurses:0= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	app-admin/genromfs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.23.1-build.patch
-
-	use snmp || sed -i -e 's:osasnmpd::' Makefile
-	use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export WITHOUT_FUSE=1; }
-	use ncurses || sed -i -e 's:hyptop::' Makefile
-
-	if use zfcpdump ; then
-		local x
-		for x in ${E2FSPROGS_P}.tar.gz ${LINUX_P}.tar.bz2 ; do
-			ln -s "${DISTDIR}"/${x} zfcpdump_v2/${x} || die "ln ${x}"
-		done
-		sed -i -e '/^ZFCPDUMP_DIR/s:local/::' common.mak
-		sed -i -e '/^SUB_DIRS/s:=:=zfcpdump_v2 :' Makefile
-	fi
-
-	export MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake install INSTROOT="${D}" USRBINDIR="${D}/sbin"
-	dodoc README
-	udev_dorules etc/udev/rules.d/*.rules
-}
diff --git a/sys-apps/s390-tools/s390-tools-2.2.0.ebuild b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
index 72f09e63dfbe..a2e08bb6e2aa 100644
--- a/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~s390"
+KEYWORDS="-* s390"
 IUSE="fuse ncurses pfm snmp zlib"
 
 RDEPEND="fuse? ( sys-fs/fuse:= )
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild b/sys-apps/s390-tools/s390-tools-2.4.0.ebuild
index 25a2d14a5578..72f09e63dfbe 100644
--- a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.4.0.ebuild
@@ -7,14 +7,14 @@ inherit toolchain-funcs udev
 
 DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
 HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
-SRC_URI="https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2"
+SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* s390"
+KEYWORDS="-* ~s390"
 IUSE="fuse ncurses pfm snmp zlib"
 
-RDEPEND="fuse? ( sys-fs/fuse )
+RDEPEND="fuse? ( sys-fs/fuse:= )
 	ncurses? ( sys-libs/ncurses:0= )
 	pfm? ( app-misc/pfm )
 	snmp? ( net-analyzer/net-snmp )
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index dde3a4fb41ae..b92b61697ead 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,13 +1,6 @@
 AUX sed-4.1.5-alloca.patch 413 BLAKE2B ace3926149e5190bb800a1e1871d70613fee6ef5ef6fee2fca27f5f572adfab36864f4032a9a8c86d77f21672050ed77ca3665ee96a43329a81128d3512956c0 SHA512 dccdad774cbf1eb71744b9d1a49ce45e6c6197ffed66448b6de9302dc88d46246b52a6cbed95a5b86511f19a735a710af177003732d54ca01baa84ef21734d29
-AUX sed-4.3-dfa-segv-1.patch 6180 BLAKE2B ff482286d08ca2aa87553a959884159bf8d958e7713e8da2f51d7ff2209a967ed4da45702f9149094e948412cdc9fa7f95e15cb92ac707a13b0374dd7ab9dc34 SHA512 467a36bc863ee2bed90b8e87f0023b67615c606dea4376bc8da72356f13871a51f82e73965f1f17975d76b7768dfe20ad2d4b7373a2c208257981d8235b61e7b
-AUX sed-4.3-dfa-segv-2.patch 3797 BLAKE2B 1880183179c88e8898579abdbe493112bf5aad1c4350997726582c5e36ad73f22cf4eb630d1cb6b25c96219c7e35c8a21bd8f58a2b3b3fe6799e19097a66ec4c SHA512 d346f71e4899d5bde9127f86428a8ab1ee149aee28247e6e04ff940eb9ee90392f81d3d61b525cef5f1c3e871ee4295b4168edcd00d802edfc3f8a2725a39072
-AUX sed-4.3-dfa-segv-3.patch 5334 BLAKE2B 44cd0e56f46e0ed458ff6e157f28bf2e0f7c5af32541dc609f28831dfe3c3442fe9240863c500f39267bd9be2d492966591b8a32bb6bf858fdeafdb9baab4032 SHA512 270a4917addf899d03b32fe544816d2132063ca113229cd1b5b72dacd1ebb6f087fea5cc362ceda3237966074cf542883f12e3f1d2da4b045a7f158f50017ccb
 DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
-DIST sed-4.3.tar.xz 1167168 BLAKE2B 5751943cb64d03afef727deba3bee7027a1611b4729c7b33497c28513b61571d1c323f1d07ab68a252a9e45d0f7c95e303f05443310dcae74bedab28160b079d SHA512 4d76a099cf7115763b79b45be5c96338750baa47e34c36075f714e022614397aa9240099d6d009e69aa4d06b6cfc14dcc0f8313442a1465f448b36fb6874a26d
-DIST sed-4.4.tar.xz 1181664 BLAKE2B 03804c209c2108cca4aa991cd68065fd03a15c726b6daf5212603835b5c046c63e9c2e4c28f76dfe165128f060db5b992c981f314d2fe230f30521545d00a468 SHA512 4e1b0a7403913f1e25047eb2292a0a9b3488b15b4463ce2803e05eaecbc2da19f477a18e6a70c992461c38ced90774415091aa2d8ce85cb74e391610d9eedb70
 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
 EBUILD sed-4.2.2.ebuild 1680 BLAKE2B 5091750a04cdaa6b5c340cfe27c74a3b620d21b3be451755104d93774f73060d92a70c367ce4107407dbfc3a4edb8fefbcbeef3876e3bc9707e481f5b20cb3eb SHA512 331c709e673cd26b2c3b5a48094ce5e2cb4d486b5eca2ac6733fc8e39fd525342be2494384922da920075f94fe2ab81a625795ea094769ab71548acb93089d99
-EBUILD sed-4.3-r1.ebuild 1448 BLAKE2B 8d3099ed84f4a936f2cd4f6f176220b1f6a316e28ff833010ceb6f5b66d8220d4c8834b65b99b62a474cf0be7e9830d7461f0cc14ddc382b00f69a0046137f4e SHA512 7e21eecbc7dba0c69f0f03966c9eb0fc62fc2c5504d8c49714edde437909cb9c823c59c0c2ab956bce38121d0ddc7a8bbd7be52f6bd2a87579dbf042b32de98b
-EBUILD sed-4.4-r1.ebuild 1784 BLAKE2B ba803b69441a45db55fb1dbd392234379203984af141310d42a2eb580e8dc98dce2315b8413b892a7279418317d2f58f168eb126bc759969cde5641a0b86424a SHA512 bb7e23c0467e298cdfb5b292efda9d057617db74cf43b7796e890aab5dd5045fc86ffd310ce015ec1d71e71839cbce9082740efee7fecbcb91e6e0a537f27e01
-EBUILD sed-4.5.ebuild 1785 BLAKE2B 61ac1c5a52d9b14b1749a32d03ffc9ae2cda7fb5fc3afbf7a5b5680e7e95cd3e18bd42e1e8826514abcb50973a3f21b4e080a7d8c73bbf0fdc72525d8758a783 SHA512 824d13dd00644ca7f104a9e6107dd2b3bae4a5051b6b2984ed9f426439711f64caa6a890c698e65cf1c10a893ff6e1a9ed3bdbbf1083a72ae3bb75657a584f78
+EBUILD sed-4.5.ebuild 1781 BLAKE2B ff572137ab7c9ff94132c27bbaa71ae7d9c631bb6d6341b020981b5806354588dd6263e6117e48a5d212b809b0a32a59e461aa9f4f02af716e7f7f662a41ef70 SHA512 e5406687ae67346e58f91f1b1149ef1a2c20de111a14d728f8f1f1576fb104ebecead916c8712df8642d24dac72949c0061304f35f2e10459c1aef1727f5980c
 MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5
diff --git a/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch
deleted file mode 100644
index f82adc712533..000000000000
--- a/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-fix from upstream gnulib (fudged to apply to sed-4.3)
-
-From 823b5cb589366f7c8742503af980803afad0978f Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sun, 8 Jan 2017 12:44:29 -0800
-Subject: [PATCH] dfa: fix reallocation bug when matching newlines
-
-Problem reported for sed by S. Gilles (Bug#25390).
-* lib/dfa.c (realloc_trans_if_necessary): Move earlier.
-(dfastate): Reallocate before moving any newline transition ...
-(build_state): ... instead of reallocating here, where it is too late.
----
- ChangeLog |   8 +++++
- lib/dfa.c | 114 ++++++++++++++++++++++++++++++--------------------------------
- 2 files changed, 63 insertions(+), 59 deletions(-)
-
-diff --git a/lib/dfa.c b/lib/dfa.c
-index 8276db160a4b..141888a978fa 100644
---- a/lib/dfa.c
-+++ b/lib/dfa.c
-@@ -2574,6 +2574,40 @@ dfaanalyze (struct dfa *d, bool searchflag)
-   free (merged.elems);
- }
- 
-+/* Make sure D's state arrays are large enough to hold NEW_STATE.  */
-+static void
-+realloc_trans_if_necessary (struct dfa *d, state_num new_state)
-+{
-+  state_num oldalloc = d->tralloc;
-+  if (oldalloc <= new_state)
-+    {
-+      state_num **realtrans = d->trans ? d->trans - 2 : NULL;
-+      ptrdiff_t newalloc1 = realtrans ? d->tralloc + 2 : 0;
-+      realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1,
-+                           -1, sizeof *realtrans);
-+      realtrans[0] = realtrans[1] = NULL;
-+      d->trans = realtrans + 2;
-+      ptrdiff_t newalloc = d->tralloc = newalloc1 - 2;
-+      d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
-+      d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
-+      d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
-+      if (d->localeinfo.multibyte)
-+        {
-+          realtrans = d->mb_trans ? d->mb_trans - 2 : NULL;
-+          realtrans = xnrealloc (realtrans, newalloc1, sizeof *realtrans);
-+          if (oldalloc == 0)
-+            realtrans[0] = realtrans[1] = NULL;
-+          d->mb_trans = realtrans + 2;
-+        }
-+      for (; oldalloc < newalloc; oldalloc++)
-+        {
-+          d->trans[oldalloc] = NULL;
-+          d->fails[oldalloc] = NULL;
-+          if (d->localeinfo.multibyte)
-+            d->mb_trans[oldalloc] = NULL;
-+        }
-+    }
-+}
- 
- /* Return the transition out of state s of d for the input character uc,
-    updating the slots in trans accordingly.
-@@ -2810,20 +2844,25 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-     }
- 
-   /* Set the transitions for each character in the label.  */
-+  state_num maxstate = -1;
-   for (i = 0; i < NOTCHAR; i++)
-     if (tstbit (i, label))
--      switch (d->syntax.sbit[i])
--        {
--        case CTX_NEWLINE:
--          trans[i] = state_newline;
--          break;
--        case CTX_LETTER:
--          trans[i] = state_letter;
--          break;
--        default:
--          trans[i] = state;
--          break;
--        }
-+      {
-+        switch (d->syntax.sbit[i])
-+          {
-+          case CTX_NEWLINE:
-+            trans[i] = state_newline;
-+            break;
-+          case CTX_LETTER:
-+            trans[i] = state_letter;
-+            break;
-+          default:
-+            trans[i] = state;
-+            break;
-+          }
-+        if (maxstate < trans[i])
-+          maxstate = trans[i];
-+      }
- 
- #ifdef DEBUG
-   fprintf (stderr, "trans table %td", s);
-@@ -2840,6 +2879,9 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-   free (follows.elems);
-   free (tmp.elems);
- 
-+  /* Reallocate now, to reallocate any newline transition properly.  */
-+  realloc_trans_if_necessary (d, maxstate);
-+
-   /* Keep the newline transition in a special place so we can use it as
-      a sentinel.  */
-   if (tstbit (d->syntax.eolbyte, label))
-@@ -2851,42 +2893,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-   return trans[uc];
- }
- 
--/* Make sure D's state arrays are large enough to hold NEW_STATE.  */
--static void
--realloc_trans_if_necessary (struct dfa *d, state_num new_state)
--{
--  state_num oldalloc = d->tralloc;
--  if (oldalloc <= new_state)
--    {
--      state_num **realtrans = d->trans ? d->trans - 2 : NULL;
--      ptrdiff_t newalloc, newalloc1;
--      newalloc1 = realtrans ? d->tralloc + 2 : 0;
--      realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1,
--                           -1, sizeof *realtrans);
--      realtrans[0] = realtrans[1] = NULL;
--      d->trans = realtrans + 2;
--      d->tralloc = newalloc = newalloc1 - 2;
--      d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
--      d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
--      d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
--      if (d->localeinfo.multibyte)
--        {
--          realtrans = d->mb_trans ? d->mb_trans - 2 : NULL;
--          realtrans = xnrealloc (realtrans, newalloc1, sizeof *realtrans);
--          if (oldalloc == 0)
--            realtrans[0] = realtrans[1] = NULL;
--          d->mb_trans = realtrans + 2;
--        }
--      for (; oldalloc < newalloc; oldalloc++)
--        {
--          d->trans[oldalloc] = NULL;
--          d->fails[oldalloc] = NULL;
--          if (d->localeinfo.multibyte)
--            d->mb_trans[oldalloc] = NULL;
--        }
--    }
--}
--
- /* Calculate the transition table for a new state derived from state s
-    for a compiled dfa d after input character uc, and return the new
-    state number.  */
-@@ -2932,18 +2939,7 @@ build_state (state_num s, struct dfa *d, unsigned char uc)
-   if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d))
-     d->success[s] |= CTX_NONE;
- 
--  s = dfastate (s, d, uc, trans);
--
--  /* Now go through the new transition table, and make sure that the trans
--     and fail arrays are allocated large enough to hold a pointer for the
--     largest state mentioned in the table.  */
--  state_num maxstate = -1;
--  for (int i = 0; i < NOTCHAR; i++)
--    if (maxstate < trans[i])
--      maxstate = trans[i];
--  realloc_trans_if_necessary (d, maxstate);
--
--  return s;
-+  return dfastate (s, d, uc, trans);
- }
- 
- /* Multibyte character handling sub-routines for dfaexec.  */
--- 
-2.11.0
-
diff --git a/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch
deleted file mode 100644
index 4e4fb2c648cc..000000000000
--- a/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-fix from upstream gnulib (fudged to apply to sed-4.3)
-
-From aff55692da81f702ccbc461ad4f896b23c398638 Mon Sep 17 00:00:00 2001
-From: Norihiro Tanaka <noritnk@kcn.ne.jp>
-Date: Mon, 9 Jan 2017 07:46:13 +0900
-Subject: [PATCH] dfa: simplify transition table allocation
-
-* src/dfa.c (realloc_trans_if_necessary): Remove second argument.
-Its value is derived from other variable.  Update callers.
-(dfastate): Remove calculation of max number of state.
----
- lib/dfa.c | 44 ++++++++++++++++++++------------------------
- 1 file changed, 20 insertions(+), 24 deletions(-)
-
-diff --git a/lib/dfa.c b/lib/dfa.c
-index 141888a978fa..bda4602b1094 100644
---- a/lib/dfa.c
-+++ b/lib/dfa.c
-@@ -2576,14 +2576,14 @@ dfaanalyze (struct dfa *d, bool searchflag)
- 
- /* Make sure D's state arrays are large enough to hold NEW_STATE.  */
- static void
--realloc_trans_if_necessary (struct dfa *d, state_num new_state)
-+realloc_trans_if_necessary (struct dfa *d)
- {
-   state_num oldalloc = d->tralloc;
--  if (oldalloc <= new_state)
-+  if (oldalloc < d->sindex)
-     {
-       state_num **realtrans = d->trans ? d->trans - 2 : NULL;
-       ptrdiff_t newalloc1 = realtrans ? d->tralloc + 2 : 0;
--      realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1,
-+      realtrans = xpalloc (realtrans, &newalloc1, d->sindex - oldalloc,
-                            -1, sizeof *realtrans);
-       realtrans[0] = realtrans[1] = NULL;
-       d->trans = realtrans + 2;
-@@ -2825,6 +2825,9 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-         state_letter = state_index (d, &follows, CTX_LETTER);
-       else
-         state_letter = state;
-+
-+      /* Reallocate now, to reallocate any newline transition properly.  */
-+      realloc_trans_if_necessary (d);
-     }
- 
-   /* If we are a searching matcher, the default transition is to a state
-@@ -2847,22 +2850,18 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-   state_num maxstate = -1;
-   for (i = 0; i < NOTCHAR; i++)
-     if (tstbit (i, label))
--      {
--        switch (d->syntax.sbit[i])
--          {
--          case CTX_NEWLINE:
--            trans[i] = state_newline;
--            break;
--          case CTX_LETTER:
--            trans[i] = state_letter;
--            break;
--          default:
--            trans[i] = state;
--            break;
--          }
--        if (maxstate < trans[i])
--          maxstate = trans[i];
--      }
-+      switch (d->syntax.sbit[i])
-+        {
-+        case CTX_NEWLINE:
-+          trans[i] = state_newline;
-+          break;
-+        case CTX_LETTER:
-+          trans[i] = state_letter;
-+          break;
-+        default:
-+          trans[i] = state;
-+          break;
-+        }
- 
- #ifdef DEBUG
-   fprintf (stderr, "trans table %td", s);
-@@ -2879,9 +2878,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-   free (follows.elems);
-   free (tmp.elems);
- 
--  /* Reallocate now, to reallocate any newline transition properly.  */
--  realloc_trans_if_necessary (d, maxstate);
--
-   /* Keep the newline transition in a special place so we can use it as
-      a sentinel.  */
-   if (tstbit (d->syntax.eolbyte, label))
-@@ -3042,7 +3038,7 @@ transit_state (struct dfa *d, state_num s, unsigned char const **pp,
- 
-   separate_contexts = state_separate_contexts (&d->mb_follows);
-   s2 = state_index (d, &d->mb_follows, separate_contexts ^ CTX_ANY);
--  realloc_trans_if_necessary (d, s2);
-+  realloc_trans_if_necessary (d);
- 
-   d->mb_trans[s][d->states[s1].mb_trindex] = s2;
- 
-@@ -3137,7 +3133,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl,
-     }
- 
-   if (!d->tralloc)
--    realloc_trans_if_necessary (d, 0);
-+    realloc_trans_if_necessary (d);
- 
-   s = s1 = 0;
-   p = mbp = (unsigned char const *) begin;
--- 
-2.11.0
-
diff --git a/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch
deleted file mode 100644
index d85022f754f0..000000000000
--- a/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-fix from upstream gnulib (fudged to apply to sed-4.3)
-
-From 7c345c68cdf62737ccc4a9d0ba2cd921fae850fa Mon Sep 17 00:00:00 2001
-From: Norihiro Tanaka <noritnk@kcn.ne.jp>
-Date: Mon, 9 Jan 2017 08:21:21 +0900
-Subject: [PATCH] dfa: melt down dfastate into build_state
-
-* src/dfa.c (dfastate): Remove it.
-(build_state): Insert content of dfastate() to bottom.
----
- lib/dfa.c | 97 +++++++++++++++++++++++++++++----------------------------------
- 1 file changed, 45 insertions(+), 52 deletions(-)
-
-diff --git a/lib/dfa.c b/lib/dfa.c
-index bda4602b1094..6896ed320a7b 100644
---- a/lib/dfa.c
-+++ b/lib/dfa.c
-@@ -2609,8 +2609,10 @@ realloc_trans_if_necessary (struct dfa *d)
-     }
- }
- 
--/* Return the transition out of state s of d for the input character uc,
--   updating the slots in trans accordingly.
-+/*
-+   Calculate the transition table for a new state derived from state s
-+   for a compiled dfa d after input character uc, and return the new
-+   state number.
- 
-    Do not worry about all possible input characters; calculate just the group
-    of positions that match uc.  Label it with the set of characters that
-@@ -2639,8 +2641,9 @@ realloc_trans_if_necessary (struct dfa *d)
-    If after comparing with every group there are characters remaining in C,
-    create a new group labeled with the characters of C and insert this
-    position in that group.  */
-+
- static state_num
--dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-+build_state (state_num s, struct dfa *d, unsigned char uc)
- {
-   leaf_set group;               /* Positions that match the input char.  */
-   charclass label;              /* The group's label.  */
-@@ -2652,6 +2655,45 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-   fprintf (stderr, "build state %td\n", s);
- #endif
- 
-+  /* A pointer to the new transition table, and the table itself.  */
-+  state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s;
-+  state_num *trans = *ptrans;
-+
-+  if (!trans)
-+    {
-+      /* MAX_TRCOUNT is an arbitrary upper limit on the number of
-+         transition tables that can exist at once, other than for
-+         initial states.  Often-used transition tables are quickly
-+         rebuilt, whereas rarely-used ones are cleared away.  */
-+      if (MAX_TRCOUNT <= d->trcount)
-+        {
-+          for (state_num i = d->min_trcount; i < d->tralloc; i++)
-+            {
-+              free (d->trans[i]);
-+              free (d->fails[i]);
-+              d->trans[i] = d->fails[i] = NULL;
-+            }
-+          d->trcount = 0;
-+        }
-+
-+      d->trcount++;
-+      *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans);
-+
-+      /* Fill transition table with a default value which means that the
-+         transited state has not been calculated yet.  */
-+      for (int i = 0; i < NOTCHAR; i++)
-+        trans[i] = -2;
-+    }
-+
-+  /* Set up the success bits for this state.  */
-+  d->success[s] = 0;
-+  if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NEWLINE, s, *d))
-+    d->success[s] |= CTX_NEWLINE;
-+  if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_LETTER, s, *d))
-+    d->success[s] |= CTX_LETTER;
-+  if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d))
-+    d->success[s] |= CTX_NONE;
-+
-   group.elems = xnmalloc (d->nleaves, sizeof *group.elems);
-   group.nelem = 0;
- 
-@@ -2889,55 +2931,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
-   return trans[uc];
- }
- 
--/* Calculate the transition table for a new state derived from state s
--   for a compiled dfa d after input character uc, and return the new
--   state number.  */
--
--static state_num
--build_state (state_num s, struct dfa *d, unsigned char uc)
--{
--  /* A pointer to the new transition table, and the table itself.  */
--  state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s;
--  state_num *trans = *ptrans;
--
--  if (!trans)
--    {
--      /* MAX_TRCOUNT is an arbitrary upper limit on the number of
--         transition tables that can exist at once, other than for
--         initial states.  Often-used transition tables are quickly
--         rebuilt, whereas rarely-used ones are cleared away.  */
--      if (MAX_TRCOUNT <= d->trcount)
--        {
--          for (state_num i = d->min_trcount; i < d->tralloc; i++)
--            {
--              free (d->trans[i]);
--              free (d->fails[i]);
--              d->trans[i] = d->fails[i] = NULL;
--            }
--          d->trcount = 0;
--        }
--
--      d->trcount++;
--      *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans);
--
--      /* Fill transition table with a default value which means that the
--         transited state has not been calculated yet.  */
--      for (int i = 0; i < NOTCHAR; i++)
--        trans[i] = -2;
--    }
--
--  /* Set up the success bits for this state.  */
--  d->success[s] = 0;
--  if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NEWLINE, s, *d))
--    d->success[s] |= CTX_NEWLINE;
--  if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_LETTER, s, *d))
--    d->success[s] |= CTX_LETTER;
--  if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d))
--    d->success[s] |= CTX_NONE;
--
--  return dfastate (s, d, uc, trans);
--}
--
- /* Multibyte character handling sub-routines for dfaexec.  */
- 
- /* Consume a single byte and transit state from 's' to '*next_state'.
--- 
-2.11.0
-
diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild
deleted file mode 100644
index e70a45187922..000000000000
--- a/sys-apps/sed/sed-4.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl nls selinux static"
-
-RDEPEND="acl? ( virtual/acl )
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dfa-segv-{1,2,3}.patch
-)
-
-src_bootstrap_sed() {
-	# make sure system-sed works #40786
-	if ! type -p sed > /dev/null ; then
-		mkdir -p "${T}/bootstrap"
-		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
-		chmod a+rx "${T}/bootstrap/sed"
-		PATH="${T}/bootstrap:${PATH}"
-	fi
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	# don't use sed before bootstrap if we have to recover a broken host sed
-	src_bootstrap_sed
-}
-
-src_configure() {
-	local myconf=()
-	if use userland_GNU; then
-		myconf+=( --exec-prefix="${EPREFIX}" )
-	else
-		myconf+=( --program-prefix=g )
-	fi
-
-	export ac_cv_search_setfilecon=$(usex selinux -lselinux)
-	export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
-	use static && append-ldflags -static
-	myconf+=(
-		$(use_enable acl)
-		$(use_enable nls)
-	)
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/sed/sed-4.4-r1.ebuild b/sys-apps/sed/sed-4.4-r1.ebuild
deleted file mode 100644
index 39c3d130eacf..000000000000
--- a/sys-apps/sed/sed-4.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl forced-sandbox nls selinux static"
-
-RDEPEND="acl? ( virtual/acl )
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_bootstrap_sed() {
-	# make sure system-sed works #40786 #650052
-	if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
-		mkdir -p "${T}/bootstrap"
-		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
-		chmod a+rx "${T}/bootstrap/sed"
-		PATH="${T}/bootstrap:${PATH}"
-	fi
-}
-
-src_prepare() {
-	# Don't use sed before bootstrap if we have to recover a broken host sed.
-	src_bootstrap_sed
-
-	if use forced-sandbox ; then
-		# Upstream doesn't want to add a configure flag for this.
-		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
-		sed -i \
-			-e '/^bool sandbox = false;/s:false:true:' \
-			sed/sed.c || die
-		# Make sure the sed took.
-		grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed"
-	fi
-}
-
-src_configure() {
-	local myconf=()
-	if use userland_GNU; then
-		myconf+=( --exec-prefix="${EPREFIX}" )
-	else
-		myconf+=( --program-prefix=g )
-	fi
-
-	export ac_cv_search_setfilecon=$(usex selinux -lselinux)
-	export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
-	use static && append-ldflags -static
-	myconf+=(
-		$(use_enable acl)
-		$(use_enable nls)
-	)
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
index 8dba9728987b..c2387e587926 100644
--- a/sys-apps/sed/sed-4.5.ebuild
+++ b/sys-apps/sed/sed-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl forced-sandbox nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index f5bb7edbea8c..c0b1e101014d 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -8,6 +8,8 @@ AUX sysvinit-2.88-sysmacros.patch 224 BLAKE2B c25c63e72ac15b4e5a518acd55ed792227
 AUX sysvinit-2.88-ttydefaults.patch 266 BLAKE2B 037f77b059dbd593b9f8eb683a0be57c73c62ba421895386932b5c072457e30ee145977c6eb145ebfb0097ebeb483c002bf346e751629398c5e5cb48504bf2ff SHA512 d27c0f0ae4d2c6ddb9622c76571c0a4260b2c537ec7fcbc3c56b4e461f43238e5c9f8072f2db582bf5e625320e963e840aac247c83ec2438c3454d7cdc1b3198
 DIST sysvinit-2.88dsf.tar.bz2 105551 BLAKE2B 2378a7ab96d059fc781b8b7dd130f4c6311a83527e80e6d40b0970140f0f6c0b081eec502b0c9e461fe5ac02cc064437c2bef2237b20209c8c5f8535a45e50d1 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf
 DIST sysvinit-2.89.tar.bz2 113231 BLAKE2B defb82041edd5d9b95a7c73c950df18107aad292279270b0248b6c803b297c7c2f3edebfeb96ef2d7c3908de689ae265790b2379b9fb63c03d42138af8c418c1 SHA512 3582da52364e3c1f1a488c415f875ab264630cb23f85bc356915f50afc5a42ace18278ed04086cf38c1fe9c7a860f6fc3c2bb1cc50e5560b350a92c24411682c
+DIST sysvinit-2.90.tar.xz 112840 BLAKE2B 24ecd6cbb0dd5c6695ae60fcfab062cafcbe7867cdba2cb3b05c7cf0e9c129364c968e70579ef904f5c617788bc607bdb9068d633afd53e0bb3cbcf41d562f0f SHA512 0fc05cba767d6285504c1c791e2e136cff7865fc6ef8beb8287bede305668ab09590a9b25ebc75bfc2060ea76707ac3dc529bc661a6a92c7b2cc23f5b0a801e6
 EBUILD sysvinit-2.88-r9.ebuild 3470 BLAKE2B 6963eb9b677c53c0b7fe67c6dd3d9cf4b0ee89f8670abc6e9d8481b2d0dab41c7428b6293f00f039d286eac0c223ebe4d250bfda27fb82beca8812b188de232d SHA512 3beb173dc4b830874f20e16f9d079abba86c2813f81719d091c174aed9591a803fb92d5fa2d20884f8aebb755b6735fa6183613271a576cd93f51c17a072b0f5
 EBUILD sysvinit-2.89-r1.ebuild 3375 BLAKE2B 71bbe33ad11398149b4ebd7e9cc42b1c3809a4173f25a0e7e960e083d1f715a6baea2027b120611c334bf9f2a14699d50e94a7a67b5c6cd4f3e6a680e80e8446 SHA512 c3a34770ec58142cc18b2a9607fad0a1235d56f9c8e1b5594c39bbbe654e17a0d39da35e4ee887b893519705838c8b60737659a1346565da4aa1c22d5463b577
+EBUILD sysvinit-2.90.ebuild 3375 BLAKE2B 73d413d29a9e6331351cfc505e72f12e56335d1b0c188209d87e8baf6b224cef75a0f5c575d64134c55a8930bcb5ec79256880035eedc3624485ba92748fa1b2 SHA512 c2afaf594ec8f1cbc7c78261c2021d61a733b9bd744e21507950999504c1f8f9ce65071394e64e40664ae514096f9ed3d5acc1961819d8a795cd86b1e6712935
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.90.ebuild b/sys-apps/sysvinit/sysvinit-2.90.ebuild
new file mode 100644
index 000000000000..9d34be95b101
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.90.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux ibm static kernel_FreeBSD"
+
+CDEPEND="
+	selinux? (
+		>=sys-libs/libselinux-1.28
+	)"
+DEPEND="${CDEPEND}
+	virtual/os-headers"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-shutdown )
+	!<sys-apps/openrc-0.13
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
+	"${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615
+	"${FILESDIR}/${PN}-2.88-shutdown-h.patch" #449354
+	#"${FILESDIR}/${PN}-2.88-sysmacros.patch"
+)
+
+src_prepare() {
+	default
+	sed -i '/^CPPFLAGS =$/d' src/Makefile || die
+
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}" || die
+	cp "${FILESDIR}"/inittab-2.88 inittab || die "cp inittab"
+	local insert=()
+	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
+	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
+	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
+	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
+	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
+	if use ibm ; then
+		insert+=(
+			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
+			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
+		)
+	fi
+	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
+	if use kernel_FreeBSD ; then
+		sed -i \
+			-e 's/linux/cons25/g' \
+			-e 's/ttyS0/cuaa0/g' \
+			-e 's/ttyS1/cuaa1/g' \
+			inittab #121786
+	fi
+	if use x86 || use amd64 ; then
+		sed -i \
+			-e '/ttyS[01]/s:9600:115200:' \
+			inittab
+	fi
+	if [[ ${#insert[@]} -gt 0 ]] ; then
+		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	append-lfs-flags
+	export DISTRO= #381311
+	use static && append-ldflags -static
+	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+}
+
+src_install() {
+	emake -C src install ROOT="${D}"
+	dodoc README doc/*
+
+	insinto /etc
+	doins "${WORKDIR}"/inittab
+
+	# dead symlink
+	rm "${ED%/}"/usr/bin/lastb || die
+}
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] ; then
+		if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
+			ln -s /dev/initctl /run/initctl
+		fi
+		# Do not return an error if this fails
+		/sbin/telinit U &>/dev/null
+	fi
+
+	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+}
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index fc8ac992e721..952a7e008bee 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -3,6 +3,6 @@ DIST usbutils-008.tar.xz 287052 BLAKE2B eb9b998adb69938d004828585f782840e34f4533
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
 EBUILD usbutils-008-r1.ebuild 1244 BLAKE2B 65d0f771202bf1e39d243c6f46d3f45d818033b7bd40ba198e834038416498a68e329c7182ec0ba756479ee6bd54aac11556e4513b44baa98c0dcee320b1801a SHA512 5384707b65c9801744ec1838e94396ee421ea007ec25c5afc1503134c2d7bf0231fdd1d9dce8b6af9892177b1dbe16b30303c810bb4e1d82b2082c2f32fe5964
-EBUILD usbutils-009.ebuild 1146 BLAKE2B e619fc2898a516e98a1f243f8205d2ba1c535a15c23d6b0b826e5a2f939f3cfa610da0a7b092a447c60b73ea08d5b516cb50d21671879a770775c6f6461d2a8e SHA512 b7594e70ce5ada95c0efc0191aec74a13330904f76dcaced96afde311932857009d355f29fdabb465266b9436e50052ffc6ff8870c680cb44afc7885a4220856
+EBUILD usbutils-009.ebuild 1144 BLAKE2B 9fa4c45b9b706633f9f967468f4d6115c4d37310e6b9fa7d39c3a58a7f60a56fdb0039fabcd4e6c442927c5a18bfc0a0173b017617130265821ccc1c3a3f225a SHA512 40cf6c93e23f33e46c8111fc17e00c9a57b457c4ccf260188ac4b12f4f524d9f8d43e206f27bb72f954ee7f4506034516cf15ed477fa8cf81aa5e262768455d8
 EBUILD usbutils-010.ebuild 1204 BLAKE2B 5ba8ce207ceeec0297ec554ec40c288f77eb6973926648294535fa2c63997fb8f5d9b4efb64700c891399f2421e814ee44819f791f232b6596b45b38b8e82679 SHA512 671d130588c07e24c793b4cc8d929c390baeec46001b2344e2c09cd862fa1bad9445a22292be54a98d762047cf782a0cc60f4de43fec650d9763f6b4143fcb2a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 6e7fb4004097..55edd2e05387 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 26b0a1cfa88e..a828ac246d92 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -3,12 +3,15 @@ AUX xinetd-2.3.14-config.patch 154 BLAKE2B d003faa46d6ecc20d57d087896acc3f39a125
 AUX xinetd-2.3.14-install-contrib.patch 728 BLAKE2B 4624096a41c3ce819f8976b561e761a65b7308dbaa7863e6c287f99a1ac206497c5ef9dc0222a0d81ab565d280394a44573b3ba7734879b24644a53efe6e5f77 SHA512 15b8b1649b02e2d8834eb057bef7345497d230a4b10600e9b3e2a83511f9c7df115009ba1f38b1c4907417735454cafbbc41a96266fbb4370c584ecf1aa1638b
 AUX xinetd-2.3.15-config.patch 437 BLAKE2B 50cf65153ee242dd0bc7ec587ee7f50de6d7385e1f6ffa213b11e70f2f584d42ee544f7be297b38275290338afaf689cb0aed9d1435a14bb3e0f0b25b6a42ba9 SHA512 58a9880ca154441c5cfc3ed978a0224601d406a4422435a430b885985a0fbe7ef0d750f54047cb0d7fc5c6ab7bc35433776bb5c6c2c61525e2a04b49d509ad66
 AUX xinetd-2.3.15-creds.patch 367 BLAKE2B d2ffeb2d83b1c604556e240177417d79e2d4ce499c4fdb0b431a414835a4e2eaa5b24e01ab4e698211bfd2e63d2872ebd9456af81faa2fb755342bfe2cdfa2fb SHA512 5d1d883620ed6c1ae0e391687a1a10769eb4c2436cf8bae60ddbbb7b8d1250272c2aa7068c308ee1f3540a41fcdf8ae890a7687ff0213553c59f6a91718f46c1
+AUX xinetd-2.3.15.3-no-rpc.patch 1290 BLAKE2B 8330913acccd865b4dff0c6a918936af8736854e90e5661633d5a91b551478e3ec87990f6ac6562c000328bd5ed57918359b1fdf214e297bee2376abdf1f589d SHA512 eb7e463a4f65cd5c7e271de46d9924ae6b96bc20ca7075e4c94caafb81ad03544eebe8a610313a1c402da10e010d3efd3fb2f52d0d117b9c406700831067c6aa
+AUX xinetd-2.3.15.3-rpc-configure.patch 1709 BLAKE2B 7a7d90a8f10d8b8a5274a63d38e38bd6c93a7a7d1ccf5171cbfa612828a22ff4f04045d0d44e321caee2fa8e37ff209d6b1b1df715e38c43a16792a9f4374676 SHA512 52fea8f4d95882966e31761d67c3991eb4f9bd853761f0b6a9acea8a72774176f98265f8260467cff4779c69c2bec6764a6a48d7c6c620bf31bc71c50287f229
 AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbaed904d8387a4ac686f730e2f0ddf5ee90575bd0a7d73588a23b25ec4a6e9c73d48714f5770f5d SHA512 03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
 AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b23468f909eea22c411be11cf3e2c68757e8120db73ccc8ca624c808c6563859a29c095b94c10bbf9 SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0
 DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d
-EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85
-EBUILD xinetd-2.3.15.3.ebuild 1086 BLAKE2B a015f743a33b424703f9bff3bd921b91d9814bb96c8477d7d9d1a55ecf2987df8b2fbf242ed6a7d10b03a1aaea7eeb69b706afaa7b039b82f94c792cc3d02963 SHA512 405118491c72572a880dd48b0ec8408827dabbc08f910eef5e79188e946afe3d77b9bb1f2281dbd82c1e877e9898bd13d2b671fa0366f7ef87d4bed51e6945a7
+EBUILD xinetd-2.3.15-r2.ebuild 1467 BLAKE2B c0413e497292f044b847c6b84867857eacad275dfdd2f008b5474c58f495a198e35c59a4dd03b91025637f4ceab1e5ad8c194ca8afc8feacebc6bdb4d0a56427 SHA512 b8a942166b119cf6cf8aa3038db1b19fd1e8d818a3adfb56305ac29dfc7088364401ec3e4f10f2669084ae4685b24419eaf3c694615367a8be7dda4febe7ce24
+EBUILD xinetd-2.3.15-r3.ebuild 1574 BLAKE2B 86753bd03b2b446abd848b56e9180ce5bca615bd5dd0faf55a3f92e7d5093908e968164356c4ea7b9d5f16cca4086cfecfc149de5a491164884ea0949d5a9839 SHA512 ca0e166253b5cb80c9180a2bee4610c7d6aaaf1d38b62c10b024d7dda91be57b71fa22c742188f1357b3af9feea82af60f818c42de377bc40746adf6ef09cacd
+EBUILD xinetd-2.3.15.3-r2.ebuild 1381 BLAKE2B 6c16dedba41a1f9ce0d6ee3d51f88b2d03137a8d3bc9068ac2a0db2550efa9d68174b075981391839a1abe13073ec392ef7fb5e0e91eac048f7d7831891713ec SHA512 86e8fa9e66d95313d05b6c7b3def44e26452846b889f335013be14cf051ac82eb292505e48bc1bd017f961cd0df5300345b32374ea15153a54da02d007b43a62
+EBUILD xinetd-2.3.15.3.ebuild 1046 BLAKE2B 921c62db32a23a855dfe328213a5a339e09f1fb90842c68dd8197a61eb3d02d28007632e98d15c912a5e3b2883edd775962317777914f1a164a42d19e2bac869 SHA512 f26e677cb3c254aff51a0799bc1ae7329711077b522a83de43d44c1c8a698e81a308e925706a7417c031863cb6221b841cf7047260382677bd370fb8af7e1b32
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch b/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch
new file mode 100644
index 000000000000..3bd995a0892d
--- /dev/null
+++ b/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch
@@ -0,0 +1,50 @@
+https://github.com/openSUSE/xinetd/pull/8
+
+From 4278495b1858b5b1ce94d72bd619eb79aab8ca04 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 18 Jun 2018 18:49:38 -0400
+Subject: [PATCH] fix no-rpc builds
+
+The code base already has support for -DNO_RPC, so fix the breakage
+introduced by commit 56520dcc88c35113877c8f4f52bd98ad95b44653.
+---
+ src/confparse.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/confparse.c b/src/confparse.c
+index 5b149dd03808..7965cc405f24 100644
+--- a/src/confparse.c
++++ b/src/confparse.c
+@@ -13,10 +13,12 @@
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#ifndef NO_RPC
+ #include <rpc/rpc.h>
+ #ifdef HAVE_RPCENT_H
+ #include <rpc/rpcent.h>
+ #endif
++#endif
+ #include <netdb.h>
+ 
+ #include "str.h"
+@@ -730,7 +732,7 @@ static status_e check_entry( struct service_config *scp,
+ 	   }
+    }
+ 
+-/* #ifndef NO_RPC */
++#ifndef NO_RPC
+    if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
+    {
+       struct rpcent *rep = (struct rpcent *)getrpcbyname( SC_NAME(scp) ) ;
+@@ -743,6 +745,7 @@ static status_e check_entry( struct service_config *scp,
+       SC_RPCDATA( scp )->rd_program_number = rep->r_number ;
+    }
+    else
++#endif
+    {
+        if ( !SC_IS_UNLISTED( scp ) ) 
+        { 
+-- 
+2.16.1
+
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch b/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch
new file mode 100644
index 000000000000..682dece1b2b6
--- /dev/null
+++ b/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch
@@ -0,0 +1,57 @@
+From 928d69309592704892d124b1f8de9111164c3793 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 18 Jun 2018 22:11:21 -0400
+Subject: [PATCH] configure: add a --without-rpc flag
+
+The build already supports NO_RPC to disable all RPC logic.  Turn it
+into a proper configure flag so people don't have to hack it up.
+---
+ configure.ac | 25 ++++++++++++++++++++-----
+ 1 file changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8d0b562ddaac..75ae7fb472dc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,11 +37,6 @@ AC_CHECK_LIB([m], [log10], [
+ 	AC_MSG_ERROR([Unable to find working libm.so])
+ ])
+ AC_SUBST([LIBM_LIBS])
+-PKG_CHECK_MODULES([TIRPC],[libtirpc], [
+-	AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.])
+-], [
+-	AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>])
+-])
+ 
+ # ======================================
+ # Check for various headers and settings
+@@ -112,6 +107,26 @@ AS_IF([test x"$with_labeled_networking" != "xno"], [
+     ])
+ ])
+ 
++AC_ARG_WITH([rpc],
++    [AS_HELP_STRING([--without-rpc], [Do not include RPC support])],
++    [with_rpc="$withval"],
++    [with_rpc="auto"]
++)
++AS_IF([test x"$with_rpc" != "xno"], [
++    PKG_CHECK_MODULES([TIRPC],[libtirpc], [
++        AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.])
++    ], [
++        AS_IF([test x"$with_rpc" = "xyes"], [
++            AC_MSG_ERROR([RPC support requested but not found])
++        ])
++        with_rpc="no"
++        AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>])
++    ])
++])
++AS_IF([test x"$with_rpc" = "xno"], [
++    AC_DEFINE([NO_RPC], [1], [Omit RPC support.])
++])
++
+ # =========
+ # Hardening
+ # =========
+-- 
+2.16.1
+
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
index bd8c5d93a129..99bf38e9a727 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
index 31d86d05cec9..357e0c91b5aa 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
new file mode 100644
index 000000000000..92bc834e7df9
--- /dev/null
+++ b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic systemd toolchain-funcs autotools
+
+DESCRIPTION="powerful replacement for inetd"
+HOMEPAGE="https://github.com/xinetd-org/xinetd https://github.com/openSUSE/xinetd"
+SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="perl rpc selinux tcpd"
+
+DEPEND="
+	rpc? ( net-libs/libtirpc:= )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+"
+RDEPEND="
+	${DEPEND}
+	perl? ( dev-lang/perl )
+"
+DEPEND="
+	${DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-rpc.patch #651838
+	"${FILESDIR}"/${P}-rpc-configure.patch #651838
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -i \
+		-e 's:/usr/bin/kill:/bin/kill:' \
+		"contrib/${PN}.service" || die
+}
+
+src_configure() {
+	econf \
+		$(use_with tcpd libwrap) \
+		$(use_with selinux labeled-networking) \
+		$(use_with rpc) \
+		--with-loadavg
+}
+
+src_install() {
+	default
+
+	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
+
+	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
+	newconfd "${FILESDIR}"/xinetd.confd xinetd
+	systemd_dounit "contrib/${PN}.service"
+
+	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
+	dodoc README.md CHANGELOG
+}
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index bd39ceb3f7a3..f1156920796f 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -10,12 +10,12 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="perl selinux tcpd"
 
 DEPEND="
 	selinux? ( sys-libs/libselinux )
-	kernel_linux? ( net-libs/libtirpc:= )
+	net-libs/libtirpc:=
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
 "
 RDEPEND="
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 9c4b4250ca44..132ccc80b727 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -3,9 +3,13 @@ DIST yarn-v1.2.1.tar.gz 885691 BLAKE2B ba7a291e4b071cd285e890fbd8af2a1adf78bc7a6
 DIST yarn-v1.3.2.tar.gz 886500 BLAKE2B 224503241b646bd6befe6571022e1081c4e9cce2371ce0c111704a6f0ceb7c4b4f0267c9c37d05feec60311cc7804706fb47d130ca64e6182590e88d8476b386 SHA512 d488ae56b60884bb42e5e2ac8a0359c6947e234ed8b5bba12a93f24abb4419b4a6fef708c35df8caa9e68edca3fe570d1dcda9295d29438e45a32ef5d029aedf
 DIST yarn-v1.5.1.tar.gz 936225 BLAKE2B b35631ba0fef692797c83431fb673c0286dbd29a5a3e5819111bcc189a136d7059afd7e1901a249204e1a14ff4c7a7321207d7fe1c057d4e585184424f9c26dc SHA512 b58b712ee395d4cfec5271e02e8cf77489438815aeebea1c6844866eb6161be9ae078f62f726e44eeb704d0195b94339d1e89991ce56de8690d613d4bab5f548
 DIST yarn-v1.6.0.tar.gz 941806 BLAKE2B c3f225dae625e6404cf2bc363e695adeb43c3738a4a501c88415bee20810085dbf63abbaa7ef64200cfbdfc8a1a21e463af2c035c37e21dae49d5bff18d2d5fe SHA512 073adcb75dff799ac68a5e0adbdc8f8343d3ada3e356dd0e5dad4254b21e0337bc76201163d037eb01e7c5365f15085ef38df171d77ee36cd58557a175e3f713
+DIST yarn-v1.7.0.tar.gz 944751 BLAKE2B 468ee9fbc94e5ae74137f9232929e78213ee435a30b6c22a9bc4378fbf28ce1f4f1358d745f2f298767e98d9cded64d8c61a2f8e4705999bd194aaa21b3505e7 SHA512 1de75fbb48c49ef9c39eab434b3f27b669a8e74f9305e5f03fe3ca30cf6ca00b4b94f8445621474089681bb74f4813c0595633a45c16c4469bab08187ce94495
+DIST yarn-v1.8.0.tar.gz 953127 BLAKE2B b290c4e6a5800afd8706954dab424f7cf0c784c0dade705f10a06803dfe64b83206f534dbb41e3e804593a17d722ddc3253377465413be571bb2b29639f99ea6 SHA512 12919a27d0845644992a60c87a919ef2776e5959c43d1c31767021475b8cbb591f5f6ff2b214eaddc11d520f91d758bee439abe077717a7348eb387813dbefb6
 EBUILD yarn-1.1.0.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.2.1.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.3.2.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
 EBUILD yarn-1.5.1.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
 EBUILD yarn-1.6.0.ebuild 848 BLAKE2B b0532cde76950dee68e42c3b861ad021657134752b6682245f3920e3577cff8ccd9d8846c7a8fe73cccb3a49a730b962e428ef75eace21c8acbd887a135f8231 SHA512 f18e0e8701e6375c3af0f91569fde1e054a68d9d8c8545ea22c83dfd24f0b0d229eaa6465aec7f5281db596a92e8da2bb58f237ca312cdca84e6934c87d3f613
+EBUILD yarn-1.7.0.ebuild 856 BLAKE2B 4a60e7c73867461b27dbcf392f1b534d2f8bdadbe60fc7f217539cb9728a42e286a53f66d53b1bcc1fe1d83c52589e076f1e6cf4250280ae2058bbb29de6a970 SHA512 28c90ff73bf2f532099ef9311c4b6df63bb78315d316cf8898aae3f558903fb54042df34c10aa9469be0ea9be00f9f7cfcc683bfeb1902a8577655d80a85f271
+EBUILD yarn-1.8.0.ebuild 856 BLAKE2B 4a60e7c73867461b27dbcf392f1b534d2f8bdadbe60fc7f217539cb9728a42e286a53f66d53b1bcc1fe1d83c52589e076f1e6cf4250280ae2058bbb29de6a970 SHA512 28c90ff73bf2f532099ef9311c4b6df63bb78315d316cf8898aae3f558903fb54042df34c10aa9469be0ea9be00f9f7cfcc683bfeb1902a8577655d80a85f271
 MISC metadata.xml 440 BLAKE2B 526fb5eb5ad9a9ed7062fac74a6c5cbd0bfc82b8f69da9cf687b16c0c6d0cc03728abf1508c6c48960c26198fa88ca8fe64f924c080010b5158ff8f9cb06e850 SHA512 3c6dfd749421e6620930993f60bdac847c8e3baa65d4389861de3b8d63641cdc54402274e4b663a718adf8889d2e8bb9b036b427184e1f4d71e290fa74a273cd
diff --git a/sys-apps/yarn/yarn-1.7.0.ebuild b/sys-apps/yarn/yarn-1.7.0.ebuild
new file mode 100644
index 000000000000..b4b5ee7ead80
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+	net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+	insinto "${install_dir}"
+	doins -r .
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+
+	while read -r -d '' path; do
+		read -r shebang < ${path} || die
+		[[ "${shebang}" == \#\!* ]] || continue
+		chmod +x "${path}" || die #614094
+	done < <(find "${ED}" -type f -print0 || die)
+}
diff --git a/sys-apps/yarn/yarn-1.8.0.ebuild b/sys-apps/yarn/yarn-1.8.0.ebuild
new file mode 100644
index 000000000000..b4b5ee7ead80
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+	net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+	insinto "${install_dir}"
+	doins -r .
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+
+	while read -r -d '' path; do
+		read -r shebang < ${path} || die
+		[[ "${shebang}" == \#\!* ]] || continue
+		chmod +x "${path}" || die #614094
+	done < <(find "${ED}" -type f -print0 || die)
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-23 07:00:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-23 07:00:28 +0100
commit	e23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch)
tree	5a4ac448a3b288b731c24d947e0ce52df3cab07b /sys-apps
parent	8187a741807f3e9a9e26304973cf18087dcf2560 (diff)