gentoo resync : 01.01.2018

14 files changed, 352 insertions, 12 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f08fa7b7d64e..1c47409d584b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 737f06c0218e..bac2ce2aa320 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,4 +1,6 @@
 AUX apparmor-utils-2.11-shebang.patch 613 BLAKE2B b88988d12772003eaea7643644f3a3de69feaa0ef1a874df13ea775ce976980a59d8a22b204c34145657699c9b9a612fc9ffa54eafc063f381f6d47c062efc96 SHA512 6e94b4a48dee68dc2c321115744fa2ba6be33cd1f6f13cf3c97a4bb1f206d8c990e8dded7c81e8cf53107fdc2afcf208ab664f6438725d17ef652f5accb8cc76
 DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
+DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
 EBUILD apparmor-utils-2.11.1.ebuild 2067 BLAKE2B 22a55213dd55eec4465f8f356cdc961341052f1ea93a5dbf590ad4ea71f48f7981d8b35d03edbbbdb93cd7c9e43b94600bc55947e20a4725d6f32ea8b5362de4 SHA512 ec3310c097fc265f6913e79727b4d92d4a4d669a4e72f545158b9aed10190f42a8aba25ef428a0c9678018e5e1550a49e18c8c992a5fed721380ade94e14aee8
+EBUILD apparmor-utils-2.12.0.ebuild 1980 BLAKE2B cd4a19c4d0c4dbead6e7e1fd85b2cfca81d03a2e04aaf2a0af0b938f6bac6a27d212df3ec8124c94128310f74a26a6877327547d5ff1b919cfe6711b4bef0bb9 SHA512 ce041d5d660332573344ff275b0065bc6deb19cdbb22bf2a4e6079765aedcfd22aa163196bf5d91053ca4ead09b855df8f2506a00fba44ef90859380cce70622
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild
new file mode 100644
index 000000000000..baac5662c9dd
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit perl-module python-r1 toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="http://apparmor.net/"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+DEPEND="dev-lang/perl
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${MY_PV}
+
+src_prepare() {
+	default
+
+	sed -i binutils/Makefile \
+		-e 's/Bstatic/Bdynamic/g' || die
+}
+
+src_compile() {
+	python_setup
+
+	pushd utils > /dev/null || die
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	export EXTRA_CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" USE_SYSTEM=1
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd utils > /dev/null || die
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --version="${PV}"
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	emake install DESTDIR="${D}" USE_SYSTEM=1
+	popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 25960032b7df..c6b267a46d26 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -5,6 +5,7 @@ AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
 DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
-EBUILD apparmor-2.11.1-r1.ebuild 1271 BLAKE2B 8ad6d909e8d4cc8637ea75949d7abf3f328de720e81bf3e649b5fdf79fa6eeec16a9433f0c36cbc76da6e8982588560bb67a4da5952a188c25abffcc39a6850f SHA512 37183de377fd0decd3559a6da3e75c213fa9a5c5a413efa012295b7af39981dd50b7546bbfed9e4a57105c44d4a2d430925186a18b1b9c6de5fccb854d4bc0f8
+DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
 EBUILD apparmor-2.11.1-r2.ebuild 1452 BLAKE2B cbbcaff926533ddd29205d17ae0a5f11af9398dfd61d239170f84acdefd10fd1de2636900212a723324a1464d540254b6fbbd22db6aa4e58128695345d12419d SHA512 dd22fa3615a26b9726c0e871878e4010d1dd1232ec1b25c8cdf5ee074277a0b8d783224a9c395cd889efc9b914b50af6f390ef22e616d5a4a28509db20e90265
+EBUILD apparmor-2.12.0.ebuild 1465 BLAKE2B a93f4005598459192c7f0c37856c3e9f20d4c5f5fd2f2b3f6b4adbd1d29c7b90aae9b6e7c2c3f2aed607c24b083f14572b4839bb93b162e60a72cd57ff93f304 SHA512 013fa2e572f69c545bcfd455647e3df0e2ea75c3dbf840387e82f6c202a5fa237e72e5a8a0d3ab585493383d99068820cd55b0df8e2b3fe4e141b5fbd3edb213
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild b/sys-apps/apparmor/apparmor-2.12.0.ebuild
index eb164b45cf3b..03c5bca122b2 100644
--- a/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
+++ b/sys-apps/apparmor/apparmor-2.12.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs versionator
+inherit systemd toolchain-funcs versionator
 
 MY_PV="$(get_version_component_range 1-2)"
 
 DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
 HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	doc? ( dev-tex/latex2html )
 "
 
-S=${WORKDIR}/apparmor-${PV}/parser
+S=${WORKDIR}/apparmor-${MY_PV}/parser
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.10-makefile.patch"
@@ -53,7 +53,12 @@ src_install() {
 
 	dodir /etc/apparmor.d/disable
 
-	newinitd "${FILESDIR}"/${PN}-init ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
 
 	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
 }
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index 53628204daf2..a5007e3e9777 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -2,6 +2,7 @@ AUX darwin-miscutils-5-error.patch 269 BLAKE2B 6bd32d601bbb365bbaa31f41aad8301e9
 AUX darwin-miscutils-5-stdlib.patch 540 BLAKE2B 94948893634901595e2798c0fb44ac2ae05ee610942f08a78ec08024fed61238f220cc6868422ac2663fe6e0afee665d66fc2ad31959e3c53a87cd9d43f0aa6a SHA512 b9ec8b65cc17da06a88fe7570be66682c8dadecd7af1ee6fe95b560340d9bf71516417338fef4ae99fca22069773f5baba499723e78d2b73f5eb5aa5e2eb7463
 AUX darwin-miscutils-5-w.patch 201 BLAKE2B 37af30361b416fa138dc1f2ec0fac35ef6e246a22375651cc84e67e4fd3d479d54ae7337ee93d73c960f2c7c2cc4cd9603271eeb8a502b91c157dca11b94114d SHA512 5fa14a48c74d6b99b135b3c1c8135756a15f3bde9844f25408cabde9e752caee95e891fbb6ea71bdf428b68be0d41219dcaa660e8a936460fe8ab59fe44f7bc4
 AUX darwin-miscutils-6-w64.patch 584 BLAKE2B 00eeab82ac846718a03330bc2a6359e374967429598251c03fa4d952b4af6aa66e13f203f234e474c6d03c877a41264e47f6fbea1d2e51187eb630673293bdf9 SHA512 590b2af77934a66e1e41b2e22440038991ab258854b690d29527b84a06f0ffe1c19d5ff9022f024796c9cec84fefb80afc098749033dfd60ccda337f0059ce40
+DIST adv_cmds-md-147-compile.patch 5423 BLAKE2B f54aaaa8fcecb81fd8e628bcb384f537e572095b8210612c0748017f033e7bb6f9c5b1bd2c544fec23e8002a2ac7b99d840c85a8ca6faadac3b4da2edb77b459 SHA512 951e981b57e7d3d6ef51d638759559581dd4995ce66ec17bb2658f8a298683feb0842d10fd834b713ec39b2a0f671df56049b876d55f17bf1e988d76839fead1
 DIST adv_cmds-md-147.1 3623 BLAKE2B 18b856770f0490ef241e19cc6f1661f6521bcc7f363bff41fbec548388d8f1e2d9e6aea879064cd3d7e7d16f8e0b2ff17ead990051a068a66f520a5ff504afa3 SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718
 DIST adv_cmds-md-147.c 25945 BLAKE2B 38af9e06e18a15cc74a81464a4c1ecdf98b800eb34f33f6ab6203b60540e693d459805432e51bae1008661aa566830c87357432428f62d8cbea9973b1e5fc59a SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592
 DIST developer_cmds-49.tar.gz 307753 BLAKE2B 774259d7b82efc85bf487111e5a3c4c0d4aa3f8a788463b503e4d108c684837327b97882114d3646dfba5f60a1a1a2671e0e574d92e159b5ea014fc9e2c61015 SHA512 3750374c891f6d681829986291d887cacf2c5b1c7a5de94f12c92ded0b3456157b85e57653c6061526d1f6626a7be8a9e6db9c1df09e2bb3e40c7fa20b9b4103
@@ -12,13 +13,16 @@ DIST misc_cmds-23.tar.gz 114747 BLAKE2B 9c4a1376555775a6999437e0712f62200d10be97
 DIST misc_cmds-27.tar.gz 116351 BLAKE2B 00aece4bc8679d9a7a1e114db65bca97e8f855ead64ee0672ac598c28069c56355f4a763fef0e56784ee9d2de9a081ef6f7e6d9390fc79cb0dec25dbe40ec881 SHA512 594560b179f7dafc651d3a336d33bcb7075f2199cf4964e95d63164faf19bd50ef3a6095124f0e4f91c50d1bceeb831fcd81ceecf740e2696a8e7445c1a690d2
 DIST misc_cmds-31.tar.gz 121187 BLAKE2B 3d12a13cbdc7c541b98596ab5ea675d27a0da93a913ee94945dc5b68b3238a85c3fd13472c3ead30219ae3317a6111ba8d22a6e702fe07f927318f5174870a70 SHA512 d49bb8a49c23aa7efaa7db1958676390b4d5ef1b2e57f80b0bea0f10b8b29a6c3ec6d2d7a1248d3af77d382c5113fb3cbf9d3632ca92bb51c01d8c286fd9f25f
 DIST misc_cmds-33.tar.gz 123114 BLAKE2B fb86518067b36de536503df521f1dc5e4f20fa1da74cfee4679dd728862b9ca4c1c272fd0ba39107d058f992acc04c2c98f3f44d6b2fc57386d3c458cfedd68f SHA512 34957adaebe4ce1569464a466e13aaaa6a567c582b784b99dd260c891a417d37a0297bf11acc9eb16dfabed18f42480058ae726e0a56b7d98ed93b59f75a5644
+DIST misc_cmds-34.tar.gz 124023 BLAKE2B 3c634ab540f4b1046e6abe05476a399ea00fd6d35d2d450f68cd7c3f52c8b9321039221659647b6623d5621af1789dba3798ec9f5cff8677653fbb3f295d1d1c SHA512 5e4040c49cc6aed8d4b471cc5d26d978717c9ad29315d40098090d0f7fee5a78289f2092fd6e8c7b7adea31b766cfefdef0da957b86ffb4e0781c13f4b5e4dbe
 DIST shell_cmds-118.tar.gz 162145 BLAKE2B 5f6a2264bcbd9322cb50e39ac6594f083f9d0c0ffa68d67fccc6e4979c59edfab617bb7ffefb4ef647111a1abc7b855a19a1f3b309ad50a6a1f92900305ece6d SHA512 efce064b76087451293a6992b7946fb0811856275796efa9e1e30459edf9eb0462929a1f0d28d189bf7e85fdde4d9e80b8637d042497b1e6e9216c8888d0d57b
 DIST shell_cmds-149.tar.gz 173740 BLAKE2B d1cc69f204925628f812acf0f69704c8c0f5b94ee9b3bd8898ec773657ee6c8a617f1666a9ce9e63898eff1cfbc915b7dfd7a91c51eebe642affa41c14f0f828 SHA512 e0f87db828c994bad73e4340f1957378ce5c84419172ed1d6b9d63809b90edfa447cce658e715565c5c2a7d2eaf0a9ee75e24fdb6d86080063621e0f83eb2a77
 DIST shell_cmds-162.tar.gz 179189 BLAKE2B 975728cbfe262072c9fcc3aee457d3814ceffbd4f3f87a25e5f30d3b581c4ce05c112b2e023e1c132bc836e337e9edf74f699dc3e6cb797be5b589a3cb5eed82 SHA512 784b6b8b3a90967d79f5a60a23e7f31f7bc92712dac9cdb625770f92b58bd6902669aa19bb59997cc654fcc0e27ddd45f60b1990e7da95d0e6c90fd7f2434f95
 DIST shell_cmds-170.tar.gz 212954 BLAKE2B a9616f7604bb73c0d88f8a065441c2f4769747d407458b3844e3e9126c224b42501bf546b1bc82ab6cdfc318861b43318a8a8877e7a054209cbbc7bdaaec0e24 SHA512 b267a9b5e922c9952451ca05e5f9e328504dc46b5776e1a8405f8e41a604d7f184d70742cb6fa6646875bc1789082097c74eabcc151ac5568ba26ed858269ce7
 DIST shell_cmds-198.tar.gz 411088 BLAKE2B 074efebfdc0fb408df54ce763018c74370049d7c977c912c69bc399f3b3551280f1ea76fbd7205ad54ce676422c642431e297f269cafd2ee5fcb4cd916c91548 SHA512 6e3a43f0cd9b1e3799d1ba79f4fcc4c3bb9be178c35cba2bef9227ecc259ca52c39b4d0e39c71d9af689e07f48dbeee6806bd623286f116f7d3ee3889dc7c71f
+DIST shell_cmds-203.tar.gz 428799 BLAKE2B 54103daa8a8758dd34a66f9c34a5fa4cad2e6a2dd36ff838498d82179566eb95c25c49126341ac481889381c2d39ebea3bf57959bb943536a7ba8a90fcf96f67 SHA512 ba9b00d6681d286e6210d49d70e1f526e86b0a76ed794050e9cdbdb8c0cc30dbe82ee9cd908578ddabb19c53c8994f1b84650f08bfeb88ea9f77d4de942c1cb1
 EBUILD darwin-miscutils-10.ebuild 4802 BLAKE2B c98b816e57a3376b955b2090f73659ec6bae7cb0e7545f1bc318905e1d87e7658d9e7a8257eb99cce4c8bedd7ce08d886f5cd488f0dba016b3089e6f49c95a73 SHA512 ee5c9e4938ae770bfb0610b2d5a31ee8d5c0cc3d5bf2f967bdd0ed8579baa0b12d0c99e5ac543ac23b07a7e5364b7eaac03a2b16984a9add99c15b72cf3c7175
 EBUILD darwin-miscutils-11.ebuild 4730 BLAKE2B a4f3910539a26c88bcb655cbefaac196ef331f4d3fa37d754c9c1f9c8c033a413ceee9ea40eb3f3809612e7ca50f1c975ed471e67b7ac805772abd9519871744 SHA512 c9e04da6422c370b04c8054ac2dcef573630a05d5ba21b39cab100f6dd30a43540fd03c9a3aff0e9aaac53fd1307b8130217925b8160c48527277c83e63e08ee
+EBUILD darwin-miscutils-12.ebuild 4329 BLAKE2B ff27b03f3e817f53e2c5bdadfa3b4c4442d1f62905df0938156e5403d0de1dc265597e4a20932caf58b2c872020fa58eff3b8aaae219b7a23e663780d751de59 SHA512 ff43d14c815f3a84a0ffe95ae2ca0b88d3df7bbeadceed151fe77047a44afab1fd835ebaeb4809ff6141eb9f87a8f15f1d783fc50e0600c9d85497677fa7869c
 EBUILD darwin-miscutils-6-r1.ebuild 4255 BLAKE2B d82c786adae41051e547df3cb8a3b0079a51fa07618b0c61b696e696ce4e6f5ec348f52cdc99538e392f33aebed0b88449c073459f7804bea2fbcfdc4dd94538 SHA512 5bec5032b942963bd5652283c5914e2a6f5e4655951ac90ec680a042cc37576b3a47df969f54d4b5276bc799e1c516298e8a605d64e83e485703305384f75151
 EBUILD darwin-miscutils-8.ebuild 4095 BLAKE2B 5fa06daf4a5d44c3b0dee694360bedfd87027d634c683396c4ed0b6d129f401bbc15369269d88c89a8d4a53797d17c240373d2f8aec834f51e28e92ad96f10cf SHA512 748ca7f62e8f4cfca2ff19668a590b63268628cbbd6299e490b220356c0c854987fcca0ceb3b65b2c1fbc545b07bc275c448ab87a1fb15c2cd591baf6f9d17f7
 EBUILD darwin-miscutils-9.ebuild 3955 BLAKE2B 9cc4d2b2279e02d08476b827e3fab4b55cfeaf1e505c43fe151b147c7b933228389255942b6d8eaeb5212aac90b51ee3a9c40b2adb6370af04da36690cf2c4a1 SHA512 de3a869b5880c39d82bfbcaf8b61591324ca10efd0be1e884933ba75b19d61a8670e23c5163389406a1a9c3b6db9b8ee0550a63394dd6c35c5c658295211c60c
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
new file mode 100644
index 000000000000..96a868b3409d
--- /dev/null
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+# from macOS 10.13
+MISC_VER=34
+SHELL_VER=203
+# from DT 8.2.1
+DEV_VER=63
+# from 10.7.4
+MD_VER=147 # adv_cmds-148 in 10.8 has no md, bug #428530
+
+DESCRIPTION="Miscellaneous commands used on macOS, High Sierra 10.13"
+HOMEPAGE="https://www.opensource.apple.com/"
+SRC_URI="https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz
+	https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz
+	https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz
+	https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.c -> adv_cmds-md-${MD_VER}.c
+	https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.1 -> adv_cmds-md-${MD_VER}.1
+	https://642666.bugs.gentoo.org/attachment.cgi?id=511988 -> adv_cmds-md-${MD_VER}-compile.patch"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+# for ncal
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_prepare() {
+	cd "${S}"/shell_cmds-${SHELL_VER} || die
+	eapply "${FILESDIR}"/${PN}-6-w64.patch
+
+	mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
+	cd "${S}"/adv_cmds-${MD_VER} || die
+	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c md/md.c || die
+	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 md/md.1 || die
+	eapply "${DISTDIR}"/adv_cmds-md-${MD_VER}-compile.patch
+
+	cd "${S}"
+	eapply_user
+}
+
+src_compile() {
+	local flags=(
+		${CFLAGS}
+		-I.
+		-D__FBSDID=__RCSID
+		-Du_int=uint32_t
+		-include stdint.h
+	)
+
+	v() {
+		echo "$*"
+		$@
+	}
+
+	local TS=${S}/misc_cmds-${MISC_VER}
+	# tsort is provided by coreutils
+	for t in leave units calendar; do
+		cd "${TS}/${t}"
+		echo "in ${TS}/${t}:"
+		v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
+	done
+	# compile cal separately
+	cd "${TS}/ncal"
+	echo "in ${TS}/ncal:"
+	v $(tc-getCC) ${flags[@]} -c calendar.c || die
+	v $(tc-getCC) ${flags[@]} -c easter.c || die
+	v $(tc-getCC) ${flags[@]} -c ncal.c || die
+	v $(tc-getCC) -o cal ${LDFLAGS} -lncurses calendar.o easter.o ncal.o || die
+
+	TS=${S}/shell_cmds-${SHELL_VER}
+	# only pick those tools not provided by coreutils, findutils
+	for t in \
+		apply getopt hexdump hostname jot kill killall \
+		lastcomm renice script shlock time whereis;
+	do
+		echo "in ${TS}/${t}:"
+		cd "${TS}/${t}"
+		v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
+	done
+	cd "${TS}/w"
+	sed -i -e '/#include <libutil.h>/d' w.c || die
+	echo "in ${TS}/w:"
+	v $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 ${LDFLAGS} -lresolv -o w *.c || die
+
+	TS=${S}/developer_cmds-${DEV_VER}
+	# only pick those tools that do not conflict (no ctags and indent)
+	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
+	# shell scripts
+	# don't install rpcgen, as it is heavily related to the OS it runs
+	# on (and this is the High Sierra version)
+	for t in asa unifdef what ; do
+		echo "in ${TS}/${t}:"
+		cd "${TS}/${t}" || die
+		v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
+	done
+
+	# provide this one for gcc-apple
+	TS=${S}/adv_cmds-${MD_VER}
+	for t in md ; do
+		echo "in ${TS}/${t}:"
+		cd "${TS}/${t}" || die
+		v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
+	done
+}
+
+src_install() {
+	mkdir -p "${ED}"/{,usr/}bin
+
+	local TS=${S}/misc_cmds-${MISC_VER}
+	for t in leave units calendar ; do
+		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+		doman "${TS}/${t}/${t}.1"
+	done
+	# copy cal separately
+	cp "${TS}/ncal/cal" "${ED}"/usr/bin/ncal
+	dosym ncal /usr/bin/cal
+	doman "${TS}/ncal/ncal.1"
+	dosym ncal.1 /usr/share/man/man1/cal.1
+
+	TS=${S}/shell_cmds-${SHELL_VER}
+	for t in \
+		apply getopt hexdump hostname jot killall lastcomm \
+		renice script shlock time w whereis;
+	do
+		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
+		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
+	done
+	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
+	doman "${TS}/w/uptime.1"
+	for t in hostname kill; do
+		cp "${TS}/${t}/${t}" "${ED}"/bin/
+		doman "${TS}/${t}/${t}.1"
+	done
+
+	TS=${S}/developer_cmds-${DEV_VER}
+	for t in asa unifdef what ; do
+		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+		doman "${TS}/${t}/${t}.1"
+	done
+
+	TS=${S}/adv_cmds-${MD_VER}
+	for t in md ; do
+		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+		doman "${TS}/${t}/${t}.1"
+	done
+}
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index a1cad93e650b..24c529665aa2 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,7 +1,9 @@
 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_p20171017.ebuild 883 BLAKE2B deb941193402b058ecf23a7523698416660b09cfefcda6a51b2f2f50aaa72ba5b9230459826d82f9066b4bc8766c72f2a55583e21705f848df0ffa4d966509a5 SHA512 e072d0a8bb7125965bd3e0edea01eff17ef53b17baaf117fa7f5cd910acebd4cbc57f6725a6ae0419cf2eb177fcd3b8f4cdf5c5f0e7bb4d86fdbe86f7b75c9de
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mawk/mawk-1.3.4_p20171017.ebuild b/sys-apps/mawk/mawk-1.3.4_p20171017.ebuild
new file mode 100644
index 000000000000..d90cc49f5a39
--- /dev/null
+++ b/sys-apps/mawk/mawk-1.3.4_p20171017.ebuild
@@ -0,0 +1,43 @@
+# 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"
+
+RDEPEND="app-eselect/eselect-awk"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ACKNOWLEDGMENT CHANGES README )
+
+src_prepare() {
+	default
+	tc-export BUILD_CC
+}
+
+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/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index 8eb29df4cd86..d5282921cdca 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -7,5 +7,6 @@ DIST microcode_ctl-1.28.tar.xz 876760 BLAKE2B 8523bdc59ab21a6ec2e1110116bfb4c7a1
 EBUILD microcode-ctl-1.23.ebuild 1271 BLAKE2B 8a7adc9b789dfdadf4a44ee4301040c0047f4e68bc71d46b04acbfe2b1d9978415d6e184d328d05c39b65a37b59db34d5b274cc1168cf52e93775413862a0a0c SHA512 b5ef619c8b5821e4a52282f34e7e4880962e2d9d6f8f279f3ae7553ca5a72e28c69f4ac921b1370ea199635c63d705e89e78968ff3fe5520556c4732fbf68355
 EBUILD microcode-ctl-1.27.ebuild 1273 BLAKE2B d3b5ac1888e2abce28f63f5f6d92ca4eca7b6714c1fc93ad0f304a0a790ce4c46c7bc8c73a4142b5533c233599989d6cf34347bc0adf26ab54b130b3cf659f31 SHA512 9d23c1914298105aaaf8937162cf7673a09d12dde1778c4bd99d708b09307527bafb3c45a556b78a02460aac3842001f30cf67bafadd5a64fec596013926434a
 EBUILD microcode-ctl-1.28-r1.ebuild 1035 BLAKE2B e82bd192b0ee75ddeb53a1112ddcb1aa5846fe2e8c84137509fa6b723cdd4b96eb6f0d7176d83d538a86ed032f6b19bef726ac31896a2f0617d44b11c1e91a44 SHA512 a63bb4b08ada1fa9e4c114f4a7c8019201e29260282b75cc58247264602191bfe83a4076f8673bb591443f08c3e9e8723e1952f7bcf7bb0951a457572f527964
+EBUILD microcode-ctl-1.28-r2.ebuild 1147 BLAKE2B 9bb9e2be7a589eaf4ffc30ebf95bb9a6f7f38019c5b598659dc7a037fa3051673c2185df8bfc7007205436246214cb40260ae8204f2ba0876ed33350b838bf95 SHA512 c6782fc6a6919a2eda6f6b229c0498b4ff1907cee8eab2dcfdf43017a6849cc996af39202daaadf2d7093c51752984938e7c77090c4b1529b7c2c7001bbdb4aa
 EBUILD microcode-ctl-1.28.ebuild 1273 BLAKE2B d3b5ac1888e2abce28f63f5f6d92ca4eca7b6714c1fc93ad0f304a0a790ce4c46c7bc8c73a4142b5533c233599989d6cf34347bc0adf26ab54b130b3cf659f31 SHA512 9d23c1914298105aaaf8937162cf7673a09d12dde1778c4bd99d708b09307527bafb3c45a556b78a02460aac3842001f30cf67bafadd5a64fec596013926434a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
new file mode 100644
index 000000000000..4ca58a106615
--- /dev/null
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.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 versionator
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Intel processor microcode update utility"
+HOMEPAGE="https://pagure.io/microcode_ctl"
+SRC_URI="https://releases.pagure.org/${PN/-/_}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="selinux"
+
+DEPEND=""
+RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
+	selinux? ( sec-policy/selinux-cpucontrol )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dosbin microcode_ctl
+	doman microcode_ctl.8
+	dodoc Changelog README
+}
+
+pkg_preinst() {
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.28-r1 ${_v}; then
+			# This is an upgrade
+			elog "The init scripts have been removed as they are unsafe.  If you want to update"
+			elog "the microcode in your system, please use an initramfs.  See bug #528712#41 for"
+			elog "details (and bug #557278 for genkernel users)."
+		fi
+
+		# Show this elog only once
+		break
+	done
+}
diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest
index df4d13b6db2d..f0db54e5e96f 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -3,6 +3,6 @@ DIST opentmpfiles-0.1.2.tar.gz 5614 BLAKE2B d49485535bc3b92ba7e9a2af511969b1793d
 DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121
 EBUILD opentmpfiles-0.1.1.ebuild 1021 BLAKE2B 7268fe79b3bb68b30f642e2e438caffc940b287f64084c5d960ec4a9b6e9839d9a7e710fd6fbd8e18ce0b1867c4248519733688a4b646ed1c7a298f1fe3eb698 SHA512 77daf26e2de2f40f1f723a58e73fe1e1dbb76b2cd7299e1e6776491792df82aa003ad83d412909aae123d8d781143c5c7d6e1ca745e7f14fe473a968814df083
 EBUILD opentmpfiles-0.1.2.ebuild 1120 BLAKE2B f9e9dfd90ce72f1a0b7eb603b430b66a08467786562539810cf091d0b320a763742f1d9fcd70d622d03e529640b9a9b1df0e51ffa7a55f8c4059e803272269a5 SHA512 7231a5327564f6471dff75348d85c7d38bb3f8eff50ef55ef38136de21d8139791e6c32e2ef712b37d1faf82f7f08fec47ba41978a6c051cb7fbf3aa4fdfc0de
-EBUILD opentmpfiles-0.1.3.ebuild 1117 BLAKE2B e79bf4f524eaae0f945bae770cf5d09250145f58cf76c87a09ad23a02dea2d9c1d705a7f9dfb7f9a13cf4ca6a33697543f33ca0d233b0066df3f9d8ccdf6e7ef SHA512 40f93a841fbab74d5707d9fdee228a9e146c51d674aa2bf9de022aff1fec2f3b9f3e369d80536c78075c0dd6f596b30110bb97ffce022d4f4bcc9b41b9fb1bc8
-EBUILD opentmpfiles-9999.ebuild 1130 BLAKE2B c35d78a8693519a53ac14058f0298763a5088b19c5aef9b41729f52e696ed6eb381021932eee3a1806acb998a09f07c115e055e35763c95bf89c7bd2be4b010c SHA512 c873d8644c5a1c051fd67cb86ddbe08abd9b0338098158ea62e4a51876b0618a9af578db12ed15e5000bede727cfd8e7a54b27b7f10bf8a5b1a6da56b1da3060
+EBUILD opentmpfiles-0.1.3.ebuild 1139 BLAKE2B c74faed4e847c8fb39276bd184bbfd413d544596ffd4ef74205deca3cd5aa66a3341bf72c5bfe30558b343b7092d42be5ae69a3f90e012af448d10f740d15beb SHA512 be34016b152901f48cc91dca89fcd37aa90c0b22b9496d5dee23a0c9ed1c3c6d2354290a753adf871151f2fabc3f9c0a8f8f3f5f86901cf34123353604afaf04
+EBUILD opentmpfiles-9999.ebuild 1152 BLAKE2B 46347d4d5d16237872d933080b2f3880132d1001cbbe01c3e4ab6575910d5255655863a87484f05b98861318eb61ddd9badac9b3c1c05150905f09ab8b67d880 SHA512 b97d2ecbdc52713f232a518cd7b3f687e3ec0eebd751b3c6ef24ce6a9329e51f3de6f089b8967d177923741a406babdf238b93c15f85d43bb8e5ae1036ac2fd2
 MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
index bb0ba6227193..6542ddfd45d9 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.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 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild b/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
index c96bac4a3db0..1577a7364fc9 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-9999.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 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"