summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin48509 -> 48891 bytes
-rw-r--r--sys-apps/dbus/Manifest6
-rw-r--r--sys-apps/dbus/dbus-1.10.24.ebuild8
-rw-r--r--sys-apps/dbus/dbus-1.12.2.ebuild6
-rw-r--r--sys-apps/dbus/dbus-1.12.4.ebuild4
-rw-r--r--sys-apps/fd/Manifest53
-rw-r--r--sys-apps/fd/fd-6.3.0.ebuild93
-rw-r--r--sys-apps/fd/metadata.xml20
-rw-r--r--sys-apps/hwids/Manifest2
-rw-r--r--sys-apps/hwids/hwids-20171003.ebuild4
-rw-r--r--sys-apps/keyutils/Manifest2
-rw-r--r--sys-apps/keyutils/keyutils-1.5.9-r4.ebuild2
-rw-r--r--sys-apps/less/Manifest4
-rw-r--r--sys-apps/less/less-530.ebuild (renamed from sys-apps/less/less-520.ebuild)0
-rw-r--r--sys-apps/nawk/Manifest3
-rw-r--r--sys-apps/nawk/nawk-20121220-r2.ebuild49
-rw-r--r--sys-apps/nawk/nawk-20121220-r3.ebuild4
-rw-r--r--sys-apps/nix/Manifest5
-rw-r--r--sys-apps/nix/files/nix-1.11.6-systemd.patch2
-rw-r--r--sys-apps/nix/files/nix-2.0-user-path.patch10
-rw-r--r--sys-apps/nix/nix-2.0.ebuild133
-rw-r--r--sys-apps/portage/Manifest2
-rw-r--r--sys-apps/portage/portage-2.3.24-r1.ebuild2
-rw-r--r--sys-apps/prctl/Manifest2
-rw-r--r--sys-apps/prctl/prctl-1.6.ebuild4
-rw-r--r--sys-apps/qingy/Manifest3
-rw-r--r--sys-apps/qingy/files/qingy-1.0.0-tinfo.patch8
-rw-r--r--sys-apps/qingy/qingy-1.0.0-r3.ebuild140
-rw-r--r--sys-apps/sandbox/Manifest2
-rw-r--r--sys-apps/sandbox/sandbox-2.13.ebuild76
-rw-r--r--sys-apps/thunderbolt-software-user-space/Manifest5
-rw-r--r--sys-apps/thunderbolt-software-user-space/metadata.xml16
-rw-r--r--sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.2.ebuild27
-rw-r--r--sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild27
-rw-r--r--sys-apps/ucspi-tcp/Manifest2
-rw-r--r--sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild2
36 files changed, 642 insertions, 86 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 35bb6758a36f..939361b753d7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f4a77ff6b161..3a777265087d 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,7 +6,7 @@ DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5
DIST dbus-1.12.2.tar.gz 2063143 BLAKE2B 0618381befb7af7d4e0c2f1d9e32ee7ee70f17905783e414ab47acd7dcf5993329e430869a6cd9de33cc5919c880fed73eb1246d3ac2929c3d50d331efc92ca7 SHA512 523698ae543a4f1d9142898351ed38827882a3ca583ca7934676af48d09219ea562ae77d734cd142e5ca0d5e74f9e8d0fdeb1019592ca3524e2b690c6283f7cd
DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5 SHA512 ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
EBUILD dbus-1.10.18.ebuild 7511 BLAKE2B 723c6e71e73b4ed5c3b2a664da5b00fd37efca9103e96e19ca0e0a58482e3e60ddc3325c1ad50b2cf58862ea2f1f1ea9944c3a7093a729f3a712b3e4e42255a3 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b
-EBUILD dbus-1.10.24.ebuild 7400 BLAKE2B 427844c3730c2c4ad0fb3fcbdc3f4daa759762d8d402ed27d90e96bc3add483eccb1864a30b600e5c53260488c2346bf49d2d476f650fe5319ded8fa26619e3a SHA512 4bede00f1cee6da6680303d989331773838530783921d0ffa8a7d2b1876a4856d2b6db13fbf38dbd66ab8f40375cc7e10648ee6d1ef0948781ed9d04793485ba
-EBUILD dbus-1.12.2.ebuild 7447 BLAKE2B b69f8902777f70dbcb638a81455f20e979d097eb143b84f6fb390b170126879a9dd9a78867d834dd3a74e5ad5da5d3a1d43536257661722962cd8581ee669b08 SHA512 24293ab30ea439ff6869b55592a6bb45fb12a3110edb33a4429578faa41195b10dd1cba4ba8390afc43584c3723f66ffd8610b5a8e9fdde1dc61485d29fb3459
-EBUILD dbus-1.12.4.ebuild 7447 BLAKE2B 2ba5b8880e6224b726e1b29b233542874fe90ff72d0a4a79df3415a63ce66f013f06462aec960f7ce071b5bc47395dd084b4a6b1d29fc2a0d2032d79f6ca56b0 SHA512 d745021ef16d3de72b7aaf0b3c29c0df8d8505acf151c658ae8922be21191b88635a306dc56fd808e9b0515061e1212d411823b233434d4fb8111a907e039758
+EBUILD dbus-1.10.24.ebuild 7393 BLAKE2B 35ef55bb33062bebbd00fb69a2399e5a170708b66aca3d99a6977d217f2c35afa80bad1afe31f9d2482ca496ed2ce14c9a5a291e3f32fa63a7acbec718e3e6bc SHA512 09b0a0f9bc3729c6833b068211ca76332a65bf47a28a50d3bfdaa386adfab41004c4cff81cf8cc677a7a72521cffca03092d858819d9fc7acb633b5cedcc463c
+EBUILD dbus-1.12.2.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
+EBUILD dbus-1.12.4.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index 4a700ffad463..a7c2766ec442 100644
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.10.24.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="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
LICENSE="|| ( AFL-2.1 GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="debug doc elogind selinux static-libs systemd test user-session X"
#RESTRICT="test"
@@ -234,8 +234,8 @@ pkg_postinst() {
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
# dependencies with hardcoded paths (although the known ones got fixed already)
- dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
- ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
if [[ ${CHOST} == *-darwin* ]]; then
local plist="org.freedesktop.dbus-session.plist"
diff --git a/sys-apps/dbus/dbus-1.12.2.ebuild b/sys-apps/dbus/dbus-1.12.2.ebuild
index d795c5b67e5b..d53c2a80ec6f 100644
--- a/sys-apps/dbus/dbus-1.12.2.ebuild
+++ b/sys-apps/dbus/dbus-1.12.2.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
@@ -236,8 +236,8 @@ pkg_postinst() {
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
# dependencies with hardcoded paths (although the known ones got fixed already)
- dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
- ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
if [[ ${CHOST} == *-darwin* ]]; then
local plist="org.freedesktop.dbus-session.plist"
diff --git a/sys-apps/dbus/dbus-1.12.4.ebuild b/sys-apps/dbus/dbus-1.12.4.ebuild
index cfd65c2af31b..d53c2a80ec6f 100644
--- a/sys-apps/dbus/dbus-1.12.4.ebuild
+++ b/sys-apps/dbus/dbus-1.12.4.ebuild
@@ -236,8 +236,8 @@ pkg_postinst() {
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
# dependencies with hardcoded paths (although the known ones got fixed already)
- dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
- ln -sf "${EPREFIX%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
if [[ ${CHOST} == *-darwin* ]]; then
local plist="org.freedesktop.dbus-session.plist"
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
new file mode 100644
index 000000000000..3a37a2bf5448
--- /dev/null
+++ b/sys-apps/fd/Manifest
@@ -0,0 +1,53 @@
+DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
+DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
+DIST ansi_term-0.9.0.crate 11718 BLAKE2B c3a29c8efe994822aa37854cc804ce2ea7f03ea622cfe05dd063f2e07f3d666ab7a8fc21f0f5a7f7f6c2a520b5cf6409ceb8b2438b3a416a44e70de4c094fa20 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b
+DIST atty-0.2.6.crate 5617 BLAKE2B 52274b58d4ae19cdd57a85a46449be32ac4662da6ce746382eff30c75729dbb5e50a9e9ad59f11b11f6d40b7ec2bc261e290f33127de62636c7f249c174bc4d3 SHA512 ae0aa91616571391eb4a2cc46b4765784dcd96b514fc7c3b64f756d1a180f95c83b9d14086f872fb7466be0e623f44a1a3170e786d7fbff5bdd949ef0cd88997
+DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
+DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
+DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
+DIST clap-2.29.0.crate 187393 BLAKE2B 752f86a65114da23cf04c52d452266c5fc5d4e6d45a13852a664b813601b3b8c44760b5799b7129e7ef65de824682922c0b38827119ad3c52d1eb29d57366729 SHA512 d7dcb54d10d536af5121e9347157e2b11c605570158428c953fdc333ec887a6f10350ebb8daa871cd3e3e171c607a4e1f1c8018cb2f2dac67f83094c78be1980
+DIST crossbeam-0.2.10.crate 32993 BLAKE2B 10bc4519c091251798a838a9ed3404f84b6af950e88209b6ce7607f5ee1105fdd1ea4c81f788321455b3bf5c6169e7296757a73619ee837ee4ac799fa1c64b7d SHA512 cdefcda7626c08ca59bdf5581e0e8d3e6367081089cc32dad6e84b5f643c7cbc5b08ce47034dd925fe2f5e2dfcfd18afb51fba511265ee3598fc1844838948f2
+DIST ctrlc-3.0.3.crate 7055 BLAKE2B f7627a0fdb572888bc26948d9c28d5169f990f93a41cb1d8080bfe61f169a51562909d59c6d0315c525a82dcc7d2f1755c3c49541923d661ed7a98f3af5b7023 SHA512 4ea771c4ee780ef3dc45377a4abd6afb705faff7e50bd789ffa7c178da180354eb8889832d6bef09a7bbb23da540b40affb28e1cc601dc4b0c440795c4708623
+DIST diff-0.1.11.crate 8165 BLAKE2B 6c651d00120b190b55b334c780ce7724e91f554cf3d85f99d8ae5f745bf4ced2e5b7d7aa307c6d0c2a6082534d238eb213868d3b528ea57a08a5e37ddc7051b8 SHA512 9c31d38bc29c9372984339b8d289317981ba483eee4430e936252b0fc44b1f500305082b19e6dc20b7d7fc81906f1c0d5c3f375b6db9f2c266e41c7015597073
+DIST fd-6.3.0.tar.gz 47974 BLAKE2B bc7423f7a35949a70edb9b237c606b10f054e68956de98c9a1bf93216f4e3b4431a55154d60badff3aba5b00a70231deb50dc546534c7ce96e9cd118c07e16ea SHA512 ab2c195106590373ee187e1f8a243425aebe643e5693b6f6972b613f55e80bb6d66439e493eca87f9b9803d97f3307e4f314a16372f294b1a8269448edbd9b94
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fuchsia-zircon-0.3.2.crate 22541 BLAKE2B 5838548c3cc1b23b47f6cd766ecc6dde407e082c919276b389dbdad8649a4348b5a4f31628f3cb38d2b401ce757fdf96d6f723187c58a2cf5bf12a57b7e47eed SHA512 f1fe51c3f2679f47307610587281910c6f9829c5a0ab5e9f1ff3309b4391649e1056bfee9d5ab19fd37b17d8eafb5c46269c3719003592cc8658a38ae2566086
+DIST fuchsia-zircon-sys-0.3.2.crate 7196 BLAKE2B d06741ad37d57ccebc25eea8280518f843dc07dd2edd9889fa66267bae8282110ed9f9ae2e5a17660f3c1e3b8f69544557aa93c751703319bab86753cdd1556c SHA512 177721989bdef070de28710a1ed5d02a9f291b0e399a0a6be68eb3a693c094fbfaf9b44bfd5ea0482d2b4a9c02a966b7f9b7a99b8f64690c57e26a026586e78f
+DIST globset-0.2.1.crate 21542 BLAKE2B 6c104c118d05a8e06280f736dd4cb7ac8ad7c5c90a4baacb0d8f602e64cfe0734b34f7854d0da725802df9753613b9ce5eef10cdb8eb979c5eea918fa12efd35 SHA512 19cdce0b498033a8649006621137dfd1df5cb00b69e5d4ecd4ad34962b7f8ad10df94bbd07a92074b43f6d96b9b49a6b0861072900d1591fb8d64f2ff64c7eb2
+DIST ignore-0.2.2.crate 39372 BLAKE2B cfe9b6fa1a02bbff3ca825c8d3daa6eabe61d6b86e8202d0929ffd59e4cfccddc99be4e41b61b9d8445244f649d0f1289322aa1b75d3e8fb1b7dc27edf900783 SHA512 6280ac43ddbe599481e8bcce95be222e328d64f6d8a1bec46a34a6f7950b6ea02c1e56fb8e2fa7f3167b6486536a4953cf1ca67e0f8757257a39304d9fe0f37b
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
+DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
+DIST libc-0.2.34.crate 304756 BLAKE2B 0a2af3e2a92ac6dfc72d72d26ff2df47b0c8656f22b3a52df02cf8eff787ae638ae8b2c56370da0e9f3831cca325d6073c6d08beedd7c75455c2785ccc5081bc SHA512 5f7a108608c2d202f6d59125aec37679f178cd1e34f0b6cc9384c476179aa45a8f10b5934314e2b2243fba4233bf8b1ce91399c8ba73e41c3591c14debc12856
+DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
+DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
+DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
+DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
+DIST nix-0.8.1.crate 85018 BLAKE2B 0198c49991f7a767305b572aa637b9735ebbdeea8e45563058727961330a9f8257dd270c9bbd23e51ee06fb4d89b6e4adf361f50c7d2812b04950c180a8443f0 SHA512 f289d258b26745769bb2570be67ba9e3748bbb09cbd0136a2f044bf0a26229fe2460e6813f7f39e07177eeab3f2463c0e55d8bc12b7bcb81793c707f4cbcc158
+DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
+DIST rand-0.3.19.crate 57576 BLAKE2B bf81b42676d5fbda64ffbd0de1303eaee1c9f764bc59ceb2274821f52b7970d656269d70e8b81e44cf5a7e2ae83e2fd7905ebacacd227160c64fdf48ad9c6c52 SHA512 9837def347b79c7278720f14e0c3fa560009a448c3ae65662c2328bbb6cd726a39c0e6cee79f900ed91a856362469192ebc151f7e772a467664cbc892cc5f9f3
+DIST redox_syscall-0.1.33.crate 13640 BLAKE2B 60d9ddc339c32d798977613cfff81f8d49e9ff70535b2acbe0fc64bd23ceb913e8fb229322af5ec1e70d27a72212fcdef5c60b68d20526bed06495853467223e SHA512 7dd1999e6894def3f833428c6c04b2c7a9d9caf58d4fe3c6d015286e2f1628e77ba3e4035a609db44b6dda268fc659d6aa8ddad17426eb58fe812d8d3ba0958a
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-0.2.5.crate 197417 BLAKE2B c8c4f5f4198c8d35475b95be378c07cb4b3d5baeafc52bf04dda55eefe796cfc8b36aaf0aa55a6ad08bab7aeefb63b7d39c35f51eed23e10599eb2854ae141dc SHA512 572f90bdfab4af1eed9905ef1b4ecdb97ad42849000f4efe0d0e24f7c1d4084ea0805dbdb7b18ed553c3ca796d64b5d2c59f4c1667608a7f74e29136172fde8c
+DIST regex-syntax-0.4.2.crate 126234 BLAKE2B 874339260fc870fcbb8bb982629cfe1b5789877eb3db13181a73a4295b567a2466b3fc17433b890c0a7986ac3640382bd28c155abfec126b650d2a1c99003b3d SHA512 9b37814ab8bf8ba9d0ad125ea4038f505a0d232084faacbc4fa4126afefb3b8bdee03bfb55ee6f29c518a28f25021a31a8eb35d69999c48c739b1c30c2dba98d
+DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
+DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
+DIST tempdir-0.3.5.crate 10605 BLAKE2B 1c15dca19ae03d6c8c5f189e25b484e3de70327239dbaa48b78d4f9a6231b07249d88e111d0c011ea49d0416438c3b66fa6bda9a6cc09f092b6d07a45ff893a7 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab
+DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
+DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
+DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
+DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
+DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
+DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75b0c8d1d49c780e6b729e3bc5e8d9a72e3a298bb350b1c27fac02dd7b31eb2f2018208f242b02d8d6d64af21 SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520
+DIST version_check-0.1.3.crate 4092 BLAKE2B 95b77edc5ba68170e307926793e928eaf76697a32b39e6985f577b8fe489697842fb81043ed03892c3006df9dd89ce6cae6c4644d6e0e9ba0b705fe3d9a07723 SHA512 1e566fabeac8cc163a975c1736f86c6e898ee42cbdda4874c9cc336f59eeff701528182449d318eef0a755f291fd3c612f728cd6034d9c6eeeae652a55eb249f
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST walkdir-1.0.7.crate 17883 BLAKE2B 23366528bc49b213e0926e24186b2a1240a5ff7e5cbc5be3c271a416c1417bcc5260b976746f8e0bd3265f4adea45699af661cd998dc15f3aacb878044587c37 SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.2.crate 904466 BLAKE2B 9cea7003d9d316525b4f304498d6c3f0782fa2b200a95c481cdf50e9f930f98ea46e756a0afb729fb954c2a734a19b86643c48c44691e6d504430a271ca8a473 SHA512 da387a5a2963ab2b17041d05b9559796b4e560e1ec10d75b8393a5a7b0658063697f93609fb3fc868d038d275b3a380405d4ca80e44dfd4c34f280b42b52e6cf
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.3.2.crate 3143529 BLAKE2B 7327b344038bc568b957788d7a7f5197cbf0391eec0075d22fe599be274bde6817cb81ea6623d1e136a18d057f41cb6cbe11948b0a8c5d03aef05aa32b1fbb6b SHA512 4b93a7292dc1707c837d571a9ee9c6367c7841b54eec886cea4b2a147396be57b25b33f9ba362fc6e87bb14ff10baa4fbeabf1802c66268d007d3efe357bb9db
+DIST winapi-x86_64-pc-windows-gnu-0.3.2.crate 3165198 BLAKE2B 3e1787d5eef457d1f63602436e3756d9f5c6d5bae070b865bf0597c81c8a38e693423c8734a67a008439624ba2f2bc612162e783fd6130de9f7226699514281a SHA512 a471fa60252eb1f351881fba0e1a41ef3e4992985c0841450a5057e530490f52c842651ffd0cdfd428d46f78a7e6990b5384f3af819aa852933ac5fa6abf91c1
+EBUILD fd-6.3.0.ebuild 1739 BLAKE2B b8c694011d9a3964f52558d0814dd314adc15e6cf15c3602dfb6d77ab502f5e64bd81fc1e0900a19f59321cc94cb12499611bc60241434e5169ba79940cac1b7 SHA512 ac620fd35fc0c6ded52d25376212863aab12f386eccbe76b1aa9d735689d5cead06d353bb417a96db9cba3405ed83782671f836cc66bac5fe58c8b13b09c9315
+MISC metadata.xml 681 BLAKE2B a34eb25e60bbc3058f226d0414d38664dbb8fd8bba98181cfc35be6d644317c5d288ea213475881cab7779ea09a2395f4978482594d351e9c89c96b353578c66 SHA512 1dbf24e015baf7153e370160c7b684ea09e17d8149d4f14a8d00749f58790a805d13c8b6775c7eab24b59b6045dca4001b83314dc414602ca522ef3da012a099
diff --git a/sys-apps/fd/fd-6.3.0.ebuild b/sys-apps/fd/fd-6.3.0.ebuild
new file mode 100644
index 000000000000..117bd517d040
--- /dev/null
+++ b/sys-apps/fd/fd-6.3.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.4
+ansi_term-0.10.2
+ansi_term-0.9.0
+atty-0.2.6
+bitflags-0.7.0
+bitflags-1.0.1
+cfg-if-0.1.2
+clap-2.29.0
+crossbeam-0.2.10
+ctrlc-3.0.3
+diff-0.1.11
+fnv-1.0.6
+fuchsia-zircon-0.3.2
+fuchsia-zircon-sys-0.3.2
+globset-0.2.1
+ignore-0.2.2
+kernel32-sys-0.2.2
+lazy_static-0.2.11
+lazy_static-1.0.0
+libc-0.2.34
+log-0.3.9
+log-0.4.1
+memchr-1.0.2
+memchr-2.0.1
+nix-0.8.1
+num_cpus-1.8.0
+rand-0.3.19
+redox_syscall-0.1.33
+redox_termios-0.1.1
+regex-0.2.5
+regex-syntax-0.4.2
+same-file-0.1.3
+strsim-0.6.0
+tempdir-0.3.5
+term_size-0.3.1
+termion-1.5.1
+textwrap-0.9.0
+thread_local-0.3.5
+unicode-width-0.1.4
+unreachable-1.0.0
+utf8-ranges-1.0.0
+vec_map-0.8.0
+version_check-0.1.3
+void-1.0.2
+walkdir-1.0.7
+winapi-0.2.8
+winapi-0.3.2
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.3.2
+winapi-x86_64-pc-windows-gnu-0.3.2
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
+HOMEPAGE="https://github.com/sharkdp/fd"
+SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=virtual/rust-1.20.0"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
+ cargo_src_compile
+}
+
+src_install() {
+ cargo_src_install
+
+ newbashcomp "${T}"/shell_completions/fd.bash fd
+ insinto /usr/share/zsh/site-functions
+ doins "${T}"/shell_completions/_fd
+ insinto /usr/share/fish/vendor_completions.d
+ doins "${T}"/shell_completions/fd.fish
+ dodoc README.md
+ doman doc/*.1
+}
+
+src_test() {
+ cargo test -v
+}
diff --git a/sys-apps/fd/metadata.xml b/sys-apps/fd/metadata.xml
new file mode 100644
index 000000000000..c3728de303b7
--- /dev/null
+++ b/sys-apps/fd/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ya@sysdump.net</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</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,
+ it provides sensible (opinionated) defaults for 80% of the use cases.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">sharkdp/fd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 85b01e1afd59..31fa6eab7c13 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -3,6 +3,6 @@ DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a
DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
-EBUILD hwids-20171003.ebuild 1719 BLAKE2B 3bf86ff4b2a95b72dc19f2b8cdcecd3eb1dfa60ce0b7a3f288552f292d8598f8c6ed147b7e5a790b969bd9e5ece39cde8eb0e5e649c12f92ed28f2ae64a5cf10 SHA512 b7ecee65b754aa40ab65204f08803728560156e4c54df221df8163432ee488a284ea43cb5d4b26ee68a86765c776963d6cd5e0fa2e5a0482febc1aff8b240bc0
+EBUILD hwids-20171003.ebuild 1716 BLAKE2B f55af1c06f53680865037e2bf5cf202a925ed21c53abb9e228651261dae8c88e8c4045f3f99a6381d2a36048375f6b273de8c49e23d4c0201582f28bab378949 SHA512 8cd7e7f1ad3ec621f549d40a2a152cafc57381628e0e0ea80e8617554012a09f7f8b827bc23de178a8483e9bece403c392cf072f9c5a811ee78b0b4c0092ddb3
EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
index 3f04c8534c6c..376d93cc4354 100644
--- a/sys-apps/hwids/hwids-20171003.ebuild
+++ b/sys-apps/hwids/hwids-20171003.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"
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
EGIT_REPO_URI="${HOMEPAGE}.git"
else
SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index b222ab694f85..f8c2d1a065e3 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -9,5 +9,5 @@ DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f
DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
EBUILD keyutils-1.5.10.ebuild 2804 BLAKE2B f0f4d4b762592597e38e358c721e6625288ed5b443b37b459d4edf3f285f17d3776a1695d6a04cc24435df297de76b151d2d5ae4939472a88276d72a28db6ab6 SHA512 88cd81319c89a05b6f4f446f22833810e894802809610afc3066df35ad0d426349e964e739aaa34bdc4dab9368d5c728cb791af2486f38f0e966be9c49981323
EBUILD keyutils-1.5.9-r1.ebuild 2293 BLAKE2B 6839a041eaafe1ea4cfd4706970694883ae01e1c8a39bd031a4368378ded11fce323e7c56e23025e1e523a81ee382bfdfa9ee3f5deddc156440c29d95d30d6d4 SHA512 fbcf7923a757dd2247cb0d1c644e865f03c31f09fa3c880264d1e0b5631e7b8f4611c6206286d8fbba616bba9c0f553d9c1c714744d94e454f309f64ed37980e
-EBUILD keyutils-1.5.9-r4.ebuild 2950 BLAKE2B bd0aae5077e5f2932a3f7424faf07a8e2f8e943b171c49f3735bee5f35b8741efee5d84756f85c5d4246e1c6b885d90142fa71a3e7b467021e1d18c827ce60fc SHA512 f678e927bb7d6dc199d94c0d821ba2dfd0cbe9c1ca2f43da2cad7fac8a49d9c783ee7a6d69d6b8d210de45dfffb953113078548b6aa47cfd17b750a823617574
+EBUILD keyutils-1.5.9-r4.ebuild 2949 BLAKE2B d119b431de3a0e095bc66ed70813683ff290a6c8e71e3a409c42b5243ccc19439a528f92e83b9717282a6867be2a3240d9deadf6d8464e77616549a79c860b13 SHA512 ea2027236e51ec208d418f9383d6f86657d883f62748056f2c409bb669ac049b5036cd0ad178cd638b275324a2763c8252cc12957bc2bfd77a0024b8c81e9257
MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 3ca355e6df9d..4b42896f7325 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 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"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="static static-libs test"
RDEPEND=""
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index ca1ff7823a98..97dfacaf5c98 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -2,9 +2,9 @@ AUX README.Gentoo 823 BLAKE2B d4920f827b4c0c210715f4f05c1365c3388b01ca41e8e08add
AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd823a8f5a00a110df3492d299b04a66b003528549991c0b87e1ee80835a0383667991b6a8bba50 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b
DIST less-487.tar.gz 318488 BLAKE2B 294ce992da39488fe5b50edf80d70179a45a449f5bcf8b93d6735be9f57db708734984f3a58654773155148c96037e2c445dac63abed1bc4ce655a4e472eca08 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a
-DIST less-520.tar.gz 337959 BLAKE2B e3008ec61b9095c7e0f696a662478e1aaeb9108dc26aa6437015e152bd74e8231d459c6369457c07f01b62869431c278585e4499b02285476bb70740003d6423 SHA512 67b51f4734a3b5a7871509110f87bbd6d1fa3068ad2d524adaa07b8917ff18a962b706cf5d55cf9800a39f9e583f21d0249837841d3c999babaaf5aa2bc4ff9d
DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a
+DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10
EBUILD less-487.ebuild 1428 BLAKE2B f1f6d3a489e2d96d948717877e0f6c0cd57eb0fbb611cc8210f5718cfc68cd02b616195c626501cee03ea2b264089cbf88b26aa3cde47e9aee95c3bfc5a6c8c1 SHA512 0cf3e17c9deab9b81e3e3d17938d84e4008dbc5875955dc7d3aa5514f36556a5791d580a3b897cb36310dc6520ee383e432c47d38b1c2dcc1a4c0c065d39cfd6
-EBUILD less-520.ebuild 1392 BLAKE2B eb779b740776cbb763f13a1e9212c80f5935b03dcfc80d4ae94ffb5efb6499a191551de03b0265c2d6a7fceb2fb5a66f5222368f6c9baa603a1224d3297705e6 SHA512 8b5fd99e7b47fbdb9bb3e079079a33783d5b1ff915a057e6cf6d2f7b23016d4882fe3395778ba173638a2b07593291a5c6ea1840a7fa2e97bb52b96295a41078
EBUILD less-529.ebuild 1380 BLAKE2B ff64439bb5f138b1d037b658881f5c68e25f37b1d6a85b453c9ae93f23c0bded7e066dd0585a81ce11ca847f14efa60d688b4fcc00f6e13bcbc0b19606d2098b SHA512 a7c281704a9bce283c1ca247f7b9a710879394fc35aaae5a662d16160fe04e56d100e601abf299923b5d29648b7a8493139be2e574a59e37eb4f188f44038212
+EBUILD less-530.ebuild 1392 BLAKE2B eb779b740776cbb763f13a1e9212c80f5935b03dcfc80d4ae94ffb5efb6499a191551de03b0265c2d6a7fceb2fb5a66f5222368f6c9baa603a1224d3297705e6 SHA512 8b5fd99e7b47fbdb9bb3e079079a33783d5b1ff915a057e6cf6d2f7b23016d4882fe3395778ba173638a2b07593291a5c6ea1840a7fa2e97bb52b96295a41078
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-520.ebuild b/sys-apps/less/less-530.ebuild
index 84d4144cc47f..84d4144cc47f 100644
--- a/sys-apps/less/less-520.ebuild
+++ b/sys-apps/less/less-530.ebuild
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index dba737a367d4..c6aca03134a1 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -1,5 +1,4 @@
AUX nawk-20121220-parallel-build.patch 1653 BLAKE2B be278714502f7bf267f57e0e50024f85d732b5cd4785f568e7c16dfe729d6bfaa584b1161e8adf11c476194cc04b8c3adca240530edbf2d30a060324d3a7ce5d SHA512 91201e4e09646726c10fb2d54b9418e4d1d410bfd0769613c766bacc1fda830d072ef14db15eddd7d3835d6e11fe48b2aa8e797e941649c0e114ee5c89b4e060
DIST nawk-20121220.tar.gz 88970 BLAKE2B e00b9e55bb3b9139c00b8cc0be3f6cea2acc1162ee4326103c054c7270ef4a29b97cdddc9a692cad0773a72a17c399d2da5453939681a5d2456f0b740b6bc2ee SHA512 1dd62e1aa4c8cfad7ce599b10d88e9b450ecae3217cf8327cc0f3ce77d0d0dcb731101b8f211066462d46dc4ef23e20ccd7f70d799d7d48940026abe8fa79d4f
-EBUILD nawk-20121220-r2.ebuild 1046 BLAKE2B 04327d2936cccba137adab6af2de18bda2ce4210822995af74c909368f07e957b7bec71205ee6eb86dab163c4b1934e6e0c0e0fd718b29ac83efaa120279da60 SHA512 68cdf046ac342d5f6f890d13b3725128d468880d4a5ea9cd984913e1806c409bf46d1c76c1c6fede254a33ad41d8df0025e002bf35390001f433ec0f95678d98
-EBUILD nawk-20121220-r3.ebuild 1100 BLAKE2B 0bba5c985e962beda96599ad9f5a2a6a4bfb1eb8b4de1a16a7e9857aee4f4ed7cb4430c28955b306fe81598a6e14831f7283837618f3a47aded7781213f0239b SHA512 f8698df498f9ec6d7f9f6b0e22fcc4f2505223a2c2d9ab875e6b9f95199f467d36b59283a8e67de5405cc555efd4b0993d50a58955cdef1c026a5dccdd5ab2b9
+EBUILD nawk-20121220-r3.ebuild 1097 BLAKE2B fd71ffb9652957eafe2be709b702aa90c9aa4ca172c949ba71fdfb1397fb173bfd4fff0ae20b1e63967e99b4c83b8b5af684e3b49099b5cb9b6ed947287e5aa7 SHA512 e2908d0aef5c0a834c657338d22a4efd83e81106a5911ff537e05bffa525866a6f5fbd7b134a7d96d1d6231ce4562ccb126e26d986f6e23981d3d45f110af6e1
MISC metadata.xml 330 BLAKE2B 0f7e580c6988620e9e3cf452696c66e7ed5f383e878c898b0f90adf96dd847e6063a09bcccf85bf957c86d329617554e72413b4b7536319e37d8993287de3c5e SHA512 621c5fa8dc89857de39705622efcee6f0487e404de19424d0aaeec5b393a01176585139f98c2587d9169564c73585a339c86af21a41c2ab5ec084adee47d1ff3
diff --git a/sys-apps/nawk/nawk-20121220-r2.ebuild b/sys-apps/nawk/nawk-20121220-r2.ebuild
deleted file mode 100644
index fe1d7f62e133..000000000000
--- a/sys-apps/nawk/nawk-20121220-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
-HOMEPAGE="http://cm.bell-labs.com/cm/cs/awkbook/index.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
-IUSE=""
-
-RDEPEND="app-eselect/eselect-awk
- !sys-freebsd/freebsd-ubin"
-DEPEND="${RDEPEND}
- virtual/yacc"
-
-S="${WORKDIR}"
-
-src_prepare() {
- rm -f ytab.[hc]
- epatch "${FILESDIR}/${P}"-parallel-build.patch
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS=-DHAS_ISBLANK ALLOC="${LDFLAGS}" YACC=$(type -p yacc) YFLAGS="-d"
-}
-
-src_install() {
- newbin a.out "${PN}"
- sed -e 's/awk/nawk/g' \
- -e 's/AWK/NAWK/g' \
- -e 's/Awk/Nawk/g' \
- awk.1 > "${PN}".1 || die "manpage patch failed"
- doman "${PN}".1
- dodoc README FIXES
-}
-
-pkg_postinst() {
- eselect awk update ifunset
-}
-
-pkg_postrm() {
- eselect awk update ifunset
-}
diff --git a/sys-apps/nawk/nawk-20121220-r3.ebuild b/sys-apps/nawk/nawk-20121220-r3.ebuild
index a52e72d09b28..802c7c57c385 100644
--- a/sys-apps/nawk/nawk-20121220-r3.ebuild
+++ b/sys-apps/nawk/nawk-20121220-r3.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
@@ -6,7 +6,7 @@ EAPI=6
inherit toolchain-funcs
DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
-HOMEPAGE="http://cm.bell-labs.com/cm/cs/awkbook/index.html"
+HOMEPAGE="https://www.cs.princeton.edu/~bwk/btl.mirror/"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="MIT"
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index e05923da612e..849b869179e9 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,10 +1,13 @@
AUX nix-1.11.6-per-user.patch 554 BLAKE2B c56fcbc5154a315cdb87827a4f0aaa2991903f149608ef5168e2b26932802a9d466e41ee673ffbaf23d3ccd0292fce6a8a3d5fe91d4c4aa891cd8a750725ac17 SHA512 ffc6b03ba9fa8a56cdb40caa271582b8648f9539d8abc69251d16356efa64c93902648bae29d06af938383dbf3be110fdaebbbd4af4635c112bb34d1077cb56a
AUX nix-1.11.6-respect-CXXFLAGS.patch 164 BLAKE2B ff171c369d1628d530e49520d1655dcc5ad9e342618f9c79dc1feccd1caae594fec82a5ec50a000d0ae57236c8d6bd5fde4baf45f3bdf48f717599b987fd3d6b SHA512 2508d26888050bb4099f1654cee91d44405b00ca4dfdd6c1b1cf0f24e004333b106cc461b306404b1d56f41bb928ed1069536c09f9390b5ba287ca70b9bcb0c6
AUX nix-1.11.6-respect-LDFLAGS.patch 2332 BLAKE2B 83382d89c3ca40404460629f42dcdf447dce57677e1fbe7d4abc40a506397c3962fbbdb38e0e01342380115d011ace02cb10f97219a7ccd3cb92da993a79fc25 SHA512 aefc9b045794038b6513211ecaf18c469b7aa52110fcaa5168a1ca9f9af9b663aa6e90fe27c3c500bf9adc2714a8f73fc5243f3096fabe6bbb7e855e0ae7aa87
-AUX nix-1.11.6-systemd.patch 394 BLAKE2B 9ea08e8edf9833354d33d8f857d0def1f062d3ae4f9baeda03802f4b8c7c99d6a07002137d6674c72eed0337b35be354af83b03a4ee5fff36d2fbb62f5647b3f SHA512 a5f39652c7fd829f11e75b1e3640a218129cac8a47c15a34b0390f51234fda45b7841e43ec6ed441803405483750ee6b82e7c3f918d22222d1e08a79e359c5dd
+AUX nix-1.11.6-systemd.patch 394 BLAKE2B 144b5e2c4f55077bb0c722ff71bf0a587f20858c27fe4a3bb9cd44bec159a30122382b7fff3b998478aaa4f93519247708926a6369f9ac2fa1a3d43cc5808a38 SHA512 2c5a701815e1c3091c5568b01d6709a9a227c18967a7c0eff7676f741c87f5082a49842427022991656cac079734741820bb8a895679a65cce657a29df86ddcd
+AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a9285d1dabdfe06cfa55c8ab578160f940537cc9ed7ba7ef408d167f23cc914127313bed992baac747f49a9dd054 SHA512 3eab6ae522767bd8c1f2adf6a00544f7fecb698dedff68835a880a7ac533dd4e188661a955f111769525828d761612c49669a36ccf25f16bab6d325313da3232
AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
DIST nix-1.11.15.tar.xz 632544 BLAKE2B 3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca SHA512 449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
DIST nix-1.11.16.tar.xz 632440 BLAKE2B 0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834 SHA512 164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
+DIST nix-2.0.tar.xz 794084 BLAKE2B 9596788df6aaad144d408e95f34575bf985849bb57424c7aac4dc1f2f2d846302bf78fc05682ce92fbaf000db04a326f867a76f5963a80b72b63e3678754247f SHA512 4531b4648108019d44521af94f8243936d2df62701395c0c448795f1984d4b5ade2438c92d12e5414d493909811e3bcb902c85539932c7e44d98d4254a2a531d
EBUILD nix-1.11.15.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
EBUILD nix-1.11.16.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
+EBUILD nix-2.0.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/files/nix-1.11.6-systemd.patch b/sys-apps/nix/files/nix-1.11.6-systemd.patch
index f890ee6f0470..5a77d7c77e5c 100644
--- a/sys-apps/nix/files/nix-1.11.6-systemd.patch
+++ b/sys-apps/nix/files/nix-1.11.6-systemd.patch
@@ -1,4 +1,4 @@
-Make 'nix-daemon' a goof unit for 'systemctl enable nix-daemon.service'.
+Make 'nix-daemon' a good unit for 'systemctl enable nix-daemon.service'.
diff --git a/misc/systemd/nix-daemon.service.in b/misc/systemd/nix-daemon.service.in
index 5fc04a3..2565520 100644
--- a/misc/systemd/nix-daemon.service.in
diff --git a/sys-apps/nix/files/nix-2.0-user-path.patch b/sys-apps/nix/files/nix-2.0-user-path.patch
new file mode 100644
index 000000000000..486a05bb5959
--- /dev/null
+++ b/sys-apps/nix/files/nix-2.0-user-path.patch
@@ -0,0 +1,10 @@
+On gentoo 'id' is /usr/bin/id while @coreutils@ is /bin.
+diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
+index a5f5227..1dc5379 100644
+--- a/scripts/nix-profile.sh.in
++++ b/scripts/nix-profile.sh.in
+@@ -2,3 +2,3 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
+ __savedpath="$PATH"
+- export PATH=@coreutils@
++ export PATH=@coreutils@:@prefix@/bin:@prefix@/../bin
+
diff --git a/sys-apps/nix/nix-2.0.ebuild b/sys-apps/nix/nix-2.0.ebuild
new file mode 100644
index 000000000000..bea6bd1a4240
--- /dev/null
+++ b/sys-apps/nix/nix-2.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix"
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+ app-arch/brotli
+ app-arch/bzip2
+ app-arch/xz-utils
+ dev-db/sqlite
+ dev-libs/openssl:0=
+ net-misc/curl
+ sys-libs/libseccomp
+ sys-libs/zlib
+ gc? ( dev-libs/boehm-gc[cxx] )
+ doc? ( dev-libs/libxml2
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ )
+ sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/bison-2.6
+ >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+ "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+ "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+ "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+ [systemd] # systemctl enable nix-daemon
+ [openrc] # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+ \$ nix-channel --update
+[as a user] install nix packages:
+ \$ nix-env -i mc
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+ but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+ nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+ enewgroup nixbld
+ for i in {1..10}; do
+ # we list 'nixbld' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+ done
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir="${EPREFIX}"/nix/var \
+ $(use_enable gc)
+}
+
+src_compile() {
+ local make_vars=(
+ OPTIMIZE=0 # disable hardcoded -O3
+ V=1 # verbose build
+ )
+ emake "${make_vars[@]}"
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ # here we use an eager variant of something that
+ # is lazily done by nix-daemon and root nix-env
+
+ # TODO: will need a tweak for prefix
+ keepdir /nix/store
+ fowners root:nixbld /nix/store
+ fperms 1775 /nix/store
+
+ keepdir /nix/var/nix/channel-cache
+ fperms 0777 /nix/var/nix/channel-cache
+
+ keepdir /nix/var/nix/profiles/per-user
+ fperms 1777 /nix/var/nix/profiles/per-user
+
+ # setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
+ keepdir /nix/var/nix/gcroots/per-user
+ fperms 1777 /nix/var/nix/gcroots/per-user
+
+ newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
+
+ if ! use etc_profile; then
+ rm "${ED}"/etc/profile.d/nix.sh || die
+ rm "${ED}"/etc/profile.d/nix-daemon.sh || die
+ fi
+}
+
+pkg_postinst() {
+ if ! use etc_profile; then
+ ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
+ fi
+
+ readme.gentoo_print_elog
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 439974bf2a5e..1f161788535f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,7 +9,7 @@ EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2
EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
EBUILD portage-2.3.19-r1.ebuild 8410 BLAKE2B 1a3753ecea5555ac11a60b3ded94a75cdffb931a828927fd5d01cc0d544bccbaa35a5ac559001d02c4a8df7cdd61939bb60785cc7c0e518a30470b3a611c1829 SHA512 c91fd81e456c454614c23609776aa10de0a3e1f1114ef6bc03b15db6715109aab31e357e7ce7bb2b5f4873c1e64585ed060d52533874b745c430e1050e929bab
-EBUILD portage-2.3.24-r1.ebuild 9254 BLAKE2B 7d9dac939d024fcfaae1ae7008a0f68585ec3c8585d5eb729dbccea1be0d3f600955afda41af4931c71d139ab2d8cb2d8bbc849b509e04332cfe7c20130168f8 SHA512 828eb5f9562e8c9d2688454adccdba5d800e4ef4a50c6993bcb002fcceadf92337305481103f1011c0e3becfbb40aa8a1eab099c8b8cea4da9b78824462a4050
+EBUILD portage-2.3.24-r1.ebuild 9266 BLAKE2B 28dfdb68f2128309d1f5917c0f19ff0f41d42a15ee916d51570dd03a75890e0286e6f262e78dfeeeb95ea989b4521b8c7406b15e5208f803cfbe2a01df1a0552 SHA512 5cd897ff5a79ef08ded6f36e61efcf9b82fc0de87b5f2ba51a1cc0faca83ead8b8b3b6fe62d04601c8bacde8fd4cbd10bbfb93c40f5a40cf59aa203a732460ab
EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild
index b7666c5beb70..4ea6eacc178c 100644
--- a/sys-apps/portage/portage-2.3.24-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24-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="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
SLOT="0"
IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index 5c39af3a296e..b9560abc0f4c 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -2,5 +2,5 @@ AUX prctl-1.6-no-implicits.patch 473 BLAKE2B dabd09b5d334dc2731af41229248e1f5dcf
DIST prctl-1.5.tar.gz 17507 BLAKE2B 43bfdbe3ced9e2cdb05c672bf02726f82ed25c3c4b852a7ac799c168caa73de89424eb40e684dc013518c25d6dbac02e7449cababc0a593bf7e2d6d90c2ef459 SHA512 60463a80fcadec9f2c6fbb0e179391affb594a15f116bc0c6dba350251b6fab1eb7bfca5753e0765cb27b723b76a86cbe19bdaa3ef50d4fee6696ed861e0bb96
DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
EBUILD prctl-1.5.ebuild 535 BLAKE2B 06d96bb44cfbfac5175753f003173b339f0aa0cc441cf77595a0543c40a73122cb7929b6322075de97a084d815f0d365bb19995cf2ae4aa19978dd5d62e28bb3 SHA512 8233568d1a1f7ad873e04b8cd87097778a5eb468af4894fe7ce40c0068a06667d8eca33eb68353cd86d7ae3655bcbcd407cae4d11acac6ae8081aceeaec61fb5
-EBUILD prctl-1.6.ebuild 598 BLAKE2B dcd4c3064a280f97eceaafd74208ad2b0954da95d45d685bbc296941a3080af8bb05b5dfb9279e3481ecb4e4c903b667688670aa9553b17c7b9a288eecd9c9a0 SHA512 5e203e0497d77c3ae3f7ff813fd77efb8a6bdc035e2773518f70253a2f7fb75808b55c53f3446652faecf23984a6592bb5a98b463aee4f985296c380e266e55f
+EBUILD prctl-1.6.ebuild 597 BLAKE2B d7e672fea2785fbd7640ea5f72b70343617e48e6f0579559141385d1d37a73935f0ef595cab4e70d6c4316f85e07ecbfa8b54086ae8d677d61c5f0f1e41763e0 SHA512 af984e9080fc984cf04384edf6aa5edd38e42ebcebe23a722fa597d9155c9b44fcd536a3f53f52f3c48e5dce40504635d764d12ab058603e966cf4a340336e3b
MISC metadata.xml 449 BLAKE2B da01afb0a080790cad07f77c097cc92bad6fca77c6d8da75b21e35eb9f1253153bb90bdff9aa719bb77a0c1e760dbb2c60d8152c9d2de15e37fd41fd2edcda80 SHA512 a254e2fa6263298f6f35967195a6f27ea434767c5690082df42e09f3bbb2439835643cfa4d030a09fd5a1829086ebadd6c5485cd53c49ed0ebf291e897f9290f
diff --git a/sys-apps/prctl/prctl-1.6.ebuild b/sys-apps/prctl/prctl-1.6.ebuild
index 24ac9dace8ef..903043fdd691 100644
--- a/sys-apps/prctl/prctl-1.6.ebuild
+++ b/sys-apps/prctl/prctl-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ia64 ~x86"
IUSE=""
RDEPEND=""
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index 998812c8b61b..ce374012231e 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -1,5 +1,5 @@
AUX 50qingy-gentoo.el 241 BLAKE2B 951d9c06cb1b31be819cf687f6bd02fca29fcb35d482cfa0ec380168dc1ae5311dd08fca988b7a86205d12153ef3ea551c3ccb6394d3db036c578998498f517f SHA512 b4ee1fc4b2337647f775bdf38688c93bebad4c4beb5bc4e457c45da014c03832771c5d01112af4a3c3d55c5852b09fdfcde08519b0d506f978bc772c2afd991e
-AUX qingy-1.0.0-tinfo.patch 1573 BLAKE2B ff481ddb680eba468cc3b270b6a7b02df67c422225d986577c5364ec3650024ef66f0d6087db987e54cb1db36ca9419a53c1443baff4c6960db1c1de53ad4803 SHA512 a37b92e3e4da0e87687461df7644fbf1b3adef81ecdee411073bb0593875c493cc110e9925c8131b99bc97d143a811190e5e6d03cc4992a18396135936697fcc
+AUX qingy-1.0.0-tinfo.patch 1581 BLAKE2B 4e1dc1328a322b8c2a2b9e7abc05eaad4ba6ba8b208dda28a7648908c6670864fd23f2a7d0472b42ea79521b532e21dc92449ef47c9f7d788342c21ba0fd8001 SHA512 f9ac5d0dba7473de113a360f02f7eeefbb5af70db2c282741697316ddcc81ecc01e2341436e6a6fcb9f43170a4297b2b12aeec352a271ce12b97e6aaf593bac1
AUX qingy-logrotate 75 BLAKE2B 2c61e97469a1911a3c711321a202b5276a41bf607e4361ef2acf2f2225e6f5752f33d9e8130f5fef682fb0a19f04bb2e2b056904cb24a9daca8f199a921c2850 SHA512 3b22cac09fc7394a4a4aa5a786309378cd769c351eed1e2813b84230c6ec74f7c30bfec9c6a03682b2ad5063a30bbdaac679f9e07bab2cee75ec73dd137aca01
AUX qingy_at.service 391 BLAKE2B 2dd7ea5a1c18502fb77a5bfa4beafe10e96877199c45c9c6eba34ebaa6c3dc9bc5b6f943234c2220dfef8c16fa2bb498ab929ca1c712ecf653664d7372ade7de SHA512 bbbfaea129f8b0ff89a66873f3d2ee2b774ce6f59adfb5efdd7bbaaf7d602a6933e888b68b73bf378864799088bf7f4e645785cbc16c51621bf2fed11a4cc55a
DIST qingy-1.0.0-consolekit-pam.patch.gz 9263 BLAKE2B 2b20b6c0a6be7f20154f2a36d1bcbe7741adb94e8486b81ccb4f9289f6aca7c33081b950f282e6aa0a68b2d23e6235918931faaf05666a4226666600f6b19d3d SHA512 e69743173ea0ff27265dca789f4203b58c271ec6acfeac1ffd87738a3a693f1393778ca70be5d0c8a3e461edfa350047cef3941d8e85679f7c930f3b63c1eeb1
@@ -7,4 +7,5 @@ DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9
DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
EBUILD qingy-1.0.0-r2.ebuild 4075 BLAKE2B 271d6f850551bebee5a83ea6c2471756de0d27a08be77ecf2860dc1d62b16e13d835e3f801e0a92c350ffdd77ea0ed4dc73f0443c71aa5c5aef70f85ca0eed12 SHA512 cc848a116d0dbbb728f385a0c6e3119c618a7584e10d41580cc35fcea2cfeb22a2fe1633cc8adc712a4b08a8fdfa2f5a26e118e7ffd342db02f22cb242776d39
+EBUILD qingy-1.0.0-r3.ebuild 4064 BLAKE2B c8c329cbd4f5d55496240cb7224d07b03b19a470f162a39bcbcc37dda207c4dcd4e5bf3edc41b0ea07f8bf8cd3c591f57b61de7e2a850558408ddc4ad7cbf4c9 SHA512 a3078a99a5fc72da1eb014f8a2596d137899889ccf81ce4c43a93296f63d006070b7ff6070e2975a9f3384c5b9f5210b01541130ddab238753dd5bddc81378eb
MISC metadata.xml 520 BLAKE2B 283f63386d116aae632026bf5bd61178022ac58d2a76a54087a42934bb9db1d714b0e14ebfaf74c48dfdc2ffd8505068a45fe2c2fca9446b33a2f48445f98458 SHA512 675beb88cd98c9e5e9c94b3292bf82aa91b1c17178b0718b0fc282202127b8fc0d58062f31ed4cd927aac4614dd3f975594a60fb293f3359e788cc8a2d1b8485
diff --git a/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch b/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch
index f752996c92f5..fdb59256bbf9 100644
--- a/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch
+++ b/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch
@@ -4,8 +4,8 @@ linking since symbols are used from both
http://bugs.gentoo.org/459650
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
@@ -125,12 +125,7 @@
# End compile emacs stuff
@@ -20,8 +20,8 @@ http://bugs.gentoo.org/459650
# End check for ncurses
# Check for PAM support
---- src/libraries/Makefile.am
-+++ src/libraries/Makefile.am
+--- a/src/libraries/Makefile.am
++++ b/src/libraries/Makefile.am
@@ -4,7 +4,7 @@
INCLUDES = -I../.. -I../
BUILT_SOURCES = parse_settings.h
diff --git a/sys-apps/qingy/qingy-1.0.0-r3.ebuild b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
new file mode 100644
index 000000000000..dc95a4a0d2b7
--- /dev/null
+++ b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools elisp-common eutils pam systemd
+
+GENTOO_THEME_VERSION="2.1"
+
+DESCRIPTION="A DirectFB getty replacement"
+HOMEPAGE="http://qingy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+ mirror://gentoo/${PN}-gentoo-theme-${GENTOO_THEME_VERSION}.tar.bz2
+ https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz
+ https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-consolekit-pam.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="consolekit crypt emacs gpm opensslcrypt pam static X"
+
+RDEPEND="
+ >=sys-libs/ncurses-5.7-r7:=
+ opensslcrypt? ( dev-libs/openssl:0= )
+ crypt? ( >=dev-libs/libgcrypt-1.2.1:0= )
+ emacs? ( virtual/emacs )
+ pam? ( >=sys-libs/pam-0.75-r11 )
+ X? (
+ x11-libs/libX11:=
+ x11-libs/libXScrnSaver:=
+ x11-proto/scrnsaverproto
+ )
+"
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4.1.4-r1
+ virtual/pkgconfig
+"
+RDEPEND="${RDEPEND}
+ consolekit? (
+ sys-auth/consolekit
+ sys-apps/dbus )
+ pam? ( sys-auth/pambase )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-tinfo.patch
+ # bug #359637 and bug #462634 - fixes from upstream
+ epatch "${DISTDIR}"/${P}-screensavers.patch.gz
+ # bug #372675 - fix from upstream
+ epatch "${DISTDIR}"/${P}-consolekit-pam.patch.gz
+ default
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local crypto_support="--disable-crypto"
+ local emacs_support="--disable-emacs --without-lispdir"
+
+ if use crypt && use opensslcrypt; then
+ echo
+ ewarn "You can have openssl or libgcrypt as a crypto library, not both."
+ ewarn "Using libgcrypt now..."
+ echo
+ fi
+
+ use emacs && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}"
+ use opensslcrypt && crypto_support="--enable-crypto=openssl"
+ use crypt && crypto_support="--enable-crypto=libgcrypt"
+ econf \
+ --sbindir=/sbin \
+ --disable-optimizations \
+ --disable-static \
+ --disable-DirectFB-support \
+ $(use_enable consolekit) \
+ $(use_enable pam) \
+ $(use_enable static static-build) \
+ $(use_enable gpm gpm-lock) \
+ $(use_enable X x-support) \
+ ${crypto_support} \
+ ${emacs_support}
+}
+
+src_install() {
+ # Copy documentation manually as make install only installs info files
+ # INSTALL is left because it contains also configuration informations
+ dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
+
+ # Install the program
+ default
+ find "${D}" -name '*.la' -delete || die
+
+ # Set the settings file umask to 600, in case somebody
+ # wants to make use of the autologin feature
+ /bin/chmod 600 "${D}"/etc/qingy/settings
+
+ # Install Gentoo theme
+ dodir /usr/share/${PN}/themes/gentoo
+ cp "${WORKDIR}"/gentoo/* "${D}"/usr/share/${PN}/themes/gentoo || die
+
+ # Alter config file so that it uses our theme
+ sed -i 's/theme = "default"/theme = "gentoo"/' "${D}"/etc/${PN}/settings
+
+ # Install log rotation policy
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}-logrotate ${PN}
+
+ use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+ rm "${D}"/etc/pam.d/qingy
+ pamd_mimic system-local-login qingy auth account password session
+
+ systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+}
+
+pkg_postinst() {
+ einfo "In order to use qingy you must first edit your /etc/inittab"
+ einfo "Check the documentation at ${HOMEPAGE}"
+ einfo "for instructions on how to do that."
+ echo
+ einfo "Also, make sure to adjust qingy settings file (/etc/qingy/settings)"
+ einfo "to your preferences/machine configuration..."
+
+ if use crypt; then
+ echo
+ einfo "You will have to create a key pair using 'qingy-keygen'"
+ echo
+ ewarn "Note that sometimes a generated key-pair may pass the internal tests"
+ ewarn "but fail to work properly. You will get a 'regenerate your keys'"
+ ewarn "message. If this is your case, please remove /etc/qingy/public_key"
+ ewarn "and /etc/qingy/private_key and run qingy-keygen again..."
+ fi
+
+ use emacs && echo && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index c27a25a417dc..db59a075f627 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -5,7 +5,9 @@ AUX sandbox-2.10-memory-corruption.patch 1515 BLAKE2B 2c0ef4ca1899efd2d525aafb26
AUX sandbox-2.11-symlinkat-renameat.patch 3418 BLAKE2B 4864dd5794abbf70d70f30949ee39921f9dafea4445f4cd49d88a5bef9b19769ed0c2c37a7a30fd6e241c159b21aad4f6465ef159ec1652cbb0d4a65e6531869 SHA512 cbefae8aa9c289db0bfe7b2429f64aa4c437be0e269eaa657eb3b22a3086db1fca45a624cb181978b4157f0cb9b475b4ece2eb9337285bf8bede709ad4431c52
DIST sandbox-2.10.tar.xz 417068 BLAKE2B 78bb5b29b520d41c582e7f7cb444ce580f9f8f05ce80795986ff8e1f84f9320e21fda0c5ae092cce8e5a3dc1c0efa48e1ce69c21107e541d2c569e6369ccb5b0 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305
DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
+DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
EBUILD sandbox-2.10-r3.ebuild 2156 BLAKE2B fecdef4a769d481e6479c82c341626de5d935f031b33df13eaae51b2041e0793a9854f3726ae90586586dc7d0008230f7ba6ae948c48d145d5c05bd4fd0aa027 SHA512 a08a00c80dcd282c929078c7c3afed16a7c30d710294e1621cf2ca1841f01f95872dd92a0bea1f3d7bb8850c05cffcefb68c58a36c9b1eac1960d1d4b04e3224
EBUILD sandbox-2.10-r4.ebuild 2222 BLAKE2B 5f0e178bafb0f28dcf320452c64317d9883afee0a68c09190e3293bd857b5ee816e4656b01b5e1dbb7664802d0e13a05540ab4ba61a04c93788dc1d21cee7c95 SHA512 dca8808e22888f5542a1233604a84b0a5e9952bf6e8792b24a716e477b254fc90ac1efc0cff0eccf832f10026cf56341011e227001c70f0d5eaab36c89b5a23c
EBUILD sandbox-2.12.ebuild 1931 BLAKE2B cd545ca0c7b3b1ca9672e7a0562da03b9eae5dbef36cec7d1eb59d452785ee8f11c03b9a25a9cfe0862a923d5b0f9349c15c6076f9735062cb43505607520b73 SHA512 2a5ec9b1aacfb63d3c4d8f64d067091ab28c7f54ca295a857d14d11d1f4e410c5475cf32d0801cfa1362ce57045da0ef5e1f413a1b56dc541c5efe56d4410d7c
+EBUILD sandbox-2.13.ebuild 1938 BLAKE2B 26db9bc8c8334a4a20bcb09765861f6ed6b6a3da6edd02cc9438943fc18271a9ffa90a26d37e2f648cdd5073a22de71decc21417db1ea331833f11d146f5ce4d SHA512 11cd256384d562de308cd579a04c3742dc436a8e3f4e30cc66d837373c2352b99b23bd4fbfee6fa61b74b7e1eaae95b7ffec1f0fb9785979b783c17f420cdbe7
MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
new file mode 100644
index 000000000000..37b52a70e2e2
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+ >=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+ ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+ ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+multilib_src_configure() {
+ filter-lfs-flags #90228
+
+ local myconf=()
+ host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092
+
+ ECONF_SOURCE="${S}" \
+ econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+ # Default sandbox build will run with --jobs set to # cpus.
+ emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+ doenvd "${FILESDIR}"/09sandbox
+
+ keepdir /var/log/sandbox
+ fowners root:portage /var/log/sandbox
+ fperms 0770 /var/log/sandbox
+
+ dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_preinst() {
+ chown root:portage "${ED}"/var/log/sandbox
+ chmod 0770 "${ED}"/var/log/sandbox
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [[ ${v} == 1.* ]] ; then
+ local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+ if [[ -n ${old} ]] ; then
+ elog "Removing old sandbox libraries for you:"
+ find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
+ fi
+ fi
+ done
+}
+
+pkg_postinst() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [[ ${v} == 1.* ]] ; then
+ chmod 0755 "${EROOT}"/etc/sandbox.d #265376
+ fi
+ done
+}
diff --git a/sys-apps/thunderbolt-software-user-space/Manifest b/sys-apps/thunderbolt-software-user-space/Manifest
new file mode 100644
index 000000000000..653adee5c2ed
--- /dev/null
+++ b/sys-apps/thunderbolt-software-user-space/Manifest
@@ -0,0 +1,5 @@
+DIST thunderbolt-software-user-space-0.9.2.tar.gz 14485 BLAKE2B 8a471888fefbbd7949454b176845b4162b08736d60a86b53f2330e115b776d1ef25b1a706e6fc76661551339525876ddfb621c52301d9327b0c7be0b1abd1f9c SHA512 fbd5902f3f06d3cfec309a972fe5dc32e87eab39668b2c07401bd79ad9af2210f8db41ecdd30cfae34ba24b03dc47df439c2fcd2e74da55d1101237f723b4540
+DIST thunderbolt-software-user-space-0.9.3.tar.gz 22186 BLAKE2B afc614d0d2f7de3c23988e08c0053d24a04be51d22986497e3863b76ad59f1a8a9e2ab323210df27a3fa2f07ab05122666a3c6bfde146250f0854b2dfb6748f8 SHA512 b8bcb31d864376c644f9813abf2d090cc3239271df8a8e71ff7d5e398e993d4d01e94ba5fc1bc13d7dd0fa861b4b918a6df0724ca43f54a5e706ec67f3c7846b
+EBUILD thunderbolt-software-user-space-0.9.2.ebuild 735 BLAKE2B 37f618fe655c62cc0140c7d3e539df741471b28aeba4d97a91dca9e6a26cfdc7f6b5c9f2a1f6055c71d837e07a1861a628923043e5e4aae72c2747e832ae9889 SHA512 74eff6a383a5fcab2415d1a6491d4afa402acb8675cf5f8ee6371296c2aa769a5ecbf030e30398b45c02760a6dcf5ca13dc6d5b7141a5180e67017101f25a334
+EBUILD thunderbolt-software-user-space-0.9.3.ebuild 735 BLAKE2B 37f618fe655c62cc0140c7d3e539df741471b28aeba4d97a91dca9e6a26cfdc7f6b5c9f2a1f6055c71d837e07a1861a628923043e5e4aae72c2747e832ae9889 SHA512 74eff6a383a5fcab2415d1a6491d4afa402acb8675cf5f8ee6371296c2aa769a5ecbf030e30398b45c02760a6dcf5ca13dc6d5b7141a5180e67017101f25a334
+MISC metadata.xml 554 BLAKE2B 0ccaeead65893d20860bfb9e81f00aff2959c23e2e1754ab67342b0c4b027ed255d249f1b03146f98677933dae84982e01fce130b276785471b5a730fe2d2998 SHA512 70ddc8c30381a7a2288f1aff50eb932ef418bb72ac0f7b60e15b4846133ddff8b3de77bff9e4bb40a336f5077c1bc1dca9c574eb5fa3a53c0f3f083511b185d2
diff --git a/sys-apps/thunderbolt-software-user-space/metadata.xml b/sys-apps/thunderbolt-software-user-space/metadata.xml
new file mode 100644
index 000000000000..8fb8d2b55b7d
--- /dev/null
+++ b/sys-apps/thunderbolt-software-user-space/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Jonas Licht</name>
+ <email>jonas.licht@gmail.com</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ Installs the tools tbtacl and tbtadm for Thunderbolt device approval, handling the ACL and more.
+ Also install udev rules to mange acls.
+ </longdescription>
+</pkgmetadata>
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.2.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.2.ebuild
new file mode 100644
index 000000000000..98f4f364ebe1
--- /dev/null
+++ b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils linux-info
+DESCRIPTION="Thunderbolt(TM) user-space components"
+HOMEPAGE="https://github.com/intel/thunderbolt-software-user-space"
+SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+app-text/txt2tags
+dev-libs/boost
+"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+ CONFIG_CHECK="THUNDERBOLT"
+ ERROR_THUNDERBOLT="This program talks to the thunderbolt kernel driver, so please enable it."
+ CONFIG_CHECK="HOTPLUG_PCI"
+ ERROR_HOTPLUG_PCI="Thunderpolt needs pci hotplug support, so please enable it."
+ check_extra_config
+}
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild
new file mode 100644
index 000000000000..98f4f364ebe1
--- /dev/null
+++ b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils linux-info
+DESCRIPTION="Thunderbolt(TM) user-space components"
+HOMEPAGE="https://github.com/intel/thunderbolt-software-user-space"
+SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+app-text/txt2tags
+dev-libs/boost
+"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+ CONFIG_CHECK="THUNDERBOLT"
+ ERROR_THUNDERBOLT="This program talks to the thunderbolt kernel driver, so please enable it."
+ CONFIG_CHECK="HOTPLUG_PCI"
+ ERROR_HOTPLUG_PCI="Thunderpolt needs pci hotplug support, so please enable it."
+ check_extra_config
+}
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index e57c2539a758..49b27aa34761 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -17,5 +17,5 @@ DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2f
DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
EBUILD ucspi-tcp-0.88-r17.ebuild 2467 BLAKE2B 6c7e824f9b04f39482eeb87f0bc8dc8b3a92eae7366647b3c06912ca945041fbd963eee67cef8dd9d5aa4fb9d50dde7659e2b0f2dce59ad2040ea259e9d0ef3e SHA512 5691a29591259022e80a6cfbaba6d4755846223b14bce64c7df0e0e7ef08c57877f612b6e2b19da7d90a0c4dc8b3d8d5c8885a1b21eac19bd48bf527739e10d3
-EBUILD ucspi-tcp-0.88-r18.ebuild 2115 BLAKE2B 4c7555834596e83e67cf3770804fea99fac3ada917e27845b5a20cf37089adf3013a74c4b7fef3121612b4809b5bd6840b591383163b90ceebb3b3130df6e761 SHA512 80df49862fb804dc5d050a9e3a87d7dbd908434e40e9f735001f56cee6721c5139e04b7e4a6da58101add93f507aa7a71cede854cabf4e77d3b297efdbce3ac8
+EBUILD ucspi-tcp-0.88-r18.ebuild 2114 BLAKE2B a57f1fce510131c906cf3349275fe08f5230262cace263932a34d4563a09501ce2d4a3b56d0799f5cbbb1e9960ecd1bbd037d90233491ec3be2532b952cfe195 SHA512 388402ac35725124c38e44dca5815e47a6d1840b7a8fabfe6540b6e959d0cec8242a087566bc661e68d64a054740c5e20f6cabdf09bdb31a117776c8607cb242
MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index 1f6e89fce9fa..a8ec3490e549 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="ipv6 qmail-spp selinux"
RESTRICT="test"