gentoo resync : 02.01.2018

22 files changed, 441 insertions, 114 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1c47409d584b..71cbc4cc1e4c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 148f2b0aa108..28e68fa00bc7 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,8 +3,10 @@ DIST debianutils_4.7.tar.xz 156276 BLAKE2B 9d32dc8222b67d4f1f91d58af0811412924f5
 DIST debianutils_4.8.1.1.tar.xz 156256 BLAKE2B fba83e834486da25004a0d45b6cf20e84d66ac6843b3dbb30fcb334de8d08468f986dd8bff7a8da91f4924d61dc3fe143494bc8a33809f0412ceb107bea4e2d0 SHA512 22f27692a7d3847fad1be223d73e5575581db8621771e92e68fe91bd31e67084fd655fef857905be46ab3a45340503b0af9399b8fe28f221ea5cee4b49970821
 DIST debianutils_4.8.2.tar.xz 155944 BLAKE2B 4cfdf43ad2e3fe35578fe980a9d18bf8f4c8b3cc581a6778b9a32fef21d308e40ffbfa5df5cc3cfc72090047bd8bbdbd824c7955b320e955d4cd390b76f98f82 SHA512 40bad124e99c5a315b7ddf181afc2db216c85ddfe5603a16fbd21bd01091d3631b18826ddf799ba232ecaa1c2b3ff389a26a533f392918eb0733efdd75749759
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
+DIST debianutils_4.8.4.tar.xz 156344 BLAKE2B 069d15039579d4ce03d2ca4bfd0df199f0044049e7cd6ca899104eec5d917f3db290649bfdd851d8b14519df2750fb975bc6d96e98e14cdb626a610d44da80b0 SHA512 7d7b2d12d4907f6032477b4cd5b5dc94d8093724af8a97859c1d4cf229479e2dfe6d44143b454ed9b1990ca2d4833eaeb059659d8c305623875fdc8420659855
 EBUILD debianutils-4.7.ebuild 955 BLAKE2B 62f8d18a91a707314302473daab1d2e4645261e552036378271500238251cca8b8c9c9156532832637aeab5045ef1b8528c21fca9ceae8d4424a826862145bb9 SHA512 581e2efee6fc722bb26cb3f5072758f119927455e584c41be27562906d405309d121e9e7cde3d5427d6399f7e9519423ad4a7e99650a2214a142963b27f22cca
 EBUILD debianutils-4.8.1.1.ebuild 947 BLAKE2B 454e4df56bef1fbd808711c7ece169ed67f7d072994a7fb9e283241964d1779d1196e6153fac83fa3211426f7aee3dc6c396063cf969eb16b379b0af9934ecd3 SHA512 7d577f9653dd24d11f32282e5fa446d0d759442471a939501459838aa7fb25d409425caff6ff439cebe1dfd5ed1494214a1a59f473cd423b31f99aa63687843f
 EBUILD debianutils-4.8.2.ebuild 947 BLAKE2B 454e4df56bef1fbd808711c7ece169ed67f7d072994a7fb9e283241964d1779d1196e6153fac83fa3211426f7aee3dc6c396063cf969eb16b379b0af9934ecd3 SHA512 7d577f9653dd24d11f32282e5fa446d0d759442471a939501459838aa7fb25d409425caff6ff439cebe1dfd5ed1494214a1a59f473cd423b31f99aa63687843f
 EBUILD debianutils-4.8.3.ebuild 971 BLAKE2B 834ee8bbbfd572fe0b7ca9e229cadfbd4541a49d042c0edf5fa24bf42aae9f14230296f7788c1339b0590adcc4d735f5032c58598c4821e702f0e0a7293d22e2 SHA512 fc51841b5a3858fd7dded29e9d72ab552585078fd8bf0e7fce79bc891f5b61ff947923c12a582aa9efdf161ab85ac2a48526d00c9e0f655ddae6fb1215f390e1
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD debianutils-4.8.4.ebuild 975 BLAKE2B b0578fe970dc5497fd7989f35e5b0e111ab901a660e996e5ee067a3f6d8fddafdb528d45ecfbed166bf5cba006552265269d18fd9cee6fd20d7af9a38d563947 SHA512 17f0039fc61ffe48e27a993465d208397abed8d50c823af3cab45749c6d841a96e2b1717b970d0ae98853b8b65f4b201d85012d9dceddf7dd21f64fceec1c7a5
+MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.8.4.ebuild b/sys-apps/debianutils/debianutils-4.8.4.ebuild
new file mode 100644
index 000000000000..6932bae8d611
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-4.8.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+installkernel static"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	into /
+	dobin tempfile run-parts
+	if use installkernel ; then
+		dosbin installkernel
+	fi
+
+	into /usr
+	dosbin savelog
+
+	doman tempfile.1 run-parts.8 savelog.8
+	use installkernel && doman installkernel.8
+	cd debian || die
+	dodoc changelog control
+	keepdir /etc/kernel/postinst.d
+}
diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index 56c124413057..f6690ff31371 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name='installkernel'>Install /sbin/installkernel script (for Linux)</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 6573f8161bb1..681d2305eb7f 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -6,5 +6,5 @@ DIST less-520.tar.gz 337959 BLAKE2B e3008ec61b9095c7e0f696a662478e1aaeb9108dc26a
 DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a
 EBUILD less-487.ebuild 1440 BLAKE2B dded5fb96b09a7de894e13c701ecd479ad1b1569094500f3701aa58f58b8f2d46106b8d9c82ac16f9b9e648655f87d788de5a71d7d0f69d357184a656a1bec51 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c
 EBUILD less-520.ebuild 1404 BLAKE2B 3a09547f4565168340d4a2c33b84a1380af245d6e949fc4a88f7be0c6829c8470ad4d20a59682268adb32592deff948f8f86ec2f05f3e023708d2a8ba62c0f8c SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5
-EBUILD less-529.ebuild 1404 BLAKE2B 3a09547f4565168340d4a2c33b84a1380af245d6e949fc4a88f7be0c6829c8470ad4d20a59682268adb32592deff948f8f86ec2f05f3e023708d2a8ba62c0f8c SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5
+EBUILD less-529.ebuild 1402 BLAKE2B bf76dfbaad663a235de3e07524ad5d96d4b01ede632c8514318a0792d6c7828524e3983fccf6d19be802a24fdfcaf901512a9a16437cda28512c3bc701bb82e9 SHA512 4baaf7654ae9d8d5ec7b68555a4e992f610e3e65e57db80e9d60e803348a556d6b20dc75cd69a898d0f1bd411a32035b8ee254c795fa2a203ee5d5b988017da1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-529.ebuild b/sys-apps/less/less-529.ebuild
index 643a59bc2b71..f2b37d773330 100644
--- a/sys-apps/less/less-529.ebuild
+++ b/sys-apps/less/less-529.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 24c529665aa2..ec157d49d770 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,9 +1,12 @@
+AUX mawk-1.3.4-sandbox-default.patch 2720 BLAKE2B 3f0a25b06f1045659b9dc7decbbd54c9355f94a6879cad0f121e825cb705652b14b7a4c4655f2fe89c2f921aea511f8b8755cd398d28ce9a47ffa6bfef158953 SHA512 bdceb22a51464de5786d469ffcc6fc7157a0aca3e3dc89553418a401de3735b95439691ccf5553d0746b3e793824821db85a2dfe14633db1ad5f1256fa3e65ab
+AUX mawk-1.3.4-sandbox.patch 3805 BLAKE2B a7d55816bea03fb949387c8a1acf310b6dbae60014601bc514f44cbf3a8632c275bf6b786b016e93450ecf60d61052b14b029e56d559656dc87fed72a66239af SHA512 03149ba3d3e0cd5fa6d50573cc50260346e91d82bfd510d8a069a3e076df49d2b85edd2b42632a34e21f9d82c384212272e99b1cf305b4c1a78e252b75da4eb3
 DIST mawk-1.3.4-20150503.tgz 468794 BLAKE2B 10a2942f990d67ebea3cf75c83beefbc58f6ad4ffc560260f8206a8fc79b03d1e4cb8bb4ad23b256a547b10e4885c1a0813f054aa60ab5cb1b20c8d974a508d8 SHA512 ac9dde6948328d8db94458448abdf7389f8862ae6093315dd19ed9d1cbeab60fca1fc7b084cda4ce09505010f7108612585e3c4ba9663ddf3adb869bf1d9d7b6
 DIST mawk-1.3.4-20160615.tgz 466312 BLAKE2B ad8077e44a069b4ba19d1c1051d488ee7234b834aa0a04be6bda72cd5726c84185d4bb7de564e1a862c43de1de81d36ff8d2b11ee001ebbcaf624de6aabe19ab SHA512 97062fe278f1ec30db2233f9bd5a2f60557e2362a2c785bce94a7b9eec9065138cf1349bc145c18194b5af56c8e943e63c95baea839282a65ba09062bdcca2ae
 DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c931a40d59bde401d00ea7bc74b728c8149f80187e5d73923496e2eef1ec70bc097aedf0b68630f73264d45d96ebd SHA512 c5edcbff4ab1e40eb9b178a045fcd426a5f3c93a3ab5bc1ca1fa85a0977b8c9060967fcbda4e4a6e9e68628f50a2814e22939676008dced529377d2cf9bda5b2
 DIST mawk-1.3.4-20171017.tgz 460819 BLAKE2B 91cb4cd039ea7773b788db87389f8ec34914afc8b299fecfdd579fe89fc4e6d731bfdc9c06a2c6c3d75ab9e1022bf5dbe1c662962d6ccd8a8f6fe4f8589927ca SHA512 4ed6ca0ecca12e7409d3d364b72dc6a2b411c61bf53fe8aa0b0cac65a3bdb941921c0b81d94f34c8ac9f4922c8c7566d347b5e6b5c74518ae3a88904f9e20f27
 EBUILD mawk-1.3.4_p20150503.ebuild 825 BLAKE2B 1d5b1fb1ac43e06b019f86bdf8ca9fa2d4392e27fee2160e13b46c90ee567979d70442be3aea5d96f73497502238d919da684a6268d7918802f8d57aa7389db8 SHA512 7f7b0386ae02ee8bd6b2a3df4218f3dd732b22e9154b8bd37ed15afbeba2a145aa02161e64b8e2be78d4e6d9c2b58e3d4fa4c7d5b557f434c1cdf21e593bd749
 EBUILD mawk-1.3.4_p20160615.ebuild 870 BLAKE2B c25882ed451d83bfea7ca5dd731a6d532396c91f7a38236ae2b884cb5f504341a937da1dd4bb22805b6f94488414756a182bcd6e3e5eaa21ef74e8c90805e7f0 SHA512 5841a8486c4a59f16c1add9e9aceb89fc428b29a29359ce17e451dd46f66c0501b4260463f4b152e1403e391d86c30638edef328ee31ae9ec1b0b4aa0238afe8
-EBUILD mawk-1.3.4_p20161120.ebuild 879 BLAKE2B 26329579de34f167e6ce3ac06cb6aa2b8d9a941535fc66422fa62efd6c7d9f25f1aad2cfe4ddcfe157eaceae20d11cb0fc2d8f514101525d15fc49003ab24cdf SHA512 8479121ba985077b8002fe730ede99f548dfb806846ecb221aed06386e0c39879d915f6346ba9f71c16f864f315c0391bc4e6b8c2a1e105b826c0fe4bef8a670
+EBUILD mawk-1.3.4_p20161120.ebuild 878 BLAKE2B 438ed36e28fe7fc1fa09fbdbaad36d6f8ce5780972170ebb3fdfe04dd66da5ccaed8d8910bffd0841f732336e2cba0437dbe37b642abb2e35f151ca9205ea820 SHA512 0606dd2ad1d6f4e4ee59bed3c67d475da4f63b2ea7df8f84c045deb1afe919ee140c4a76da73cbc5dfe62c41df46b3faddfb0b20307b02bf2e6d41892d92927e
+EBUILD mawk-1.3.4_p20171017-r1.ebuild 1037 BLAKE2B 9c36e6b12d6a7b1c6448ed423509032464388849efc66312b24c8e7ba3efc11d94c3f425077f949514609bfcabb10da2d849a1977c919d068350c8137c942d14 SHA512 550d5d3f9123d402ecf442a94c8ccd87959eb8669a490e766e16d7b93acb5d3d23562527c5aac727cec44f1d068b339016dd901ac192662f06da3803f7ecd6a6
 EBUILD mawk-1.3.4_p20171017.ebuild 883 BLAKE2B deb941193402b058ecf23a7523698416660b09cfefcda6a51b2f2f50aaa72ba5b9230459826d82f9066b4bc8766c72f2a55583e21705f848df0ffa4d966509a5 SHA512 e072d0a8bb7125965bd3e0edea01eff17ef53b17baaf117fa7f5cd910acebd4cbc57f6725a6ae0419cf2eb177fcd3b8f4cdf5c5f0e7bb4d86fdbe86f7b75c9de
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 359 BLAKE2B 988733eff41a4556cdb4f8d66adbe2864f33f4245ab1ba3a1456cb3b189fd12138cec7666d2fc125d275865a028274aaf5a41396430721ac96b913dc2f667f94 SHA512 bb64e60075207240fabd037108c2885b934d0dc0a72bdcce4c8c138555b1ebb4de811745235ee11fde75559ddf55f9488b71f53aab7e92df61099cba5ec28d2f
diff --git a/sys-apps/mawk/files/mawk-1.3.4-sandbox-default.patch b/sys-apps/mawk/files/mawk-1.3.4-sandbox-default.patch
new file mode 100644
index 000000000000..c3b0fc1c892d
--- /dev/null
+++ b/sys-apps/mawk/files/mawk-1.3.4-sandbox-default.patch
@@ -0,0 +1,91 @@
+https://github.com/ThomasDickey/original-mawk/issues/49
+
+Note: We hand modify the configure file here because the version of autotools
+used by upstream is very old/finicky, and it's a simple enough change.
+
+From 1ac333b97615c451d7a4743b4724edd46d37a8b2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 7 Nov 2017 01:07:47 -0500
+Subject: [PATCH 2/2] add a configure flag to lock sandbox by default
+
+This lets us deploy systems with the sandbox always enabled.
+---
+ configure    | 23 +++++++++++++++++++++++
+ configure.in | 11 +++++++++++
+ init.c       |  4 ++++
+ 3 files changed, 38 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 8b795fbd264b..770092005386 100644
+--- a/configure.in
++++ b/configure.in
+@@ -112,6 +112,17 @@ fi
+ AC_MSG_RESULT($with_init_srand)
+ 
+ ###############################################################################
++AC_MSG_CHECKING(if you want mawk to always run in sandbox mode)
++CF_ARG_ENABLE([forced-sandbox],
++[  --enable-forced-sandbox always run in sandbox mode],
++	[with_forced_sandbox=yes],
++	[with_forced_sandbox=no])
++if test "x${with_forced_sandbox}" != xno; then
++	CPPFLAGS="$CPPFLAGS -DFORCED_SANDBOX"
++fi
++AC_MSG_RESULT($with_forced_sandbox)
++
++###############################################################################
+ 
+ AC_PROG_YACC
+ CF_PROG_LINT
+diff --git a/init.c b/init.c
+index f7babb337e04..e035d6ea2fc0 100644
+--- a/init.c
++++ b/init.c
+@@ -492,6 +492,10 @@ process_cmdline(int argc, char **argv)
+ 
+   no_more_opts:
+ 
++#ifdef FORCED_SANDBOX
++    sandbox_flag = 1;
++#endif
++
+     tail->link = (PFILE *) 0;
+     pfile_list = dummy.link;
+ 
+diff --git a/configure b/configure
+index a3bf42fe9245..442875b8e58a 100755
+--- a/configure
++++ b/configure
+@@ -4132,6 +4132,29 @@ echo "$as_me:4131: result: $with_init_srand" >&5
+ echo "${ECHO_T}$with_init_srand" >&6
+ 
+ ###############################################################################
++echo "$as_me:4109: checking if you want mawk to always run in sandbox mode" >&5
++echo $ECHO_N "checking if you want mawk to always run in sandbox mode... $ECHO_C" >&6
++
++if test "${enable_forced_sandbox+set}" = set; then
++  enableval="$enable_forced_sandbox"
++  test "$enableval" != yes && enableval=no
++	if test "$enableval" != "no" ; then
++    with_forced_sandbox=yes
++	else
++		with_forced_sandbox=no
++	fi
++else
++  enableval=no
++	with_forced_sandbox=no
++
++fi;
++if test "x${with_forced_sandbox}" != xno; then
++	CPPFLAGS="$CPPFLAGS -DFORCED_SANDBOX"
++fi
++echo "$as_me:4131: result: $with_forced_sandbox" >&5
++echo "${ECHO_T}$with_forced_sandbox" >&6
++
++###############################################################################
+ 
+ for ac_prog in 'bison -y' byacc
+ do
+-- 
+2.13.5
+
diff --git a/sys-apps/mawk/files/mawk-1.3.4-sandbox.patch b/sys-apps/mawk/files/mawk-1.3.4-sandbox.patch
new file mode 100644
index 000000000000..ae2ccbd50ec1
--- /dev/null
+++ b/sys-apps/mawk/files/mawk-1.3.4-sandbox.patch
@@ -0,0 +1,141 @@
+https://github.com/ThomasDickey/original-mawk/issues/49
+
+From ae3a324a5af1350aa1a6f648e10b9d6656d9fde4 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 7 Nov 2017 00:41:36 -0500
+Subject: [PATCH 1/2] add a -W sandbox mode
+
+This is like gawk's sandbox mode where arbitrary code execution and
+file redirection are locked down.  This way awk can be a more secure
+input/output mode.
+---
+ bi_funct.c | 3 +++
+ init.c     | 8 ++++++++
+ man/mawk.1 | 4 ++++
+ mawk.h     | 2 +-
+ scan.c     | 6 ++++++
+ 5 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/bi_funct.c b/bi_funct.c
+index 7742308c72a5..b524ac8dac8b 100644
+--- a/bi_funct.c
++++ b/bi_funct.c
+@@ -908,6 +908,9 @@ bi_system(CELL *sp GCC_UNUSED)
+ #ifdef HAVE_REAL_PIPES
+     int ret_val;
+ 
++    if (sandbox_flag)
++	rt_error("'system' function not allowed in sandbox mode");
++
+     TRACE_FUNC("bi_system", sp);
+ 
+     if (sp->type < C_STRING)
+diff --git a/init.c b/init.c
+index 0ab17b003f20..f7babb337e04 100644
+--- a/init.c
++++ b/init.c
+@@ -40,6 +40,7 @@ typedef enum {
+     W_RANDOM,
+     W_SPRINTF,
+     W_POSIX_SPACE,
++    W_SANDBOX,
+     W_USAGE
+ } W_OPTIONS;
+ 
+@@ -96,6 +97,7 @@ initialize(int argc, char **argv)
+ 
+ int dump_code_flag;		/* if on dump internal code */
+ short posix_space_flag;
++short sandbox_flag;
+ 
+ #ifdef	 DEBUG
+ int dump_RE = 1;		/* if on dump compiled REs  */
+@@ -153,6 +155,7 @@ usage(void)
+ 	"    -W random=number set initial random seed.",
+ 	"    -W sprintf=number adjust size of sprintf buffer.",
+ 	"    -W posix_space   do not consider \"\\n\" a space.",
++	"    -W sandbox       disable system() and I/O redirection.",
+ 	"    -W usage         show this message and exit.",
+     };
+     size_t n;
+@@ -255,6 +258,7 @@ parse_w_opt(char *source, char **next)
+ 	    DATA(RANDOM),
+ 	    DATA(SPRINTF),
+ 	    DATA(POSIX_SPACE),
++	    DATA(SANDBOX),
+ 	    DATA(USAGE)
+     };
+ #undef DATA
+@@ -389,6 +393,10 @@ process_cmdline(int argc, char **argv)
+ 		    posix_space_flag = 1;
+ 		    break;
+ 
++		case W_SANDBOX:
++		    sandbox_flag = 1;
++		    break;
++
+ 		case W_RANDOM:
+ 		    if (haveValue(optNext)) {
+ 			int x = atoi(optNext + 1);
+diff --git a/man/mawk.1 b/man/mawk.1
+index a3c794167dc9..0915d9d7ed5d 100644
+--- a/man/mawk.1
++++ b/man/mawk.1
+@@ -150,6 +150,10 @@ forces
+ \fB\*n\fP
+ not to consider '\en' to be space.
+ .TP
++\-\fBW \fRsandbox
++runs in a restricted mode where system(), input redirection (e.g. getline),
++output redirection (e.g. print and printf), and pipelines are disabled.
++.TP
+ \-\fBW \fRrandom=\fInum\fR
+ calls \fBsrand\fP with the given parameter
+ (and overrides the auto-seeding behavior).
+diff --git a/mawk.h b/mawk.h
+index 2d04be1adb34..a6ccc0071ecc 100644
+--- a/mawk.h
++++ b/mawk.h
+@@ -63,7 +63,7 @@ extern int dump_RE;
+ #define USE_BINMODE 0
+ #endif
+ 
+-extern short posix_space_flag, interactive_flag;
++extern short posix_space_flag, interactive_flag, sandbox_flag;
+ 
+ /*----------------
+  *  GLOBAL VARIABLES
+diff --git a/scan.c b/scan.c
+index 3a8fc9181ab8..c1833b8b7315 100644
+--- a/scan.c
++++ b/scan.c
+@@ -455,6 +455,8 @@ yylex(void)
+ 	    un_next();
+ 
+ 	if (getline_flag) {
++	    if (sandbox_flag)
++		rt_error("redirection not allowed in sandbox mode");
+ 	    getline_flag = 0;
+ 	    ct_ret(IO_IN);
+ 	} else
+@@ -462,6 +464,8 @@ yylex(void)
+ 
+     case SC_GT:		/* '>' */
+ 	if (print_flag && paren_cnt == 0) {
++	    if (sandbox_flag)
++		rt_error("redirection not allowed in sandbox mode");
+ 	    print_flag = 0;
+ 	    /* there are 3 types of IO_OUT
+ 	       -- build the error string in string_buff */
+@@ -488,6 +492,8 @@ yylex(void)
+ 	    un_next();
+ 
+ 	    if (print_flag && paren_cnt == 0) {
++		if (sandbox_flag)
++		    rt_error("pipe execution not allowed in sandbox mode");
+ 		print_flag = 0;
+ 		yylval.ival = PIPE_OUT;
+ 		string_buff[0] = '|';
+-- 
+2.13.5
+
diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
index 5db9517c4128..e70a4f0b2ee2 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20171017-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20171017-r1.ebuild
new file mode 100644
index 000000000000..e50d8aa12776
--- /dev/null
+++ b/sys-apps/mawk/mawk-1.3.4_p20171017-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P=${P/_p/-}
+DESCRIPTION="an (often faster than gawk) awk-interpreter"
+HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
+SRC_URI="ftp://ftp.invisible-island.net/mawk/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="forced-sandbox"
+
+RDEPEND="app-eselect/eselect-awk"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ACKNOWLEDGMENT CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-sandbox.patch
+	"${FILESDIR}"/${PN}-1.3.4-sandbox-default.patch
+)
+
+src_configure() {
+	tc-export BUILD_CC
+	econf $(use_enable forced-sandbox)
+}
+
+src_install() {
+	default
+
+	exeinto /usr/share/doc/${PF}/examples
+	doexe examples/*
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	eselect awk update ifunset
+}
+
+pkg_postrm() {
+	eselect awk update ifunset
+}
diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index 56c124413057..fb5ddc9df936 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="forced-sandbox">Always enable -W sandbox mode for simpler/secure runtime</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bedb16f73eb6..7bc23f15b77a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,5 @@
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
+AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
 DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f57ad97029d7bb3d9ac89fd0ee939fb3a2aaa624a0f40959820903d70e6c209518d97df6b82501325963c963db9df SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732
 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
@@ -9,8 +10,8 @@ EBUILD portage-2.3.13-r1.ebuild 8523 BLAKE2B d8676285889a5fbc2abc9397bb24f61d1e4
 EBUILD portage-2.3.13.ebuild 8220 BLAKE2B 1c71ce90b2d0d0ff9ecdbc842e9178cc5ba3e3016c3d00243f6dfa43772ce8fe6719965bc7f6f968a24ebd267442f3697b698dc5e8e947aca85f611cba33a12f SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01
 EBUILD portage-2.3.14.ebuild 8523 BLAKE2B eed0ce93cc3d1401817cbcc14c12bf76157dda41294958ab2d72ae72187f62d220e3cdde93b40d3f6c7b80e65f564bfb062b2a37230c8200d855b4e585165b80 SHA512 439a5e2521e74d4a5b73e91f9e3f0ae29b3eaa01c6bb3e2f3420f2ee838b6fbb60438e785c30e9806fb7cd65d7dbcf6062d1b3f61a4792c01326ab874dbacdfe
 EBUILD portage-2.3.16.ebuild 8371 BLAKE2B c1442999cc4e36d94412fd451b8a403cf8afea392a798312518f0ee1c13579efffdc2ce3d815f375942ffa34225cf40dd3a4387e7c7f31c3b43dbacf6378991f SHA512 dc064087870150d8c0629e6d7f95f704728b08ee85464c9d228f3e425a74bacded772d6a1ff1371937686b50960410e9e5cd9824ad58e8ca3ae2b10ba3b3b263
-EBUILD portage-2.3.19.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65
+EBUILD portage-2.3.19-r1.ebuild 8420 BLAKE2B fbec704b4eba0d52ebdaf8f4cb02e6ac71e1b982faa1db1845b136b7c16b30360a5aff7031de29b07faaf6709b31b96064073216152edfdf21ef01967672cd17 SHA512 8f13dbb41408bd41901ddbc81df341e61e578bb91b8c44f21f02665f5aebdf8195f337cb0d24518a138880c2c36c50fc2f3b924f91ba5fea083b74c697ab597b
 EBUILD portage-2.3.6.ebuild 8661 BLAKE2B 79789262c8d2cfea53c24291ee9b1d638bee592c2eb6435b22f6996be43bd5e0bf76df39df74163b98297d6ecd11c24fe4b8ee0cbd84b7a62196c0b9de4ef8d6 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4
 EBUILD portage-2.3.8.ebuild 8211 BLAKE2B d615c9a0ae6df8f649f6ccdaecd6a404f9196cc62008b3bc38801c8e355b82b0288c00e4c52e481961fa6f568c0cfd4425a4ec7e313d08f9be143623ea2cfbaf SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a
-EBUILD portage-9999.ebuild 7898 BLAKE2B 3eb2b5417170a7309bb0a56085ab1caf807a7245d02cd3f1f2f1e8dc2a75dee0204538daac9b364d1604da89abef5e55093af6759ef62136f2829a928fec180e SHA512 07c97f2f8b2fdbc4e1494fa517c88eb9fbdfd3429b3e21e4087be9ae4e6cf3ce401cd7def881d32cb9f5e9f8e25515e776c866f050c0181f9ef7e2cbf4affeef
+EBUILD portage-9999.ebuild 7954 BLAKE2B 3722e91d6949748a77a8dc489250b346ea2fec4c02b18c8309f3d29ca83e85a21de83dda39c6e6a963b26e7fc045cc9000d846593f0b2a96428d1709d19441b3 SHA512 c1f07d6fbac108fa40a99324b4d3a3d98c3bc0fdb33c4e02d1e5364a961bc319609ed7eddae94dfdde5e410f008d57edad362ed270432946095a6f897ab9485a
 MISC metadata.xml 1147 BLAKE2B 7a665b1c7a67e5f14020c1604c846840698a973885b6ab3d48c1ccd0782504a4ded3b12c81ccf3b17e539a593ee03a7ea23ec1656d65b0aceeeb59cf67e76408 SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c
diff --git a/sys-apps/portage/files/portage-ccache.conf b/sys-apps/portage/files/portage-ccache.conf
new file mode 100644
index 000000000000..37857fde319b
--- /dev/null
+++ b/sys-apps/portage/files/portage-ccache.conf
@@ -0,0 +1,2 @@
+# Prevent ccache files from being cleaned
+x /var/tmp/ccache
diff --git a/sys-apps/portage/portage-2.3.19.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index b4f03d91d2de..1c78b4a699f7 100644
--- a/sys-apps/portage/portage-2.3.19.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1
+inherit distutils-r1 tmpfiles
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -203,6 +203,8 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
 	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index adb4f2b5bde8..e025371418af 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-r3
+inherit distutils-r1 git-r3 tmpfiles
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -202,6 +202,8 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
 	# Due to distutils/python-exec limitations
 	# they must be installed to /usr/bin.
 	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index 3ba0746a3765..2e828f825e0b 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -1,5 +1,8 @@
 AUX audioctl.init 455 BLAKE2B 5e449ba3910ded2550dbbd367a2a4f63e3964a65b48d228078a30205a731c0270bd96d7bf4105d833b67fcbd2f0ae98de414f5b77f495172dac741498d94183d SHA512 6ae87679c9e51876551babfaa35126a7ae94c15edc21c630154130652a1f9f754c489c5406c9c3166157a45495d05668bb06bce79ab34053a0b74c34b19c16a5
+AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da85598895724873b536628ec205c24028baf908e84008c0e629381a6f703f42baa7d6bef3534e77bb03af6dd3b23d9a9017a43ebda SHA512 302c29f1a33ea6b92184bd272fc974b1886168e7aa3d0f0cdcc117024475cf6b27eed9336f8b7edd84b40862144f58c3337fcc47cf3c1a744e5f4a71f8ee4f7f
 DIST sparc-utils_1.9-3.diff.gz 10337 BLAKE2B 03ee7ca15c4e736955fa08c66bbd1db2ec39764b4334fbec3838f5bcea3945d22c7a3148c00ab43a67324827af473739d014d7a6a895dbbd58c43ba13cbb1efe SHA512 c6eba75261ffee55cc49e3da71ad3a2f12e04574158975c69db0bbd94d7c22ca4dec50f3140cf0bf9f35bb547865deca3cfd3e28e76c70b9173926bc0b8f34ee
+DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
 EBUILD sparc-utils-1.9-r4.ebuild 2304 BLAKE2B 16c4932eff08538320f9e624f942a779fcf6c9011922b0deb52b9abf5595f1274a9cec075756cf29ba81c8b0b5b572d13ccf07e46b6ba8865bc50c8090eea7e9 SHA512 8d72473fb064d0a2c2fc5e4334d23f2af904fa9d7ff4c406193d9dd2f45c4728ed696bc842c6a558958623a5bf89109b37ce25ad7d071d16036ce17807390166
+EBUILD sparc-utils-1.9-r5.ebuild 1547 BLAKE2B 876ab391f3920f7743f1ccccc071012b227322137da087e3ec76afab891485449813bc7797fc8f3f4fe5f3d61cec1cec78516972ee38004afd6a3687e03c1078 SHA512 34e081d48ad5f862db79e2654d7b0ff2020358438770697629f1a19318b864ced425c7b9779314ba23703e8d43803540bd59e400297ce24ad382a4ff74eeca79
 MISC metadata.xml 416 BLAKE2B 3d0e052bc957750b869856cabb6e94d86dc1655e63da29ac3753c16d8437e7a9a97c89e225f03b6267bb32bdbe6215c25717f088684e493b5785a6d334854dd1 SHA512 c057eea9ea65b87cb366e802dd8962901024335a85b3ec53caa6c342c9e1a23e656dcadc2a70692e5e7ab55a0ac82637ef052699844f50061461a645613b688d
diff --git a/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch b/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch
new file mode 100644
index 000000000000..567edd3c6113
--- /dev/null
+++ b/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch
@@ -0,0 +1,21 @@
+diff --git a/prtconf-1.3/eeprom.c b/prtconf-1.3/eeprom.c
+index b801f95..b15e74c 100644
+--- a/prtconf-1.3/eeprom.c
++++ b/prtconf-1.3/eeprom.c
+@@ -33,4 +33,6 @@
+ #include <dirent.h>
+ #include <pwd.h>
++#include <ctype.h> /* isdigit() */
++#include <sys/ioctl.h> /* ioctl() */
+ 
+ #include <asm/openpromio.h>
+diff --git a/prtconf-1.3/prtconf.c b/prtconf-1.3/prtconf.c
+index b9d8c89..c9b54be 100644
+--- a/prtconf-1.3/prtconf.c
++++ b/prtconf-1.3/prtconf.c
+@@ -30,4 +30,5 @@
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
++#include <sys/ioctl.h> /* ioctl() */
+ 
+ #include <asm/openpromio.h>
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild
new file mode 100644
index 000000000000..80f6a939f0df
--- /dev/null
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
+HOMEPAGE="https://packages.debian.org/sparc-utils"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-4.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="virtual/os-headers"
+RDEPEND=">=sys-apps/util-linux-2.13-r1"
+
+S=${WORKDIR}/${P}.orig
+
+PATCHES=(
+	"${WORKDIR}/${PN}_${PV}-4.diff"
+	"${FILESDIR}"/${P}-no-implicit.patch
+)
+
+src_compile() {
+	emake -C elftoaout-2.3 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake -C src piggyback piggyback64 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake -C prtconf-1.3 all \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	# since the debian/piggyback64.1 manpage is a pointer to the
+	# debian/piggyback.1 manpage, copy debian/piggyback.1 to
+	# debian/piggyback64.1
+
+	cp "${S}"/debian/piggyback.1 "${S}"/debian/piggyback64.1 || die
+
+	dobin elftoaout-2.3/elftoaout
+	dobin src/piggyback
+	dobin src/piggyback64
+	dosbin prtconf-1.3/prtconf
+	dosbin prtconf-1.3/eeprom
+
+	doman elftoaout-2.3/elftoaout.1
+	doman prtconf-1.3/prtconf.8
+	doman prtconf-1.3/eeprom.8
+	doman debian/piggyback.1
+	doman debian/piggyback64.1
+}
+
+pkg_postinst() {
+	ewarn "In order to have /usr/sbin/eeprom, make sure you build /dev/openprom"
+	ewarn "device support (CONFIG_SUN_OPENPROMIO) into the kernel, or as a"
+	ewarn "module (and that the module is loaded)."
+}
diff --git a/sys-apps/uam/Manifest b/sys-apps/uam/Manifest
index e453a5c02d16..23d39b727461 100644
--- a/sys-apps/uam/Manifest
+++ b/sys-apps/uam/Manifest
@@ -1,8 +1,4 @@
-DIST uam-0.3.1.tar.bz2 59632 BLAKE2B 7134ac7754635904023a6b6272786f078d87b4cde13e949046bc48492f7632ef1c8af24f6d16a2c09abcff59df4047f875645ac13836457f1ea35af495396ecd SHA512 bcd7a37701eb73bf3443d1fa98372fc0788cb3101619265c012d010f83e2cccc17fa8bc033704396707aa6de9caf0a80c9637dd7c7d1f86b01fd844967dac5a5
 DIST uam-0.3.2.tar.bz2 60508 BLAKE2B 35accde4ae392f33af0d1c0f30069975e30691927dff33ac754d00f1de7b30d1b789e9797637f9701913796b5993add4b2405294fa47b1fbd6f8d6e1946b1ad8 SHA512 4a4ee9286b3762227fc5a03a10998cb3b4a2f110cd648bb2ed45f400e31218a17d3929c83450e9190255bda1f22f4001a7f33842999b79c27aa12fc11f286273
-DIST uam-0.3.tar.bz2 58143 BLAKE2B 08a20293e66c649b9933138888411c0a8bbf86d24dfe5bff7714d6e9f6d96e6608de237ef0cd09a9d4b5b7f24566dfc0add581a64592c02c8f4b0325c132cf4d SHA512 6b5ce8b37ea7b430a492c4411ac005d6555e49bbc4849ae03c5bb16e7dd89e8cac32349dfa0507f01cc6b22bdb111eda69471141da4952f8425f9390035c6085
-EBUILD uam-0.3.1.ebuild 1492 BLAKE2B ed2f0c66d6406d411ff2b5d8bd6d9f5b30ee0f55d22acb148200e610ac286b041417a0a22f45385e2ec97041143475b38a200031d12d90c20dcf8576245ef468 SHA512 358e8fe2c5723ecdd109c3934e30e3b91ab2eeca13163ad3894fe7c1bc33f1e3dfc2be58e1ef61f138064db5ba9186760921fe30d31b274329c08e93f04aeec2
 EBUILD uam-0.3.2.ebuild 1490 BLAKE2B c18f67cc75abdeb64a5434e5dffdc01f7665a31eaa451de61b1783068b50c48dcd84aa2e6e6371a975756960d6207120fe422bab0811b8d5fd362d2ce9ca2d93 SHA512 6c5c47fedab034583c1f471a1768e800b37f7127482e28cf1449be1c4085fb2caf46c0acf57ed8dce9849b7987addc05972f1b6c08a4c8a0f246a1a8e5a38ecf
-EBUILD uam-0.3.ebuild 1625 BLAKE2B affc055535fcae119b205ba1056283163cf83d43f628a7ab9965025ece5b45443b43708c9f8a93a60c17168e7915504ee39dd91dacdefb3637402397cf246c82 SHA512 9b94e6faa63a32f8dcd88f13ad2b750f0c0e2caf17ea4539490ee34bccec89229dbff456fb8ce194e356bcf8fd48752366dc7134f7af7fab93190e9c15bf54bf
 EBUILD uam-9999.ebuild 1641 BLAKE2B 43823d6f16dbdfb9fe7a744bd5d2b2a4536f30f8527371d8ef5e2fa2086ba3ad64dbbcfb7772b3b8f67b5a4ecc33042c4e1411f3c439bce407829f405934427e SHA512 73b2b1a6d4139eb4bc6e846aa4cb0baa582215f5baf0b0fadf712213c79a53749ed0ac31a34463da4beaf0932c8425602830582beffb1c7e4beb207c7bc7c293
 MISC metadata.xml 720 BLAKE2B b7972ab02c083ded62cf5552a515c0f75d7ec7a5546e75df29dc2b749c6db713d5cea47eb3478fc92ded9128dd08d5b7f84c6050db2354b2aafedc22a3652ef8 SHA512 8603fba8cd8b329edef637f3030bc6b2d9ab4b40bcb511a501140e71eae5cc89be8c1a488c5e45e0f1daaf83334306e3ba86966ac74bceba6426b68cb1b2fbe3
diff --git a/sys-apps/uam/uam-0.3.1.ebuild b/sys-apps/uam/uam-0.3.1.ebuild
deleted file mode 100644
index facab0b105e5..000000000000
--- a/sys-apps/uam/uam-0.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils udev user
-
-DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://bitbucket.org/mgorny/uam/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	# The plugdev group is created by pam, pmount and many other ebuilds
-	# in gx86. As we don't want to depend on any of them (even pmount is
-	# optional), we create it ourself too.
-	enewgroup plugdev
-
-	elog "To be able to access uam-mounted filesystems, you have to be"
-	elog "a member of the 'plugdev' group."
-	elog
-	elog "Note that uam doesn't provide any way to allow unprivileged user"
-	elog "to manually umount devices. The upstream suggested solution"
-	elog "is to use [sys-apps/pmount]. If you don't feel like installing"
-	elog "additional tools, remember to sync before removing your USB stick."
-	elog
-	elog "If you'd like uam to mount ejectable media like CDs/DVDs, you need"
-	elog "to enable in-kernel media polling, e.g.:"
-	elog "	echo 5000 > /sys/module/block/parameters/events_dfl_poll_msecs"
-	elog "where 5000 would mean a poll will occur every 5 seconds."
-	elog
-	elog "If you'd like to receive libnotify-based notifications, you need"
-	elog "to install the [x11-misc/sw-notify-send] tool."
-
-	udev_reload
-}
diff --git a/sys-apps/uam/uam-0.3.ebuild b/sys-apps/uam/uam-0.3.ebuild
deleted file mode 100644
index 097c74fe846f..000000000000
--- a/sys-apps/uam/uam-0.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils user
-
-DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://bitbucket.org/mgorny/uam/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( NEWS README )
-
-pkg_postinst() {
-	# The plugdev group is created by pam, pmount and many other ebuilds
-	# in gx86. As we don't want to depend on any of them (even pmount is
-	# optional), we create it ourself too.
-	enewgroup plugdev
-
-	elog "To be able to access uam-mounted filesystems, you have to be"
-	elog "a member of the 'plugdev' group."
-	elog
-	elog "Note that uam doesn't provide any way to allow unprivileged user"
-	elog "to manually umount devices. The upstream suggested solution"
-	elog "is to use [sys-apps/pmount]. If you don't feel like installing"
-	elog "additional tools, remember to sync before removing your USB stick."
-	elog
-	elog "If you'd like uam to mount ejectable media like CDs/DVDs, you need"
-	elog "to enable in-kernel media polling, e.g.:"
-	elog "	echo 5000 > /sys/module/block/parameters/events_dfl_poll_msecs"
-	elog "where 5000 would mean a poll will occur every 5 seconds."
-	elog
-	elog "If you'd like to receive libnotify-based notifications, you need"
-	elog "to install the [x11-misc/sw-notify-send] tool."
-
-	if [[ -e "${EROOT}"/dev/.udev ]]; then
-		ebegin "Calling udev to reload its rules"
-		udevadm control --reload-rules
-		eend $?
-	fi
-}