summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-12-09 09:14:02 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-12-09 09:14:02 +0000
commitb9ef7cab6264f1838672efbbcb4ba3b3abd5323f (patch)
tree38e677f4a13244ca8ed29a815a0a62f943b430d4 /sys-apps
parentd37b97a25b8b10f748eead6574b01f893f140b01 (diff)
gentoo resync : 09.12.2017
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin48567 -> 48561 bytes
-rw-r--r--sys-apps/apparmor/Manifest6
-rw-r--r--sys-apps/apparmor/apparmor-2.11.1-r2.ebuild64
-rw-r--r--sys-apps/apparmor/files/apparmor.service14
-rwxr-xr-xsys-apps/apparmor/files/apparmor_load.sh2
-rwxr-xr-xsys-apps/apparmor/files/apparmor_unload.sh2
-rw-r--r--sys-apps/inxi/Manifest14
-rw-r--r--sys-apps/inxi/inxi-2.3.34_p20170805.ebuild29
-rw-r--r--sys-apps/inxi/inxi-2.3.36_p20170816.ebuild29
-rw-r--r--sys-apps/inxi/inxi-2.3.37.ebuild3
-rw-r--r--sys-apps/inxi/inxi-2.3.43.ebuild3
-rw-r--r--sys-apps/inxi/inxi-2.3.47.ebuild3
-rw-r--r--sys-apps/inxi/inxi-2.3.50.ebuild3
-rw-r--r--sys-apps/inxi/inxi-2.3.8_p20170114.ebuild27
-rw-r--r--sys-apps/iproute2/Manifest2
-rw-r--r--sys-apps/iproute2/iproute2-4.14.1-r1.ebuild2
-rw-r--r--sys-apps/miscfiles/Manifest2
-rw-r--r--sys-apps/miscfiles/miscfiles-1.5-r3.ebuild2
-rw-r--r--sys-apps/openrc/Manifest2
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild4
-rw-r--r--sys-apps/portage/Manifest2
-rw-r--r--sys-apps/portage/portage-2.3.17.ebuild258
-rw-r--r--sys-apps/systemd/Manifest3
-rw-r--r--sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch43
-rw-r--r--sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch92
-rw-r--r--sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch29
-rw-r--r--sys-apps/watchdog/Manifest2
-rw-r--r--sys-apps/watchdog/watchdog-5.15.ebuild2
28 files changed, 365 insertions, 279 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b71120931019..b77d78a7c71e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 624af11ea071..25960032b7df 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,6 +1,10 @@
AUX apparmor-2.10-makefile.patch 859 BLAKE2B 22f1e73b4862007ad35cbd45a3904e7e73d5757087ae11c0a7b88fe52e02316d44632c0525d8a18952cfba0dd1b9aae8b1a402cd1745fd51f01ca08c91dd4308 SHA512 dee07ecd82d1336692c9621688dc5bad3d17787544ff05e7a6f2d20f396071a33a093bdcc5d987f91df14af34bc8cdf3362cf38d0ce5e804afe76511d9da5eee
AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c
AUX apparmor-init 1284 BLAKE2B 3329dadd3343ddbd9276b0a22a401d1cac6bea94abbd5bad897d9b9760742c1cc30dab5136d9a90e9f3068b6879d95d70376f5dec5fe1d13313dffc89a631fbb SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148
-DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
+AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
+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
+EBUILD apparmor-2.11.1-r2.ebuild 1452 BLAKE2B cbbcaff926533ddd29205d17ae0a5f11af9398dfd61d239170f84acdefd10fd1de2636900212a723324a1464d540254b6fbbd22db6aa4e58128695345d12419d SHA512 dd22fa3615a26b9726c0e871878e4010d1dd1232ec1b25c8cdf5ee074277a0b8d783224a9c395cd889efc9b914b50af6f390ef22e616d5a4a28509db20e90265
MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
new file mode 100644
index 000000000000..1d78904b5777
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ sys-devel/bison
+ sys-devel/flex
+ doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.10-makefile.patch"
+ "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+ default
+
+ # remove warning about missing file that controls features
+ # we don't currently support
+ sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
+ use doc && emake pdf
+}
+
+src_test() {
+ emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+ emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
+
+ dodir /etc/apparmor.d/disable
+
+ 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/apparmor/files/apparmor.service b/sys-apps/apparmor/files/apparmor.service
new file mode 100644
index 000000000000..89f14fed4b77
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=AppArmor profiles
+DefaultDependencies=no
+After=local-fs.target
+Before=sysinit.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/share/apparmor/apparmor_load.sh
+ExecStop=/usr/share/apparmor/apparmor_unload.sh
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-apps/apparmor/files/apparmor_load.sh b/sys-apps/apparmor/files/apparmor_load.sh
new file mode 100755
index 000000000000..e6fe6b684317
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor_load.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -r {} +
diff --git a/sys-apps/apparmor/files/apparmor_unload.sh b/sys-apps/apparmor/files/apparmor_unload.sh
new file mode 100755
index 000000000000..19e598bb84c4
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor_unload.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -R {} \;
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 2f964097150c..bddd7c4b8d7e 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,15 +1,9 @@
-DIST inxi-2.3.34_p20170805.tar.gz 449836 SHA256 c051cea0f6f1113406e3b2a776c841649d4c8cfbbdaf4a568a25bbb497447e44 SHA512 c3b2a5d91a0fa0840ad602e6a147bc65dec83c966c8fc2a72e39fe6737ef4e0d57edcb5e47602311a8eedd2fb6d51619f4e44ad2be4ce8b5e259049e2c238a18 WHIRLPOOL 211d0ed25c061e7cacd09a6750dde8c0ca03999cf33ee35c4423bd892e5e363564307f4ce61a40948706da3a4e2b232a53e379a5c78ba62b891b0f45b895c98d
-DIST inxi-2.3.36_p20170816.tar.gz 452116 SHA256 d5648d2b6a32da364bf5d9f9eb3b275a1512a2143f13433caace97b6b42e1fde SHA512 9326fd8787449c6b52fad3188086a59deb2614100ccf8c49023c78d21ff4ab08a434ba1b95bc48f8867499e30179df602ff53934611bbe952b223c8bdadc40bf WHIRLPOOL 85952282335221856aeb6f2b844df89fc0c7a852a2676aad333bd13a42d48ef1bf06da1a3309bb93355221b0e976679ab8b5076da6cae9d57ce6009c1af05a00
DIST inxi-2.3.37.tar.gz 454862 SHA256 5c728fefbe33800ab7ce8d5536f52fbb0aff560f48ba525f148fc48e034fe1c1 SHA512 0a47cd920e80c518d6d6987945eb9526ee1ce7f6bf62754196e05736db44fbced615d29b6e12787bf55f769ed9963dff0088c96f9dbe13dae7f57744b0172802 WHIRLPOOL e4271b8d6493e4d48ad15fc8d5d4bb86fd3251bb1fc8b2292c2f538076f29b53aef156f97233bbbb0a9acae52fa987672797832fe33f29fd6a8b40b154608de5
DIST inxi-2.3.43.tar.gz 457941 BLAKE2B cbcdb3061643ba3516c93dc13e5e0e25d0740e4aa39519643467b03913a10e4ad1eed9cd52f62e7dd344b70f41124f248e48e7d1abacd55dbcb1401b07b1a88b SHA512 33c9ae788ab139f5a2511a3b5bd51276dafb3b847920345b02ad717e1da71f9a78fffc9e55b1085c91d014c2da940b1c64f72db9b59f7bb8d7e442bbbc0bd947
DIST inxi-2.3.47.tar.gz 462826 BLAKE2B c825b80b5b05fabfad22cbcee685d5c5caa7835493555f1e930dfc11aac35fbe7529fa4738d41dfaae4c6130211d42f576d77ba9f764864bfe89b70a4c0d602a SHA512 be2e0f1880e1b7604acd1f7b8f6595536e12fbe0998f85a195e0892bf1b9942c08f791779f99526a337d097259ea8d3cd0b04da465f8deb1b30bbba9fea4dc4e
DIST inxi-2.3.50.tar.gz 467912 BLAKE2B e4d42fbcf073c5815451848d55ad24b782a0851d7701ca87f88ec97467a7968577d6ebe3818cd2b5a59017fecc11baa686d23ffaf0f18ab086bdba0393a07fba SHA512 5f32abb56f8466b5c166616680bc7b6ab5d38b76720ecf3d7d065c5ae08de0bdcf14c31b9ab207adaa7c46f4f292c9971022f27aabe5aa14bb3e828a01bff97c
-DIST inxi-2.3.8_p20170114.tar.gz 422139 SHA256 ecad1522c786555c7b11d3066878f94fc276b205fb63faad06c9ff6f708bf558 SHA512 400d6cceb9282f46f1de30d436f334813d725867e0614a0ef694dc33066139dd7daf4730c007186b7037705f5debb72fa0ad9357619cdbc93152b4d585ba17e6 WHIRLPOOL 0734dc38929c404c2ef08017606558aa55ccdc8c290adec8640db30e800d0ba4b1c8c89d3f9c221b5ea6e02f1f0ca8c429326fe8bec57e5c7a75999c95b24a23
-EBUILD inxi-2.3.34_p20170805.ebuild 691 BLAKE2B 48554f6550e8b9f9340a46a43cfa452f110519069ad9af2e90665347d69d37c38fb12ff4ead02848acfb81fc76f3a5da864fb2e30c807bcbc3bde19df8e3d230 SHA512 24467d736e6b750f18c78f8d9a1e384f6e5fe1fb5bd04f28de4ee18f11e1f9c4f5581ba1355b820bb0de3def71808ca274a4f2708ab2256f4e147dc005f97201
-EBUILD inxi-2.3.36_p20170816.ebuild 691 BLAKE2B 5ef28039394b0f3f0b2cafa2ce4324391c03d57e6fa192d1eabc84b48bd3162f805194093de3bf3bea27bec6d8154e8f6df68e5c28040961bfa3808897bed32a SHA512 6924100f657e0968d49eb5576cab42719124608c7ac65ed6d58db7573b00c1dfdd0932e988cfe3b97ce129acbd1b3703042740c01c379c10e2ced7916c57625f
-EBUILD inxi-2.3.37.ebuild 705 BLAKE2B f53bbbf496fd6e1702028385970404841e5b49283b67cb34e2ae8dcd4aca366613d2bbf96283930f0482edde236c9f0e207eb766f8d991ee25869c20bd99fbd0 SHA512 a8f83bfea602259ed133fce417d78a92670e8df7a5522445a9abad078b12432b5cf66e95ba44d96b9a43299d40b8e0a5f4feb5d01a11f2347da397b42db73074
-EBUILD inxi-2.3.43.ebuild 824 BLAKE2B c6fc9169680cf86dff1fea552ce4e082f52a743e2d699609f82bcfbf7d2d7c9fd062e0c215bf047e3b96841fb58250387c3d0fbcff3ca7c74c30ced0900092b6 SHA512 6c10b5de4e364dd85779bad53ad36d6e66099698c37c9925173eb18ee9e139f40943450d736728338f64026c9f40fd43f1fffc24ad3035be113c2bce35216ec0
-EBUILD inxi-2.3.47.ebuild 824 BLAKE2B dcd686fa4205bd0e5c5ce7d57a671641892f58cb8240dee23ce5b918f8173807d297b9ed283d8a105f1a28ad7fe5d52e336e1346f26a4c34187b6e620e212034 SHA512 3cbb08d323ea10bf00ff1d9d871e783b4bb54507fd028329e6ee6cbff6dec04e658e9897c83b475bf9ef314ca5ae1b0f49fb373b448d2d50ffc338802edd0d29
-EBUILD inxi-2.3.50.ebuild 824 BLAKE2B 47f4e62d6f6ab7eecc5d0229ea8d54e61122d00ddb4b8f4a482d94f9c6087be34cfef990c9f60f427f42efc68a0a78a5b0427f8a6bf1c3f98e9a1a8865c35a2d SHA512 1646e901347c98e567710b8b19001b10de86339e7502d374b8570f8d4ce56b672295474500dca58b468371fe26d377499c620b8b0c8204f52f0d31739a773fcb
-EBUILD inxi-2.3.8_p20170114.ebuild 686 BLAKE2B 515e13ec231066a8380a6cb7c4c41eb7fd3fcd8cd4447f1431f4659f7a6220b7a1d65af3e363b599e0489a692d94011fd316d82de641642c21305abe6eb5aec9 SHA512 8504fbaba115a62659a722c40af8a7481f21c57cb081e0d7e9e7fd62733cee68ab5eb9fd71681f8588a8adcc732db5e74053ecd428716bdf068cc37c83d23008
+EBUILD inxi-2.3.37.ebuild 682 BLAKE2B 04680e7cfe7484c592f47222753684436ee0e15bc8cdcdba1886e11cf25fa39c9b38d6faad71558856554793c29e83a78edb9ea7b6291801d3d59b4a7c8e41dd SHA512 8eb8387e4530484bd717b0449ecba493b0551328789afa5b742b9eec6c67d96fa1a5600385e32bf7521f2e4e9f279bcdafbcfb03e2efa3aae7659e287f9d6044
+EBUILD inxi-2.3.43.ebuild 801 BLAKE2B 5d96bf7434461c805136f71af2f8cbe29455aea670309ef8502a2fda215d2a682532d1bddbcdc720abea7b11e32abb1b6352476dc388dedc0f9ce951dcf4d993 SHA512 d7b716fabac1c5ca6e00fb3baa49c5563a7eade4dd06bd15f87016d41c93caf19903e342bc96284a16d48cf5fb0301e39f65818a9bfaf4b90024ccc8a9720cf3
+EBUILD inxi-2.3.47.ebuild 801 BLAKE2B c4ad47cdced83771be89576fbe0f67f0696335db10111390987c8f690d75027e2bec0ad560b0dea0c88ea0cc4ec142c5ea24aff658597337c4c50cfca4d522aa SHA512 610b8fad3e0c45416edf0b0e313461b7beefcfd8321624209995fec0af9c29c68b0816853931dc665cc7db33d18fe7fec01830bd8d79ad1bd04b074564a5342a
+EBUILD inxi-2.3.50.ebuild 801 BLAKE2B 76fb610a56e89e59f823f63459c8b25f1b1de1e94d20f348b005d3c2100157cb1ee3f952c81facc762950fc9af14dac3cf1da09a944bcd0180cdb3a6a2b5c1cf SHA512 00fb80778b5510756ac782f17c81e57efb6f8aeb35cf30c8cd460b69993a7664795a22ea83954a8fc4775455d10e240878c0896c861f67315198f8ad67b2e616
MISC metadata.xml 444 BLAKE2B 0b67e0f6a42d8b68edcb1fc907729e80cee8ccb0a77fbf768cb40f62e1d665852bf17897466f76b578e2c4225dd5180ccecce899588be420064c5af4b89e99c8 SHA512 f44e29945d98ff44784623624a9c891942c0b69b6272322bd4665a5d49684cc16ee9b01b7a6f60872286a0a96aa437f7b9605aa6820435016e84d92fc96d6fd0
diff --git a/sys-apps/inxi/inxi-2.3.34_p20170805.ebuild b/sys-apps/inxi/inxi-2.3.34_p20170805.ebuild
deleted file mode 100644
index db859ca7b4ba..000000000000
--- a/sys-apps/inxi/inxi-2.3.34_p20170805.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_COMMIT=404b7793b5fc8c7130ed822d8830f74cc6400c6b
-# ^^ because upstream refuses to tag commits with version numbers
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-shells/bash-3.0
- sys-apps/pciutils
- sys-apps/usbutils
- "
-S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
-
-src_install() {
- dobin "${PN}"
- unpack "./${PN}.1.gz"
- doman "${PN}.1"
-}
diff --git a/sys-apps/inxi/inxi-2.3.36_p20170816.ebuild b/sys-apps/inxi/inxi-2.3.36_p20170816.ebuild
deleted file mode 100644
index 97aa523701e2..000000000000
--- a/sys-apps/inxi/inxi-2.3.36_p20170816.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_COMMIT=ce66fee6b7a1913cf89bbc60a024f0649b32c50e
-# ^^ because upstream refuses to tag commits with version numbers
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-shells/bash-3.0
- sys-apps/pciutils
- sys-apps/usbutils
- "
-S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
-
-src_install() {
- dobin "${PN}"
- unpack "./${PN}.1.gz"
- doman "${PN}.1"
-}
diff --git a/sys-apps/inxi/inxi-2.3.37.ebuild b/sys-apps/inxi/inxi-2.3.37.ebuild
index f6d5405ae998..dd00c31e2e57 100644
--- a/sys-apps/inxi/inxi-2.3.37.ebuild
+++ b/sys-apps/inxi/inxi-2.3.37.ebuild
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND=""
-RDEPEND=">=app-shells/bash-3.0
- sys-apps/pciutils
+RDEPEND="sys-apps/pciutils
sys-apps/usbutils
"
S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
diff --git a/sys-apps/inxi/inxi-2.3.43.ebuild b/sys-apps/inxi/inxi-2.3.43.ebuild
index d970013c44ce..c9a896d0871a 100644
--- a/sys-apps/inxi/inxi-2.3.43.ebuild
+++ b/sys-apps/inxi/inxi-2.3.43.ebuild
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="bluetooth hddtemp opengl"
DEPEND=""
-RDEPEND=">=app-shells/bash-3.0
- sys-apps/pciutils
+RDEPEND="sys-apps/pciutils
sys-apps/usbutils
bluetooth? ( net-wireless/bluez )
hddtemp? ( app-admin/hddtemp )
diff --git a/sys-apps/inxi/inxi-2.3.47.ebuild b/sys-apps/inxi/inxi-2.3.47.ebuild
index 948a5917d27a..e5a4735c5773 100644
--- a/sys-apps/inxi/inxi-2.3.47.ebuild
+++ b/sys-apps/inxi/inxi-2.3.47.ebuild
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="bluetooth hddtemp opengl"
DEPEND=""
-RDEPEND=">=app-shells/bash-3.0
- sys-apps/pciutils
+RDEPEND="sys-apps/pciutils
sys-apps/usbutils
bluetooth? ( net-wireless/bluez )
hddtemp? ( app-admin/hddtemp )
diff --git a/sys-apps/inxi/inxi-2.3.50.ebuild b/sys-apps/inxi/inxi-2.3.50.ebuild
index fbc8adc35425..8e0f7a70cfb8 100644
--- a/sys-apps/inxi/inxi-2.3.50.ebuild
+++ b/sys-apps/inxi/inxi-2.3.50.ebuild
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="bluetooth hddtemp opengl"
DEPEND=""
-RDEPEND=">=app-shells/bash-3.0
- sys-apps/pciutils
+RDEPEND="sys-apps/pciutils
sys-apps/usbutils
bluetooth? ( net-wireless/bluez )
hddtemp? ( app-admin/hddtemp )
diff --git a/sys-apps/inxi/inxi-2.3.8_p20170114.ebuild b/sys-apps/inxi/inxi-2.3.8_p20170114.ebuild
deleted file mode 100644
index 55d7955e7d3b..000000000000
--- a/sys-apps/inxi/inxi-2.3.8_p20170114.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_COMMIT=af0630e3067c138893e243896e1767c93d2a2856 #because upstream refuses to tag commits with version numbers
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=">=app-shells/bash-3.0
- sys-apps/pciutils
- sys-apps/usbutils
- "
-S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
-
-src_install() {
- dobin "${PN}"
- unpack "./${PN}.1.gz"
- doman "${PN}.1"
-}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index d8306df2fdf6..87c93cd21d57 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -20,7 +20,7 @@ EBUILD iproute2-4.11.0.ebuild 3986 BLAKE2B 0103b40fa4c1104421e3fac2d002cb8422498
EBUILD iproute2-4.12.0.ebuild 4212 BLAKE2B 8b40329be710f3d8461429dd94a5a4d4d29cff3b2bdec2a69870e4b24db9726f81885dac49e9afe3aecbca99d9039077a5553e87f5558c91cfb08ed903adfaca SHA512 d66105200c18892f642ab4c43fe3d72ab8cbfd7b1c212eb2b6d04b2e16f8389a1b5244abed85fbbefe4da90bf2604c57f6a0e13601b268b04609cf31c73da897
EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01fe5368d169d380778a5d514bd39784968073bcfaf2a2a7abaaf14c0fe85ec46f5374b204b46be887f750c823d62 SHA512 9e3d7ac9347a9e92ece5f6d737b688bd76136600264c888e449e0738c53a58de45a3459b1bd94f150bf2147f5232a8fefe571985bc2227f0d29322f8657d1039
EBUILD iproute2-4.14.0.ebuild 4150 BLAKE2B 2c218117921dbae1ac920bd3eaede84faf2e6983fdc26c158b4e8405ee0cc9620eb1fdba31aeae169a813e080edbba57fae958bd9429fd0e804a8245cdcfe195 SHA512 1a1c39f742febf5b064bd471e0ea3ed018f81018895833962e110c60d00b3f85351dbb9db5557ad43b3f1988dff0e5bbad69d307ccc6fe1ea637a24e171dc690
-EBUILD iproute2-4.14.1-r1.ebuild 3928 BLAKE2B 62ebf9cb809f16249dc923faa766c4ee5e907ae12f056184fb6e125a681ce20a644f6d59a2c3d0391fc2eae8c1e5da0de5bf36ba140994ad569297f0659400dd SHA512 1ea1ae406f9c86e119abcba8e4d0109643dea7c26c710531710234dd36babd862b5d6db9c4cb47fabebca5d3683bacc9e68f3fd40b37b45968965130a6084c59
+EBUILD iproute2-4.14.1-r1.ebuild 3927 BLAKE2B 354f64cac9e23521bd927734647eba6cb7cca80d82f05e6484d3c455b70c72ba248174e3dbd05e0010534909e35e546b29ca3d29c4ce75944794c9b75adae964 SHA512 6962ae316c88925a233f830c7737db9a20baf49cb360fa2864b2da04a05b795915838c69a24f5ace91097a44be2127f80bd6b64084ba9b9ac9f0931471d6788f
EBUILD iproute2-4.14.1.ebuild 3928 BLAKE2B 62ebf9cb809f16249dc923faa766c4ee5e907ae12f056184fb6e125a681ce20a644f6d59a2c3d0391fc2eae8c1e5da0de5bf36ba140994ad569297f0659400dd SHA512 1ea1ae406f9c86e119abcba8e4d0109643dea7c26c710531710234dd36babd862b5d6db9c4cb47fabebca5d3683bacc9e68f3fd40b37b45968965130a6084c59
EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a
EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
index b5e65df66954..e0476f1e13ac 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- 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"
fi
DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 8f3a4e6ef6f9..f43f1817b3fb 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -3,5 +3,5 @@ DIST UnicodeData-6.1.0.txt.xz 129972 BLAKE2B 52836b9db627cbc8608a148eb179f982679
DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
EBUILD miscfiles-1.5-r1.ebuild 1683 BLAKE2B 72bbc5e04b22a712ad54a9d8015ea679d805924684250ad253b7a5e457599afe9804b1e963ea50e70336eda9ef7c035afdc7c538f6b2f896656e579c37cdb24f SHA512 f3d4498d846974f4a7afb0fc09ac4755ccaa0c4dcba7f5ff7184942ebd0b45c786a58525e12d0c8d3b38890c263511432f78f699ac7768a398abfa8eb6e6bf95
EBUILD miscfiles-1.5-r2.ebuild 1847 BLAKE2B f6671e00682d3d4f37d95e14805df13f0bdba76ae062c3aa8bc9c44c1095cd08c1b7605396820d778750b8a109e9fc26f2d843e988abac0a0615af546b649e2a SHA512 a5bd1e9d5df82ad02d567a2b73e8ba71bffc73c8ab1406222f19ecdc09bb81c9aadf906fae02af4b749a095dc62e1fa515d8754873c6fe03bd46f8057794324b
-EBUILD miscfiles-1.5-r3.ebuild 1865 BLAKE2B f4c9d8c74793ef3e448acd1a5cf3d1800de138d0aa115bd2a27f3d30e878076d1812ff829c4bd714a185224c54f4da0a786a616a20d8af846a842fd46563028f SHA512 d673f88640a7de6f46924e266cee80c6f77352f47698e431d3b35d6acc9dc7dba82b5dedb46848c06e2894bfe3a088f38ae991ee6150ea5bf2ddb5f3509a9343
+EBUILD miscfiles-1.5-r3.ebuild 1864 BLAKE2B 480a7fa1fd17449bdcf163f0f5561048312b81b9ba65253655d903d5bfad8d5ffbedc7dae5da247f8f4392dbd5b329ed67a776d7ec5a0db31eee9c3696062195 SHA512 7e2e7192a6a186c7d5d94bd085f2446f19bcfdac41404c4a780e932e0600bb2035454326bc3b23cafe075f5cbe6c42ad2ce58d389e1ea547bd56f1f619adfab5
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 44eadfa514ae..2891fbf74c5d 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
LICENSE="GPL-2 unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="minimal"
# Collides with older versions/revisions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 1cbe01d6c937..48bfd8dacc91 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -8,5 +8,5 @@ DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582d
EBUILD openrc-0.28.ebuild 10123 BLAKE2B 93866eee80dc86f95a4e1f2a506832048720a01608c020108bc20a54936b857b1e5e5c1f88625c01afa482247677977c33c478ef3ef38519693b01e4d09694bc SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72
EBUILD openrc-0.32.1.ebuild 10162 BLAKE2B 2948ad5e2f905ccd933861ce20c1ccf8dae1a51e3f11086015f250d217c76f70cc87d99ecd8fdfc1f525984f2337841dd0d3eb83fa5ff8c9369fa8f8f476b65c SHA512 8fbf8406cb499dfac756ba1c7eb040e61eeefc61d6d294967864651e10edb862d16fc81f81e4d012c7df248c651305866c3656f39d9c5ccc3d884c5bc3e77eb0
EBUILD openrc-0.34.11.ebuild 10161 BLAKE2B 895d4e56da8a20a9a47afc70bcc20f44f58f52285a40356963d1aa525a72b0880fb0df187baddf83225616fd8a7b959c544902bc5ed77014ab4544dbdc5f3905 SHA512 652b360934fa650132701931fa4ef34a8c218ac60cd893cbb720fb19af1a9fb2e00ef4ad4b7b34f56cbecfc6f1d9ee018e67a1c5a4c2d4ff657a55a9e7fdf96a
-EBUILD openrc-9999.ebuild 10243 BLAKE2B 14d2f409fab19411360529f0b9929259e8a651daedf65f5af8713a5dc52081080359a7a58a602d1ed75948e9128db35617a10298f71ee570a560bfbb0a744588 SHA512 431569ab87297a5e6fb567822fa1e5d870408d185328e7b79bd841610c5418fc4b8f2e7b46b76601c86909d9c6853df34283feac16e87eafc7bab39bb7807805
+EBUILD openrc-9999.ebuild 10276 BLAKE2B 40b25d0b8dd57aed46814ad381caa3df4a6b56f3f66c5271943eafd83d44f536d8fd654fa91efe00ce20a51c01f40c871cf0c94ceda41b81ddc89bf301dfd88e SHA512 370126a545dec34a34366badcd11ead8588c58f2e8414c85afb80c3544c94610caa7fb258118a7d2b2b4b289d8c67cd3d7119fd2ff4410613a1a1942be984506
MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 4e854c493561..52c13e050884 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -74,11 +74,13 @@ src_compile() {
MAKE_ARGS="${MAKE_ARGS}
LIBNAME=$(get_libdir)
LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+ MKBASHCOMP=yes
MKNET=$(usex newnet)
MKSELINUX=$(usex selinux)
MKAUDIT=$(usex audit)
MKPAM=$(usev pam)
- MKSTATICLIBS=$(usex static-libs)"
+ MKSTATICLIBS=$(usex static-libs)
+ MKZSHCOMP=yes"
local brand="Unknown"
if use kernel_linux ; then
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d239be2b3e96..aac7ca475649 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,12 +2,14 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f57ad97029d7bb3d9ac89fd0ee939fb3a2aaa624a0f40959820903d70e6c209518d97df6b82501325963c963db9df SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732
DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
+DIST portage-2.3.17.tar.bz2 953854 BLAKE2B 8b4367d647d29550fb50c807013a896eceac5ca137ea8d85157c32b7a99b6af7f39b60173ad40df7606d4c213025d8fbd617e9b6f3bf6f580c09cd07d4ce6d37 SHA512 9864ceae200b2137c695cd5af856a277971ab3bb0bedafcb1ed59aa4f647f3a412bf22bf0f4067f87716a4296f76d4a602bb4e7714ba1c89213720e34d11e152
DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
EBUILD portage-2.3.13-r1.ebuild 8518 BLAKE2B ab9fbf21b666eb2c8fb4e2e0e9defc9f4ec19c339d7587fed01ed94421609e7b75648fc59e037ecca933468023ae33c16d05f2c3d100b28bc47ea55e7d88c00d SHA512 44faaa868a4c4832ed596d9601e958f0af21a60a8be1e5a59e1d4b15fbeb6c3d39e1943f0c01f9c99960c00c9ad34a3ac5b91ff8b6824ad9eca821168ba97bb5
EBUILD portage-2.3.13.ebuild 8220 BLAKE2B 1c71ce90b2d0d0ff9ecdbc842e9178cc5ba3e3016c3d00243f6dfa43772ce8fe6719965bc7f6f968a24ebd267442f3697b698dc5e8e947aca85f611cba33a12f SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01
EBUILD portage-2.3.14.ebuild 8523 BLAKE2B eed0ce93cc3d1401817cbcc14c12bf76157dda41294958ab2d72ae72187f62d220e3cdde93b40d3f6c7b80e65f564bfb062b2a37230c8200d855b4e585165b80 SHA512 439a5e2521e74d4a5b73e91f9e3f0ae29b3eaa01c6bb3e2f3420f2ee838b6fbb60438e785c30e9806fb7cd65d7dbcf6062d1b3f61a4792c01326ab874dbacdfe
EBUILD portage-2.3.16.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65
+EBUILD portage-2.3.17.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65
EBUILD portage-2.3.6.ebuild 8661 BLAKE2B 79789262c8d2cfea53c24291ee9b1d638bee592c2eb6435b22f6996be43bd5e0bf76df39df74163b98297d6ecd11c24fe4b8ee0cbd84b7a62196c0b9de4ef8d6 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4
EBUILD portage-2.3.8.ebuild 8211 BLAKE2B d615c9a0ae6df8f649f6ccdaecd6a404f9196cc62008b3bc38801c8e355b82b0288c00e4c52e481961fa6f568c0cfd4425a4ec7e313d08f9be143623ea2cfbaf SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a
EBUILD portage-9999.ebuild 7898 BLAKE2B 3eb2b5417170a7309bb0a56085ab1caf807a7245d02cd3f1f2f1e8dc2a75dee0204538daac9b364d1604da89abef5e55093af6759ef62136f2829a928fec180e SHA512 07c97f2f8b2fdbc4e1494fa517c88eb9fbdfd3429b3e21e4087be9ae4e6cf3ce401cd7def881d32cb9f5e9f8e25515e776c866f050c0181f9ef7e2cbf4affeef
diff --git a/sys-apps/portage/portage-2.3.17.ebuild b/sys-apps/portage/portage-2.3.17.ebuild
new file mode 100644
index 000000000000..b4f03d91d2de
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.17.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_4 python3_5 python3_6
+ python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/sed-4.0.5 sys-devel/patch
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+ python{2_7,3_4,3_5} pypy)
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_musl? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+ xattr? ( kernel_linux? (
+ >=sys-apps/install-xattr-0.3
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python2_7 pypy)
+ ) )
+ !<app-admin/logrotate-3.8.0"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if use native-extensions; then
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \
+ setup.cfg || die
+ fi
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i pym/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+ -i pym/portage/const.py || \
+ die "Failed to patch portage.const.EPREFIX"
+
+ einfo "Prefixing shebangs ..."
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+ die "sed failed"
+ fi
+ done < <(find . -type f -print0)
+
+ einfo "Adjusting make.globals ..."
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+ -i cnf/make.globals || die "sed failed"
+
+ einfo "Adjusting repos.conf ..."
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -i cnf/repos.conf || die "sed failed"
+ if use prefix-guest ; then
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+ -i cnf/repos.conf || die "sed failed"
+ fi
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ cd "${S}/cnf" || die
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ fi
+}
+
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use epydoc && targets+=( epydoc )
+
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=(
+ install_docbook
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+ use epydoc && targets+=(
+ install_epydoc
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+
+ # Due to distutils/python-exec limitations
+ # these must be installed to /usr/bin.
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ einfo "Moving admin scripts to the correct directory"
+ dodir /usr/sbin
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+ done
+}
+
+pkg_preinst() {
+ # comment out sanity test until it is fixed to work
+ # with the new PORTAGE_PYM_PATH
+ #if [[ $ROOT == / ]] ; then
+ ## Run some minimal tests as a sanity check.
+ #local test_runner=$(find "${ED}" -name runTests)
+ #if [[ -n $test_runner && -x $test_runner ]] ; then
+ #einfo "Running preinst sanity tests..."
+ #"$test_runner" || die "preinst sanity tests failed"
+ #fi
+ #fi
+
+ # elog dir must exist to avoid logrotate error for bug #415911.
+ # This code runs in preinst in order to bypass the mapping of
+ # portage:portage to root:root which happens after src_install.
+ keepdir /var/log/portage/elog
+ # This is allowed to fail if the user/group are invalid for prefix users.
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+ fi
+
+ if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+ has_version "<${CATEGORY}/${PN}-2.3.3"; then
+ SYNC_DEPTH_UPGRADE=true
+ else
+ SYNC_DEPTH_UPGRADE=false
+ fi
+}
+
+pkg_postinst() {
+ if ${SYNC_DEPTH_UPGRADE}; then
+ ewarn "Please note that this release no longer respects sync-depth for"
+ ewarn "git repositories. There have been too many problems and"
+ ewarn "performance issues. See bugs 552814, 559008"
+ fi
+ einfo ""
+ einfo "This release of portage NO LONGER contains the repoman code base."
+ einfo "Repoman has its own ebuild and release package."
+ einfo "For repoman functionality please emerge app-portage/repoman"
+ einfo "Please report any bugs you may encounter."
+ einfo ""
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index affba23a763a..113b2717ca1b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,9 +6,6 @@ AUX 233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch 16209 BL
AUX 233-CVE-2017-9445.patch 5491 BLAKE2B 9c0e252dbbc273481fde939ef90be1d61046a8c4ae9c288d9aca0167322d669750c7545f572386ddefe2b666ecc26e79fe9f143109946a0be9e0eb6fd002f280 SHA512 16308657911dc3f85520d6de0ee85f04afed1a7940a8a23ece641af2b3766e44e88d8de21cb53afd4db7b8ad8324eeed2860009f3fcc05a227f0c6faafbf351f
AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc
AUX 233-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
-AUX 234-0002-cryptsetup-fix-infinite-timeout-6486.patch 1469 BLAKE2B 3b198510a1959aab8f639f11ead425938accf3d71d28f2e57e9a049a83352516c3e3dfbbb45726019b85860e6f3ff8a7965a831506668deacd8b4409b32a1fed SHA512 05ea81aa275921c5c9673e02a2da7c6c3bb43809fc5b6d0c51036735f502b58d062e553973055e964a66d667ffc8869e325323c9cf4347c2622227ed27f30be5
-AUX 234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch 4075 BLAKE2B 6caca60f48869c9a37d71ef2f5d79e29b4afa518f52f41287e782622dd3509f3ed5c1024c3c781cd01fa79c599c00264874c3f5cb8d2877e59218de9b8c83ba7 SHA512 1c5c882d0306d7f0663c8a31faba72601da8f159a2eea2a84e12416f473321be829268edf6db3aace7c3590b2f3b85afedd61fd3993346717b2fb0e8452d8ab2
-AUX 234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch 821 BLAKE2B 86af8b6520cd7839efb76553552a35969fdb6061939e8672f98e7b2ed243745abe5752b950a7fb78cbbc10d7d6f3ab12da4581366d0b436db7e1cb0d7f6b0128 SHA512 b791f49036981cb6e91d8597e7c0433549208afb661fdbc9631dd66a868cdb0741847bf7188c514179c3a920721568e65f09a38ca9e133ca7226bfad6f4aa1c2
AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376
AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78
diff --git a/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch b/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
deleted file mode 100644
index 8ea131adfd07..000000000000
--- a/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 793c786f470aeedf443686cff30f97acaff23a04 Mon Sep 17 00:00:00 2001
-From: Andrew Soutar <andrew@andrewsoutar.com>
-Date: Mon, 31 Jul 2017 02:19:16 -0400
-Subject: [PATCH 2/3] cryptsetup: fix infinite timeout (#6486)
-
-0004f698d causes `arg_timeout` to be infinity instead of 0 when timeout=0. The
-logic here now matches this change.
-
-Fixes #6381
----
- src/cryptsetup/cryptsetup.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 3b4c08616..08ed7e53b 100644
---- a/src/cryptsetup/cryptsetup.c
-+++ b/src/cryptsetup/cryptsetup.c
-@@ -56,7 +56,7 @@ static bool arg_tcrypt_veracrypt = false;
- static char **arg_tcrypt_keyfiles = NULL;
- static uint64_t arg_offset = 0;
- static uint64_t arg_skip = 0;
--static usec_t arg_timeout = 0;
-+static usec_t arg_timeout = USEC_INFINITY;
-
- /* Options Debian's crypttab knows we don't:
-
-@@ -670,10 +670,10 @@ int main(int argc, char *argv[]) {
- if (arg_discards)
- flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
-
-- if (arg_timeout > 0)
-- until = now(CLOCK_MONOTONIC) + arg_timeout;
-- else
-+ if (arg_timeout == USEC_INFINITY)
- until = 0;
-+ else
-+ until = now(CLOCK_MONOTONIC) + arg_timeout;
-
- arg_key_size = (arg_key_size > 0 ? arg_key_size : (256 / 8));
-
---
-2.14.0
-
diff --git a/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch b/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
deleted file mode 100644
index e083f854107e..000000000000
--- a/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 47d36aeaebc3083795de40c80e75f0fda48c3053 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 21 Jul 2017 07:51:07 -0400
-Subject: [PATCH 3/3] resolved: make sure idn2 conversions are roundtrippable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-While working on the gateway→_gateway conversion, I noticed that
-libidn2 strips the leading underscore in some names.
-https://gitlab.com/libidn/libidn2/issues/30 was resolved in
-https://gitlab.com/libidn/libidn2/commit/05d753ea69e2308cd02436d0511f4b844071dc79,
-which disabled "STD3 ASCII rules" by default, i.e. disabled stripping
-of underscores. So the situation is that with previously released libidn2
-versions we would get incorrect behaviour, and once new libidn2 is released,
-we should be OK.
-
-Let's implement a simple test which checks that the name survives the
-roundtrip, and if it doesn't, skip IDN resolution. Under old libidn2 this will
-fail in more cases, and under new libidn2 in fewer, but should be the right
-thing to do also under new libidn2.
----
- src/shared/dns-domain.c | 29 ++++++++++++++++++++++++++---
- src/test/test-dns-domain.c | 6 ++++++
- 2 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
-index 12c4d65dd..139d286af 100644
---- a/src/shared/dns-domain.c
-+++ b/src/shared/dns-domain.c
-@@ -1274,15 +1274,38 @@ int dns_name_apply_idna(const char *name, char **ret) {
-
- #if defined(HAVE_LIBIDN2)
- int r;
-+ _cleanup_free_ char *t = NULL;
-
- assert(name);
- assert(ret);
-
-- r = idn2_lookup_u8((uint8_t*) name, (uint8_t**) ret,
-+ r = idn2_lookup_u8((uint8_t*) name, (uint8_t**) &t,
- IDN2_NFC_INPUT | IDN2_NONTRANSITIONAL);
-- if (r == IDN2_OK)
-+ log_debug("idn2_lookup_u8: %s → %s", name, t);
-+ if (r == IDN2_OK) {
-+ if (!startswith(name, "xn--")) {
-+ _cleanup_free_ char *s = NULL;
-+
-+ r = idn2_to_unicode_8z8z(t, &s, 0);
-+ if (r != IDN2_OK) {
-+ log_debug("idn2_to_unicode_8z8z(\"%s\") failed: %d/%s",
-+ t, r, idn2_strerror(r));
-+ return 0;
-+ }
-+
-+ if (!streq_ptr(name, s)) {
-+ log_debug("idn2 roundtrip failed: \"%s\" → \"%s\" → \"%s\", ignoring.",
-+ name, t, s);
-+ return 0;
-+ }
-+ }
-+
-+ *ret = t;
-+ t = NULL;
- return 1; /* *ret has been written */
-- log_debug("idn2_lookup_u8(\"%s\") failed: %s", name, idn2_strerror(r));
-+ }
-+
-+ log_debug("idn2_lookup_u8(\"%s\") failed: %d/%s", name, r, idn2_strerror(r));
- if (r == IDN2_2HYPHEN)
- /* The name has two hypens — forbidden by IDNA2008 in some cases */
- return 0;
-diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
-index 11cf0b1f0..cbd2d1e65 100644
---- a/src/test/test-dns-domain.c
-+++ b/src/test/test-dns-domain.c
-@@ -652,6 +652,12 @@ static void test_dns_name_apply_idna(void) {
- test_dns_name_apply_idna_one("föö.bär.", ret, "xn--f-1gaa.xn--br-via");
- test_dns_name_apply_idna_one("xn--f-1gaa.xn--br-via", ret, "xn--f-1gaa.xn--br-via");
-
-+ test_dns_name_apply_idna_one("_443._tcp.fedoraproject.org", ret2,
-+ "_443._tcp.fedoraproject.org");
-+ test_dns_name_apply_idna_one("_443", ret2, "_443");
-+ test_dns_name_apply_idna_one("gateway", ret, "gateway");
-+ test_dns_name_apply_idna_one("_gateway", ret2, "_gateway");
-+
- test_dns_name_apply_idna_one("r3---sn-ab5l6ne7.googlevideo.com", ret2,
- ret2 ? "r3---sn-ab5l6ne7.googlevideo.com" : "");
- }
---
-2.14.0
-
diff --git a/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch b/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
deleted file mode 100644
index 97230f9dd2ae..000000000000
--- a/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f7d27d130eaac222b2d11c4d4415c9b599934da8 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sat, 26 Aug 2017 15:19:26 +0200
-Subject: [PATCH] logind: make sure we don't process the same method call twice
- (#6583)
-
-Tiny mistake, big effect.
-
-Fixes: #6375
----
- src/login/logind-session-dbus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
-index 22e5349a6..649f3c155 100644
---- a/src/login/logind-session-dbus.c
-+++ b/src/login/logind-session-dbus.c
-@@ -457,7 +457,7 @@ static int method_take_device(sd_bus_message *message, void *userdata, sd_bus_er
- goto error;
-
- session_save(s);
-- return 0;
-+ return 1;
-
- error:
- session_device_free(sd);
---
-2.14.1
-
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index ffc9c1d0915d..83f3aaf1704d 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -7,5 +7,5 @@ AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0
DIST watchdog-5.14.tar.gz 216384 SHA256 620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa WHIRLPOOL 5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c
DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
EBUILD watchdog-5.14.ebuild 869 BLAKE2B 0d159a185ac60a8f911547e42d13f594d9c54e54f0bd49b375b975c9321eeb6ef13e89f748dea0947a01e7d48d4783e11838ae26c856372aed4d06b627260cd5 SHA512 7223acbd16f44a78cab8af57d283453f1e72fe49bab38100a2f3dfdfcdc9cc02caf3c07f75b77b06bdae6d14cd7c31069709d1f4374dcb852fa059cd4e57089a
-EBUILD watchdog-5.15.ebuild 980 BLAKE2B e836902710b06fb0a60ccbeef277111c24cd36f92b003710cd4f491916236b11d123ab08cb6a343aebc4a2a5787d474843bf269b9db3014f8a4a526fd94e4b01 SHA512 ecc4b12592b375d3e1ecc40d46a552285d9e678ff7edf760f844f9f90b4216cfcc8385e15936518a4f4e6d312b3816775703bb3a26d37b847a32c77f9127064d
+EBUILD watchdog-5.15.ebuild 979 BLAKE2B 38c08aa56b25ecf9fb01c338c5e840107b8a2b99901fe52bc3942bf3a9b65f2f45e0eb1b5f4750c3c7cc3cfecda0e487bf9e797190456f35eb3b983ae2a876df SHA512 7afb2717ce7582836a60da29622843bfe36422a46a76a70b51ff861fe0c962909941864f9bc04b91e1ebf0ed378442be07d7c3f1a55f1a2d779102c9bad180a7
MISC metadata.xml 405 BLAKE2B 47880df93bf397e1a7d905a0ade7c385eb7f97ca4e99fd5687f15147adb093da1312f518b6179d7ab9095a355d73147091787a0d3dc90200cef3e8cf7320a8c8 SHA512 36da0e0199b41608190b0e39de2b82bea5516890208c57744b93e527904501de01b1bfd4e20fc74450bd7b9ac4d152e0d57e31a35deca0b1edddc9ce60846d0b
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild
index 1c38ff5e0028..e7de74cd10dc 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-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"
IUSE="nfs"
RDEPEND="nfs? ( net-libs/libtirpc )"