summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-03 08:30:30 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-02-03 08:30:30 +0000
commiteaab68ba6a05bc57d98ca12032440835ef905326 (patch)
tree722637b4f6d0087c5b321ceb515a98913bee7559 /sys-apps
parent4650985dd0e898b82e0d2ec225931297d4fadccf (diff)
gentoo resync : 03.02.2018
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin48472 -> 48481 bytes
-rw-r--r--sys-apps/busybox/Manifest2
-rw-r--r--sys-apps/busybox/busybox-1.28.0.ebuild2
-rw-r--r--sys-apps/ethtool/Manifest12
-rw-r--r--sys-apps/ethtool/ethtool-3.10.ebuild14
-rw-r--r--sys-apps/ethtool/ethtool-3.16.ebuild14
-rw-r--r--sys-apps/ethtool/ethtool-3.4.2.ebuild13
-rw-r--r--sys-apps/ethtool/ethtool-4.0.ebuild14
-rw-r--r--sys-apps/ethtool/ethtool-4.15.ebuild (renamed from sys-apps/ethtool/ethtool-4.11.ebuild)4
-rw-r--r--sys-apps/iproute2/Manifest9
-rw-r--r--sys-apps/iproute2/iproute2-4.14.1-r1.ebuild141
-rw-r--r--sys-apps/iproute2/iproute2-4.14.1-r2.ebuild2
-rw-r--r--sys-apps/iproute2/iproute2-4.15.0.ebuild7
-rw-r--r--sys-apps/iproute2/iproute2-9999.ebuild45
-rw-r--r--sys-apps/iproute2/metadata.xml1
-rw-r--r--sys-apps/man-pages/Manifest6
-rw-r--r--sys-apps/man-pages/man-pages-4.14.ebuild2
-rw-r--r--sys-apps/man-pages/man-pages-4.15.ebuild (renamed from sys-apps/man-pages/man-pages-4.13.ebuild)2
-rw-r--r--sys-apps/portage/Manifest6
-rw-r--r--sys-apps/portage/portage-2.3.24.ebuild (renamed from sys-apps/portage/portage-2.3.21.ebuild)1
-rw-r--r--sys-apps/portage/portage-9999.ebuild1
-rw-r--r--sys-apps/systemd/Manifest4
-rw-r--r--sys-apps/systemd/systemd-237-r1.ebuild439
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild10
24 files changed, 506 insertions, 245 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ba86d2ed5e1e..76837d975bb7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index fbb35c25226c..f43cbb83444e 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -22,6 +22,6 @@ DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e345
EBUILD busybox-1.25.1.ebuild 8772 BLAKE2B 09a9f7fcf016901ae5d79fcca962ff13dec578bd2815f0196a9458d066b6ff1ecdaaa21a457ad0dc3fce6d8b4a5d8bc3cb66e79824067d7dc973e8163bc99c39 SHA512 0c1bfc1298ec19e03d3c1efcd974332f3f960937c69124d2f9399640f468b4b823b8196dfdc2eb955af8257c3bca538dc92ca6d71b1cf1e5838fa5f12fd87cd0
EBUILD busybox-1.26.2-r1.ebuild 9109 BLAKE2B 310e0233de69bb18a6789f127dbcc97ef648f420e8119fe97eb99ddfa8efd124d7ec71536a0282ab63975241e5f8618969b38dc98c6736dac44e63027c96bed9 SHA512 c8acdb039cca5528efcb5c2861b4eaed3f7611909be5b368a72f35c86ed4d0bf386b5f88f8b1ee083663aa73da1812854e613d43b303150c9d2013bb151566e4
EBUILD busybox-1.27.2.ebuild 9109 BLAKE2B 76fa055773bedb7511974c2e695bb23ddc48ec3233e169ef90d4ab789ddbd086fd7ebc9ffab8ed7b255382d1291618d554a56891bd76ec4c8b7a47dd1275812e SHA512 e2ea36c7a4f48c3766363f7f447e4ab5f31b88541db7c64207e0c3fc0d5410ba309d112d9ca6734adf631bd4bbf815049c79713de77a6aa9ad558f53a688fbb1
-EBUILD busybox-1.28.0.ebuild 9300 BLAKE2B d379570902a117029d835119f139fc0e706184700b7b794abb755712c5217f19311dd1e89b6d5f0aeb63683f24dd7e1efd380342f80caa04e81703fb798735e0 SHA512 1683d8e5b20f63690de2961d2762769bc6cabe8e7f5f9fb57a7d9b60c5b2ca0a808adc730daa56715dcce3aa5e29c62eb28072ef2df9930ceae6fc4cfc6b60fd
+EBUILD busybox-1.28.0.ebuild 9299 BLAKE2B 565904142def437b6fefe2acc4e2ad53293d3e7394c454b6be7d7de0728ac1086b3d88ce7e76885a20249ea6fe000853ad7e35a425a5aa78838b65fbf07d0012 SHA512 05cb048d9fa4ee1fd027e71ce796b268534559530754a53c1fddf94dfe5f5e4eb2c31eb6cf32f600a96ccfc733d857500713633a7e7c7a725bcf396dfb9a296f
EBUILD busybox-9999.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
index e672821e6bbe..141aa0ced958 100644
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ b/sys-apps/busybox/busybox-1.28.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P=${PN}-${PV/_/-}
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
- 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"
fi
LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index b722861a7a11..ab2fda4589a5 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,21 +1,13 @@
-DIST ethtool-3.10.tar.xz 184888 BLAKE2B 2d95ec26cd1960a697af4a2b11dd32c8c7830d112884f843d8e8b1a07d7b3e42c1827dc3c076fbd7971fe9128eba705955a1f4b3f8d20edcf6e3b1d10d72edd0 SHA512 b7a28e70f92854abb47e61cd927d93b2716407b77d20253e0b21d225e7033d466772677215d2c7b1a811504e8d00e438b47abcf2448c79488dc677bb0ce2183b
-DIST ethtool-3.16.tar.xz 198760 BLAKE2B 3d8f444bd06a0d9c86aff62349e819e0a8b2fe05e46c254760c7c65b637330cb43185612ec47a1b7e8e29e44f721223718ab787611f4c4f0ad5e66c9fdc1a29e SHA512 5f3790872eef14c20b4e1c59e9f318f18811022fa2b1c345699c815acf942e91288bb08d6e7d36d8b4f33101e52c832522d5118146f9e0f5d98cdf2f9c0d0d30
DIST ethtool-3.18.tar.xz 198780 BLAKE2B 18484b9b7af3b9bffe3d05a12bcee0587587f5c1e2ba3f91de43ccf8045140e6f4b76118261f061a3df1c1d57e9d2e17347ed750e7a30c9540d16345d2db9057 SHA512 06fba3458c69bd414f5c5edaba006f39e0777614521e5dc37859d1947d3069f7c04f8ea2513f16a930183fb98fc4b6e7cc374a2070787a750673cbf01943eb62
-DIST ethtool-3.4.2.tar.bz2 200731 BLAKE2B f4e52935235cdcbb68d1b1917677edb716cd1f50899bb4189370bac880b2c4f2ce104ad7f50ad3dd1a7135a09fbfba99f535182a08a7e698ca530ca7dd94d8d1 SHA512 43714a643c741ef46132e06f6f407bbf77c7787a6fcfe6b9b73165883ea498890ee23d34662255c6fbaeba924d2f8e8cd5160c33c960492dcf5e4a94d2bb68a9
-DIST ethtool-4.0.tar.xz 199548 BLAKE2B b734e4a9cdb9a0f06f842d8d0498a52eea5fa75f7741df54ec80617bf1694450c258680400c982976df04c7acb5b4322c34cdfbcf4cb0a87cbb2a1712d753364 SHA512 708f7df17f04339d1f6e9f80e0e9b4d7855fd71b974a833e5644ee4b7a431032ce70ceac85e37e59847eb0bea4226c0467b12605e16a005f83d75c33367a6ef2
DIST ethtool-4.10.tar.xz 216320 BLAKE2B 7144fd9d5741c5d855910f5493ab626b8f1a7f60c5d8c479c1eda3daba62d5226fe5dbc23f9de1f45a25f6171840352fe0f33604dcb2064b90049e8687eb3e7c SHA512 6766c468e141300b4828e6bdc98e7e720d35bb122405fc05d4ae94bbdce50b98e48ddd0505b09c990040da67e942e08a88b28b46d94aca8d544caf0aee4aac36
-DIST ethtool-4.11.tar.xz 216976 BLAKE2B 94d152c47ff5dc7a1c171d822c3faaba50703806fd682d9cc9b634a9cfba80158fb6716d6b548b7948a801adb457d7f092566aa32ed3a4e2463f446954604b38 SHA512 177bbb725abc725dece99b4198f673b57ac9fc5c466aa36ac9e2a66b5535c82b5a27e916ef3e489232709e0b2d27d821acb4bea17d9b5a1940bf83e6a13ef445
DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d19d02c09b6370b1cf92c5c8a6e97f5048c98dfbb3a72b8c5889302538d8f11b9771120724b53949f9aedd11c6 SHA512 d0f881b88379b959cd34949c924b0e4d4fb1af0873192cdf8ec9cc2d2d677a4de13021efabb0a1aea1932ef38a6952d9f3eb040c478a9af770054a6170777789
+DIST ethtool-4.15.tar.xz 219408 BLAKE2B 7667f3e24f62c6dbaeb2590e79b59198d15ee44a46440c9af917154a5e5b6fde5f29b88ada03fdc195a642c2585c16ae503cf04b1be941d98413a596e4396ee4 SHA512 7ffd76b17b56de4182a14c2a77bf3026715f4af4c60809aed192f5631cb72173ed3c5d451e54711a73b65fee8339d58c857e83ddf60b85057bfed20863476527
DIST ethtool-4.5.tar.xz 204244 BLAKE2B 39a5cbd22e330e3368130be3753cd7743b1b1b5c080edf302a733d38aa3bc0fd3a4c345d25109d973793f75abfc8dee0116d4e1744abb43e5a028ec432c89d3d SHA512 fa5b4547de0315c54113d9c7baea53dd4bb6e46c9340255cecf9a39f549190cb5de9db98ad4330a6eeced3a1f9ed6f2ae42cf5a602c0ef1c5a9fd17c825558a4
DIST ethtool-4.8.tar.xz 214932 BLAKE2B bbfbc7eb23a7fe057e28f22fad962bc8b46c581e4c6fc35612c345863b300478232b95569a2e35fd26f76eb48f824bdf7dcd0cdb8bdcc136e7494c5d39361f2b SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96
-EBUILD ethtool-3.10.ebuild 456 BLAKE2B c0fe4958db496fd5f458698e80c9eeb27dd1d295788eacfeef9920c35486bf90002e9b7e09df9995892d82213fd4259d6af278597f020461acd1c60325fbfbb0 SHA512 64d39e8e01b77c4e8b931e9f3ac84626bb6e85ae84037fbf3ea7cfd4e0e67ce0ad25428c9dfd994c5ced26a244f515337b5095dd80f1bf3be407283894821396
-EBUILD ethtool-3.16.ebuild 456 BLAKE2B 207fae9d32849f1e8707a0b0522a3020f41d2266f4e0ca97df5dd9e9b95099ec734b454c5c74ff84f47d6739d4dfd63c67fb1f488661da3dc2f4edc53b0a22a1 SHA512 90bf0fcb1204ab2bb0c70a21d92c8901dea3c07fefd6ce938add8e1dbdb8a074b1780bc7065d17936314e022abadd937c5c84257fd2493141976381d3134aec0
EBUILD ethtool-3.18.ebuild 447 BLAKE2B 18c946f8af0c88973aa4cb9ba8457f465fb167d9ceea426ccd1396248a31234b72004e13242188110632baea78259641a0d443a3d260c8599a2a589b18551c50 SHA512 f3c0c56e661f8b4c5a927783074d4d7cfc9d5b8250fad6ca78c8cd2bbf5c839ef966a8795109d686ba646a63f854a3d14fe0d388c958808a264e440178f40e3d
-EBUILD ethtool-3.4.2.ebuild 437 BLAKE2B 9abd99f52129c3cd8f4dc099fa76afa4e46253d1a3f7537cb9ec27ef1cc2ffe76a795ac8aeb0eb4a6d75ae7152412b2ec6b53a1898cb315938212402ff003b99 SHA512 fd275a7e2cd8dd7a547c7b307167d34aabb43d277c17804983d41881bae5c62f16ccc53cc96db9e69117a150c271042409669f850f4ff3eebc063e57697fceb4
-EBUILD ethtool-4.0.ebuild 456 BLAKE2B 36b2a88413d02682b3af124350009c436eeba571f9b0d0b33d8357436d036e8ca3a5f8bd66008995197f77d1d4602cc7494e08e353266c4b63abf72b989ae7ea SHA512 0628af197f5b89e9a3747004cb3e3f81c7cbcc73df3eee0e51f2460b07804942a4bc4d560c4a5855fe5d6f9fc618a75e2469ac9bcf053111e77597cf8c101eba
EBUILD ethtool-4.10.ebuild 463 BLAKE2B 4a5d0363ff7782e7cbaf29e7ea00a43ff4f1caa6288f13f5658eb7877d67e22d3a6f73b243cb2cddffedd3ba4136b06455efaa16d07d3de6d4c57fe7f5cbadef SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e
-EBUILD ethtool-4.11.ebuild 463 BLAKE2B 4a5d0363ff7782e7cbaf29e7ea00a43ff4f1caa6288f13f5658eb7877d67e22d3a6f73b243cb2cddffedd3ba4136b06455efaa16d07d3de6d4c57fe7f5cbadef SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e
EBUILD ethtool-4.13.ebuild 463 BLAKE2B 4a5d0363ff7782e7cbaf29e7ea00a43ff4f1caa6288f13f5658eb7877d67e22d3a6f73b243cb2cddffedd3ba4136b06455efaa16d07d3de6d4c57fe7f5cbadef SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e
+EBUILD ethtool-4.15.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
EBUILD ethtool-4.5.ebuild 456 BLAKE2B 3e865ab0f32296681cb4e28f186e711cdd1e4b20fd07c587c07f60223258f45325a28cec162f2c77ba77bc88b5344d06ce37e322d020aa457f3aa8125c20af1c SHA512 e366a4fcd39d80312df50324883dc72338622dc08aa0f0ed758a9ecddaa0cb6aa9d6bd805996d8b9d51f8fa8b3235c3259064342851eeab4c434315cef59220e
EBUILD ethtool-4.8.ebuild 453 BLAKE2B 46fd2c76b13b3ac09bf91980870c7eb70a2600ea46d3146b006b54d1b21dd72bd50cd01f29504ae9329db8be393fce2cf1bd540a006278e0d2530278b3a84ca7 SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2
MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
diff --git a/sys-apps/ethtool/ethtool-3.10.ebuild b/sys-apps/ethtool/ethtool-3.10.ebuild
deleted file mode 100644
index 21bbb065e526..000000000000
--- a/sys-apps/ethtool/ethtool-3.10.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-3.16.ebuild b/sys-apps/ethtool/ethtool-3.16.ebuild
deleted file mode 100644
index cd5a8ee704b7..000000000000
--- a/sys-apps/ethtool/ethtool-3.16.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-3.4.2.ebuild b/sys-apps/ethtool/ethtool-3.4.2.ebuild
deleted file mode 100644
index d24f21c1c7a7..000000000000
--- a/sys-apps/ethtool/ethtool-3.4.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
diff --git a/sys-apps/ethtool/ethtool-4.0.ebuild b/sys-apps/ethtool/ethtool-4.0.ebuild
deleted file mode 100644
index 4c2183c470b9..000000000000
--- a/sys-apps/ethtool/ethtool-4.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-4.11.ebuild b/sys-apps/ethtool/ethtool-4.15.ebuild
index 04f5d5de3b2e..373b38775050 100644
--- a/sys-apps/ethtool/ethtool-4.11.ebuild
+++ b/sys-apps/ethtool/ethtool-4.15.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5cf905147d1e..be9031beccbe 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -22,15 +22,14 @@ EBUILD iproute2-4.10.0.ebuild 3985 BLAKE2B 639a1748c37e42225bdece73320e11d4ffaae
EBUILD iproute2-4.11.0.ebuild 3986 BLAKE2B 0103b40fa4c1104421e3fac2d002cb84224986ffc7306f19eb3e967aae4b1945ca7deb68b70a2b675e07363b6d25f2f306d806cddb0cf1b9b3386d08c36c2a95 SHA512 fdc0d728f71d32767167184fbe998b3e8955a573c08064d00c22d34f966db7406b989ce03329fbcbe5182b54809cf788e91992bdf48a368ea54d84c5b62594aa
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.1-r1.ebuild 3917 BLAKE2B 122d9152b518fbb536fb9fe427d19c520cb928d863ffeec86a1dddba7f872c2402b3b06bcdf62acd10406c905c17246d046dab058b083be6664f627b0acd90ee SHA512 0ad8578638859289f8621a9811656808cc987bc12349e6d0b9d9ab0cd95cc38d2c547bef3bba6ab905f8527b2132aad1ca21ec1b526bc4edba95b5607b797eb2
-EBUILD iproute2-4.14.1-r2.ebuild 4097 BLAKE2B e97221d1703db06c06d8ae792a9c6cdd809c1e28d4dbbaa10f8b501db84788bd531cfd42972705fa84b4714c12c8f417bc0d61065e6443d9fbfbf65b7cdd7c3a SHA512 537e045806c5350b1eeeaed6547fffe38693e921cb079dd358b2fc296ffa096b8a7b63a81b6fda7ebd24e256e4b47ec2d7717f6418844bc3e39d92471db7a583
+EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73
EBUILD iproute2-4.14.1-r4.ebuild 4305 BLAKE2B cee940c2a0e309cf9fd0c8d652410cc3acf32bd4abcee04055bde9cbfd38704734b3ca7b9ff92ac6f1ff7dd7b8036ac99221be3a9752bec7adcd5310534e49f8 SHA512 a8c6bdd2c21731bf54da7964aece0be7dd1e78948602f9f2534e1978fa783ad917f40f43eb62084046da1ce0ebaac6c840e7886cdcc44987e5b8225e06c40386
-EBUILD iproute2-4.15.0.ebuild 4234 BLAKE2B 641a73c50a369c16aaf8c43b79eea25ab42b434e3e1239f089db06cede5cbe6948d9bb6b68be1beb9b5ff81a694cec091e46b76084a81c403d646bccaead8f3b SHA512 bea43d1e95ba653f397eeb6ee6a2ed65eb78c55cc3c40a4ffc96ab96d9d677cbcb713a3388f8b8bed47230042d594713b5075a0ac7ce887d94b59b86c365eb29
+EBUILD iproute2-4.15.0.ebuild 4244 BLAKE2B e422c120a073b1df1246b316eb3d0bc22c0fe5925059b70b170ac5a45e2ac27b9bea7fceba09a1243598990db1535c09bc20f61a2aa0f17a0532226faa3a7003 SHA512 e8f7250b9a2ecd6b0c80c850599bc61f5f22d434a2699f29d712abc317970780e88e14c013498969723d5457f68493eab55b0f260ed5cfee06631ad29b5de9cc
EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a
EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc
EBUILD iproute2-4.6.0.ebuild 3997 BLAKE2B 4f2a0cf508475c2763b08f8cbe865d8dee51fadacffd070625a54e8419784706ca64918462284be1e9a641e4fbcef27e54bed13cdb91927ce7bac63132520ad2 SHA512 7e90c8bc70a9f3cf477389aa881d58f7e16a8d0a73dce93d0e5aa33d977c549715e0ae86583292bfe2797ef7792ed0ddad6b2bfb7a68d940bc4240313c565617
EBUILD iproute2-4.7.0.ebuild 3997 BLAKE2B 4f2a0cf508475c2763b08f8cbe865d8dee51fadacffd070625a54e8419784706ca64918462284be1e9a641e4fbcef27e54bed13cdb91927ce7bac63132520ad2 SHA512 7e90c8bc70a9f3cf477389aa881d58f7e16a8d0a73dce93d0e5aa33d977c549715e0ae86583292bfe2797ef7792ed0ddad6b2bfb7a68d940bc4240313c565617
EBUILD iproute2-4.8.0.ebuild 3997 BLAKE2B 4f2a0cf508475c2763b08f8cbe865d8dee51fadacffd070625a54e8419784706ca64918462284be1e9a641e4fbcef27e54bed13cdb91927ce7bac63132520ad2 SHA512 7e90c8bc70a9f3cf477389aa881d58f7e16a8d0a73dce93d0e5aa33d977c549715e0ae86583292bfe2797ef7792ed0ddad6b2bfb7a68d940bc4240313c565617
EBUILD iproute2-4.9.0.ebuild 3985 BLAKE2B 639a1748c37e42225bdece73320e11d4ffaaeeaa9487f015ff0d596ea94874be59be689757cdc100ca13f918fee43c5cbd0af301d361b919fed69ce1f58935a4 SHA512 e834c22bcca9a9c1822e536a1780c31de445e2a178eb65d685bfa03e67ea747efec4c93db704c89cb798a594f6291c7c67b1a819c193c46e7e44209be7a5a39a
-EBUILD iproute2-9999.ebuild 3735 BLAKE2B b92c4712fb9f07cb040399fd0044e1118a7774618c08b40177d5d5fc1f95489d80f3bb27701a5f9d5385118905e6382da71d64cf317d1c45a04f80266e2e7ae3 SHA512 626da9156bcbbbf5780a7dd63dadb77a2f99e786626a6dd823048c532ddef12ecae11f62a0fc4438a53c9a49565ba0be5e8b5d569d8d920ccdd09991644c933c
-MISC metadata.xml 489 BLAKE2B 6efcdc01a729d8b5b84fe4743749e91a5c86469244d9be69ee466861f54f79d9f74c43706037ba2a9526ea3722697068b2c6e139b5c3e610c816c39d29f8a93f SHA512 d12b7f4a1de17b21d10ac799e1fdb390a990224dfb0c2c0391b03df730bdbfd9d9e43a9f8458748e1a12ed3d607221bb1db5e160f4bdc663721e9a50dad370da
+EBUILD iproute2-9999.ebuild 4244 BLAKE2B e422c120a073b1df1246b316eb3d0bc22c0fe5925059b70b170ac5a45e2ac27b9bea7fceba09a1243598990db1535c09bc20f61a2aa0f17a0532226faa3a7003 SHA512 e8f7250b9a2ecd6b0c80c850599bc61f5f22d434a2699f29d712abc317970780e88e14c013498969723d5457f68493eab55b0f260ed5cfee06631ad29b5de9cc
+MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
deleted file mode 100644
index d165889df717..000000000000
--- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- 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"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- !minimal? ( net-libs/libmnl virtual/libelf )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- berkdb? ( sys-libs/db:= )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
- ${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- >=sys-devel/bison-2.4
- sys-devel/flex
- >=sys-kernel/linux-headers-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-)
-
-src_prepare() {
- if ! use ipv6 ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
- )
- fi
-
- default
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^WFLAGS/s:-Werror::" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- include/namespace.h \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- cat <<-EOF > Config
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex minimal n y)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \
- SBINDIR="${EPREFIX%/}"/sbin \
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX%/}"/usr/share/man \
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
- install
-
- dodir /bin
- mv "${ED%/}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
index d58c246ac548..74637c72653d 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r2.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/iproute2/iproute2-4.15.0.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild
index f38e3db1ff8f..15efa9acf6c9 100644
--- a/sys-apps/iproute2/iproute2-4.15.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.15.0.ebuild
@@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
LICENSE="GPL-2"
SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
+IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
# We could make libmnl optional, but it's tiny, so eh
RDEPEND="
!net-misc/arpd
- !minimal? ( net-libs/libmnl virtual/libelf )
+ !minimal? ( net-libs/libmnl )
+ elf? ( virtual/libelf )
iptables? ( >=net-firewall/iptables-1.4.20:= )
berkdb? ( sys-libs/db:= )
atm? ( net-dialup/linux-atm )
@@ -101,7 +102,7 @@ src_configure() {
TC_CONFIG_IPSET := y
HAVE_BERKELEY_DB := $(usex berkdb y n)
HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex minimal n y)
+ HAVE_ELF := $(usex elf y n)
HAVE_SELINUX := $(usex selinux y n)
IP_CONFIG_SETNS := ${setns}
# Use correct iptables dir, #144265 #293709
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index d48d995c3cf5..15efa9acf6c9 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,24 +18,32 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
LICENSE="GPL-2"
SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
+IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
-RDEPEND="!net-misc/arpd
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+ !net-misc/arpd
+ !minimal? ( net-libs/libmnl )
+ elf? ( virtual/libelf )
iptables? ( >=net-firewall/iptables-1.4.20:= )
berkdb? ( sys-libs/db:= )
atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )"
-# We require newer linux-headers for ipset support #549948
-DEPEND="${RDEPEND}
+ selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+ ${RDEPEND}
app-arch/xz-utils
iptables? ( virtual/pkgconfig )
>=sys-devel/bison-2.4
sys-devel/flex
- >=sys-kernel/linux-headers-3.7
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+ >=sys-kernel/linux-headers-3.16
+ elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
PATCHES=(
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+ "${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722
)
src_prepare() {
@@ -66,9 +74,6 @@ src_prepare() {
rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
- # don't build arpd if USE=-berkdb #81660
- use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
}
@@ -84,11 +89,20 @@ src_configure() {
${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
popd >/dev/null
- cat <<-EOF > Config
+ # run "configure" script first which will create "config.mk"...
+ econf
+
+ # ...now switch on/off requested features via USE flags
+ # this is only useful if the test did not set other things, per bug #643722
+ cat <<-EOF >> config.mk
TC_CONFIG_ATM := $(usex atm y n)
TC_CONFIG_XT := $(usex iptables y n)
+ TC_CONFIG_NO_XT := $(usex iptables n y)
# We've locked in recent enough kernel headers #549948
TC_CONFIG_IPSET := y
+ HAVE_BERKELEY_DB := $(usex berkdb y n)
+ HAVE_MNL := $(usex minimal n y)
+ HAVE_ELF := $(usex elf y n)
HAVE_SELINUX := $(usex selinux y n)
IP_CONFIG_SETNS := ${setns}
# Use correct iptables dir, #144265 #293709
@@ -96,10 +110,15 @@ src_configure() {
EOF
}
+src_compile() {
+ emake V=1
+}
+
src_install() {
if use minimal ; then
into /
- dosbin tc/tc ip/ip
+ dosbin tc/tc
+ dobin ip/ip
return 0
fi
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index 2605d5fd7ce0..ad652efcf7e4 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="berkdb">build programs that use berkdb (just arpd)</flag>
+ <flag name="elf">support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)</flag>
<flag name="iptables">include support for iptables filtering</flag>
<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
</use>
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index f5b64c68eaf4..e11868d38b73 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,6 @@
-DIST man-pages-4.13.tar.xz 1593424 BLAKE2B a77c38fd3d23a66eea93c2e81efd2c49fc2053980c669804d747b38cf1447a4fb4119a02f521a4984659a8ff490e165fb994429770a1352eb47afcc1c22a58c8 SHA512 86479372cbe2ba5fcad3e2049f52ec788a4aa2d8056cadf7b248eaa776064e1c9387a42d0a77f4bde4385214c11aac117b1e99745459260ca639c656c01698b7
DIST man-pages-4.14.tar.xz 1611348 BLAKE2B d06d6d5bf67f5a17ca685bb1a6742a4d300791c1ed715372fa9bacf3006cd73c4b43434ff7c0a21e3a15082ca1bee91c8559751225eed2946da23c6f4d66e71d SHA512 d7163aacc6c3da914182d685d459d24ad60182e2cc528d72b08b565a9e2901ec319c8b44aef9b7e20838e146e159834482c62ba1b65823d5a06794283ebef41f
+DIST man-pages-4.15.tar.xz 1622184 BLAKE2B fac4895411bead3f2ce7ce642206f80ec7422b11b0cbe96abdbb855e24acb1f271c07c7f3d2b07105c46062b0f07c54c9ee06281ba3dd81224e0304174a6842c SHA512 cde896add266e672347841a9116e5d182084044c4543a847945825f98962192f0e8278a4f562fc47a580eb2ddc3d669ffc75a21922219b4d3c36cbe8a792e205
DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-4.13.ebuild 1656 BLAKE2B 7650d6534578d341081f46fb3eebb42c8d615890bc5801657545bdf6f4ce79d90eda92a2d84ffbbea335506aa7457fbc623c0fdfca1577044fee556fd6841bd5 SHA512 1ef27b1652a2545a20fc1381db1df98dece0abe38b959d3b2067164b0e4e6dd5d7794d628920e62584b2326bd80b3ddb3c4547874073ac0c044632c3bd4a1c07
-EBUILD man-pages-4.14.ebuild 1669 BLAKE2B b427d543ba1d875f5813bc446b159701821076b102ff257b40d3130e32b7e69c3d51c59581b889a36c8c9756b8810d5025372e83f0a35b65069bca170bec98d9 SHA512 c8d91238d078e348e9ce864e72c943ca34b7142df06f1f28593646324da1bcd38ae4f926afee34549096266025bb6683de65553830266c659fd32c596205c7f7
+EBUILD man-pages-4.14.ebuild 1656 BLAKE2B 7650d6534578d341081f46fb3eebb42c8d615890bc5801657545bdf6f4ce79d90eda92a2d84ffbbea335506aa7457fbc623c0fdfca1577044fee556fd6841bd5 SHA512 1ef27b1652a2545a20fc1381db1df98dece0abe38b959d3b2067164b0e4e6dd5d7794d628920e62584b2326bd80b3ddb3c4547874073ac0c044632c3bd4a1c07
+EBUILD man-pages-4.15.ebuild 1669 BLAKE2B b427d543ba1d875f5813bc446b159701821076b102ff257b40d3130e32b7e69c3d51c59581b889a36c8c9756b8810d5025372e83f0a35b65069bca170bec98d9 SHA512 c8d91238d078e348e9ce864e72c943ca34b7142df06f1f28593646324da1bcd38ae4f926afee34549096266025bb6683de65553830266c659fd32c596205c7f7
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-4.14.ebuild b/sys-apps/man-pages/man-pages-4.14.ebuild
index 34c06eaed5d3..2f0635cb9bd0 100644
--- a/sys-apps/man-pages/man-pages-4.14.ebuild
+++ b/sys-apps/man-pages/man-pages-4.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
LICENSE="man-pages GPL-2+ BSD"
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_L10N=" da de fr it ja nl pl ru zh-CN"
IUSE="nls ${IUSE_L10N// / l10n_}"
RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-4.13.ebuild b/sys-apps/man-pages/man-pages-4.15.ebuild
index 2f0635cb9bd0..34c06eaed5d3 100644
--- a/sys-apps/man-pages/man-pages-4.13.ebuild
+++ b/sys-apps/man-pages/man-pages-4.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
LICENSE="man-pages GPL-2+ BSD"
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_L10N=" da de fr it ja nl pl ru zh-CN"
IUSE="nls ${IUSE_L10N// / l10n_}"
RESTRICT="binchecks"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 08213dc9a453..f35b8b22e26c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,7 +5,7 @@ DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f5
DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
DIST portage-2.3.20.tar.bz2 956633 BLAKE2B cf166a10522c5fab6b273674be4d7a673b961fe1c2ca649c7fa6d3759364dd1454ea57edd1e99fd2648b47244fde6f311fb925f50b9a118a1d2880048eb9f39e SHA512 e4fde56f5293b25ef5f484cf601c1db71c350603987e1b2736d9b8434158e8778c637dd5891401e6d484c7a11f1982bbe8213a352c185fc4c6b0039006756764
-DIST portage-2.3.21.tar.bz2 958588 BLAKE2B 01dadfa582e5810c42b389708b108016697ad78c1d184b06d5a2f0d4ce8086232200fa135920d4a1ab9fbde0020f2c8ce4322cd087fd70cb4aa6c42b92226dda SHA512 a6acc6b553f3ecd57479328a0261f09dbe92a84b2a7ae21a97d4651ee392d420c76b51384054d6a3ea41bce19a9b2178faf491273afc6d4af9e0559ca7b79f2c
+DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec
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 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
@@ -14,8 +14,8 @@ EBUILD portage-2.3.14.ebuild 8512 BLAKE2B e32c3ee1a5828cdbe53aad326c4dc6fbdcd57b
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.20.ebuild 8417 BLAKE2B 9810d0113d505f17d79427d42b5d065b07495f1ec024bd853d7390ebb6226fc355aec038a7ade04fece97d21e68ad61fa063a238cc379173f5dd02cf4af42b38 SHA512 96e5a26737bfc3e10805fffd07ab7509d1888e96534b0df113fc00e18040671bfca8c0b7d12336d73e972f64862093af2f3b8cabcad2571234599450406be263
-EBUILD portage-2.3.21.ebuild 8737 BLAKE2B 147834c41391f554b75bf28f5e29c558e087413c098b47b2ab1fd3b040c23d18dbe964ca798db5fac015783f9b2ffbfd24476178b03861d80b280cae9f68b469 SHA512 735cf7a86e263d76b3171ea0ceeb0d39b9f1ba9bcd108c32f288ba7f8c817777f50fce50884cd8ab626c1eebb26bf50ed5b9a679d0b5a89bddc68907b4240106
+EBUILD portage-2.3.24.ebuild 8803 BLAKE2B 5076b248daa81e66a9759758529e765bb5529d0d9feb9fc10eaa9f87ac803245e5f56c0a129d72e841445ff013f140276ea8b0db708dc1e080b27ff203a068d2 SHA512 fab0f077cb2504b8b841c8f23a133d72d4e4a8b09b209e6585001790eed67959470311b83c2324dd559208ad490f2c2c15aeb49de79433580ed7d2f48662eb75
EBUILD portage-2.3.6.ebuild 8638 BLAKE2B 0c50b63b0b233cc9d6d13e914659b0057c7f330e05906d4cd7ee19bef5ad2874749a403e48252e321a42e8109213cb7d6861aa7fffe9616447b2587f5d4a4810 SHA512 a80367ffbeaf00d887e0af09e239a8deb7d37818db50a6f3df59aa2c0ed7b8b6fe233f0520aebfdfad583694f1f6b7252d35d00d9bea2943251fd7b216bee602
EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
-EBUILD portage-9999.ebuild 8278 BLAKE2B 678e5eb5d28f095ab93eaf031361485967dd99ca0ac88d7e25931eee24ec464a08b19b6870857d91972b81e2137996ae0e706671f4714f8dce43a27901ecf835 SHA512 228ca97b9fd4091a84ff4af9832bbb7450005bb30dd963f2408ac7949625011deff41180cc004e7eaae87c44bb8d17895ffef6125d92fc331c639e837a2918c2
+EBUILD portage-9999.ebuild 8344 BLAKE2B b63ca7daae0c45896e1430df35edc8268da88f45bbad6c458b90311cba79aa2e54a2c41a8ec3bd08dbd98f7293f3421da528711599f455d665a222878895cb92 SHA512 092b47b4f4b482355bf3efbe84c8bad7c44894e0ac9feece332743693211a6de2d95fd0c4dbc60fedad641261641cd402b8b093919fd82389d94cf0be4a078f1
MISC metadata.xml 1324 BLAKE2B 3e403e150d3487708ac804f718aee00557810f2ea1c6f3dfa4c37666f3c5ca710b61c00f9fc01404fb88dd96dd675fc81c90021305c3e903dc0ab4f540f206df SHA512 052fc2dd654dbfd81f62646de4c6b6dc38d09637afc2e80e7c98eb20b65acf2e985466700bc8068145f08746cc7ccdb0555c5a549969fb8177b6bd83310669a9
diff --git a/sys-apps/portage/portage-2.3.21.ebuild b/sys-apps/portage/portage-2.3.24.ebuild
index 62973a379b0a..8e5bc50d4eb2 100644
--- a/sys-apps/portage/portage-2.3.21.ebuild
+++ b/sys-apps/portage/portage-2.3.24.ebuild
@@ -144,6 +144,7 @@ python_prepare_all() {
einfo "Adjusting repos.conf ..."
sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-i cnf/repos.conf || die "sed failed"
if use prefix-guest ; then
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 7913145d58f0..43c081296c77 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -143,6 +143,7 @@ python_prepare_all() {
einfo "Adjusting repos.conf ..."
sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-i cnf/repos.conf || die "sed failed"
if prefix-guest ; then
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e51ff87b70aa..79f0c8241e13 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -13,7 +13,9 @@ DIST systemd-233-patches.tar.gz 12553 BLAKE2B 5d19f2dc82cc6cbd9b2e9393f932dfa3c8
DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19 SHA512 b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875
DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
+DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 82e15d7171054d46049bc9a50a8482bc1ebbe7bb53af2ad1b6ee594582f30cb561c6d2e18226f4401c605cf9bcd53290128c7be441cfa6cd60470e313144009d SHA512 53b2e092bc48bc8d2899d9869e77049e9ce0cc6178ac63bb830544ec0a69a3ba5ba29a82a5ba76ab19dd4ce8997b9ae5ffeb3698780fe086ed5a632ff386c1d3
EBUILD systemd-236-r5.ebuild 13011 BLAKE2B fbd20030e965404f742538f6feb6e71476f6b9855b04ee11b097d5a675387fe5723c4d40a20def29b8c8688a3e3f69c9cb3d8908088e3df584d87fce667207ab SHA512 dd7c182df9ec7c3a2e7290b633e0cea06eb9076737b07637fbc9b54e6360376c5a48fd6fed5559e77efa433ea31c56110de1ba27614e8829b6c6fcd817702525
-EBUILD systemd-9999.ebuild 12952 BLAKE2B d071550632bd8f8eac868dcec8f91ee7b20bb8e3a910e51bf1716196a7d8178dab1a9b3b0d2b0a9a3a39b1677404c566d85fae71487301164615c2ae9cda087a SHA512 022c50400feb0c3b995e3382b80e7ab00fc88296735253137f50b503e790df3309c56c7f5b5180201f76b3c018004db1976f80d076bd6b3bcf3355d87ee2bf83
+EBUILD systemd-237-r1.ebuild 13020 BLAKE2B 9b514d8b1e871d19a2588c268390258516fee6458821c18fe86cd3397a03b532c3c3c3fb3eb63f1287ab1a372f0b57062c0462d4037329c4df9ca976e73b914c SHA512 7f011b2a72812d167303f8e9ab4fd24a32acaf1ec5a1175abf46fe9b4b4bb1311dc87ecb408c93414e8904e8428851de801e4511134994be6c1df3e47c5e4207
+EBUILD systemd-9999.ebuild 13020 BLAKE2B 9b514d8b1e871d19a2588c268390258516fee6458821c18fe86cd3397a03b532c3c3c3fb3eb63f1287ab1a372f0b57062c0462d4037329c4df9ca976e73b914c SHA512 7f011b2a72812d167303f8e9ab4fd24a32acaf1ec5a1175abf46fe9b4b4bb1311dc87ecb408c93414e8904e8428851de801e4511134994be6c1df3e47c5e4207
MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-237-r1.ebuild b/sys-apps/systemd/systemd-237-r1.ebuild
new file mode 100644
index 000000000000..97ed32eebe70
--- /dev/null
+++ b/sys-apps/systemd/systemd-237-r1.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ !<sys-libs/glibc-2.16
+ acl? ( sys-apps/acl:0= )
+ apparmor? ( sys-libs/libapparmor:0= )
+ audit? ( >=sys-process/audit-2:0= )
+ cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+ curl? ( net-misc/curl:0= )
+ elfutils? ( >=dev-libs/elfutils-0.158:0= )
+ gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+ http? (
+ >=net-libs/libmicrohttpd-0.9.33:0=
+ ssl? ( >=net-libs/gnutls-3.1.4:0= )
+ )
+ idn? (
+ libidn2? ( net-dns/libidn2 )
+ !libidn2? ( net-dns/libidn )
+ )
+ importd? (
+ app-arch/bzip2:0=
+ sys-libs/zlib:0=
+ )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+ nat? ( net-firewall/iptables:0= )
+ pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+ pcre? ( dev-libs/libpcre2 )
+ qrcode? ( media-gfx/qrencode:0= )
+ seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+ selinux? ( sys-libs/libselinux:0= )
+ xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+ >=sys-apps/baselayout-2.2
+ selinux? ( sec-policy/selinux-base-policy[systemd] )
+ sysv-utils? ( !sys-apps/sysvinit )
+ !sysv-utils? ( sys-apps/sysvinit )
+ !build? ( || (
+ sys-apps/util-linux[kill(-)]
+ sys-process/procps[kill(+)]
+ sys-apps/coreutils[kill(-)]
+ ) )
+ !sys-auth/nss-myhostname
+ !<sys-kernel/dracut-044
+ !sys-fs/eudev
+ !sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+ >=sys-apps/hwids-20150417[udev]
+ >=sys-fs/udev-init-scripts-25
+ policykit? ( sys-auth/polkit )
+ !vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils:0
+ dev-util/gperf
+ >=dev-util/intltool-0.50
+ >=sys-apps/coreutils-8.16
+ >=sys-kernel/linux-headers-${MINKV}
+ virtual/pkgconfig
+ gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+ test? ( sys-apps/dbus )
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt:0
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+ ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+ ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+ ~TIMERFD ~TMPFS_XATTR ~UNIX
+ ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+ ~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2"
+
+ use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+ use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+ kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+ kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ if linux_chkconfig_present X86; then
+ CONFIG_CHECK+=" ~DMIID"
+ fi
+ fi
+
+ if kernel_is -lt ${MINKV//./ }; then
+ ewarn "Kernel version at least ${MINKV} required"
+ fi
+
+ check_extra_config
+ fi
+}
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ default
+ [[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+ local PATCHES=(
+ )
+
+ [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+ if ! use vanilla; then
+ PATCHES+=(
+ "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+ "${FILESDIR}/gentoo-systemd-user-pam.patch"
+ "${FILESDIR}/gentoo-uucp-group-r1.patch"
+ "${FILESDIR}/gentoo-generator-path.patch"
+ )
+ fi
+
+ default
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
+ python_setup
+
+ multilib-minimal_src_configure
+}
+
+meson_use() {
+ usex "$1" true false
+}
+
+meson_multilib() {
+ if multilib_is_native_abi; then
+ echo true
+ else
+ echo false
+ fi
+}
+
+meson_multilib_native_use() {
+ if multilib_is_native_abi && use "$1"; then
+ echo true
+ else
+ echo false
+ fi
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --localstatedir="${EPREFIX}/var"
+ -Dpamlibdir="$(getpam_mod_dir)"
+ # avoid bash-completion dep
+ -Dbashcompletiondir="$(get_bashcompdir)"
+ # make sure we get /bin:/sbin in PATH
+ -Dsplit-usr=$(usex usrmerge false true)
+ -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
+ -Dsysvinit-path=
+ -Dsysvrcnd-path=
+ # Avoid infinite exec recursion, bug 642724
+ -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+ # no deps
+ -Defi=$(meson_multilib)
+ -Dima=true
+ # Optional components/dependencies
+ -Dacl=$(meson_multilib_native_use acl)
+ -Dapparmor=$(meson_multilib_native_use apparmor)
+ -Daudit=$(meson_multilib_native_use audit)
+ -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+ -Dlibcurl=$(meson_multilib_native_use curl)
+ -Delfutils=$(meson_multilib_native_use elfutils)
+ -Dgcrypt=$(meson_use gcrypt)
+ -Dgnu-efi=$(meson_multilib_native_use gnuefi)
+ -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dmicrohttpd=$(meson_multilib_native_use http)
+ $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+ -Dimportd=$(meson_multilib_native_use importd)
+ -Dbzip2=$(meson_multilib_native_use importd)
+ -Dzlib=$(meson_multilib_native_use importd)
+ -Dkmod=$(meson_multilib_native_use kmod)
+ -Dlz4=$(meson_use lz4)
+ -Dxz=$(meson_use lzma)
+ -Dlibiptc=$(meson_multilib_native_use nat)
+ -Dpam=$(meson_use pam)
+ -Dpcre2=$(meson_multilib_native_use pcre)
+ -Dpolkit=$(meson_multilib_native_use policykit)
+ -Dqrencode=$(meson_multilib_native_use qrcode)
+ -Dseccomp=$(meson_multilib_native_use seccomp)
+ -Dselinux=$(meson_multilib_native_use selinux)
+ #-Dtests=$(meson_multilib_native_use test)
+ -Ddbus=$(meson_multilib_native_use test)
+ -Dxkbcommon=$(meson_multilib_native_use xkb)
+ # hardcode a few paths to spare some deps
+ -Dpath-kill=/bin/kill
+ -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+ # Breaks screen, tmux, etc.
+ -Ddefault-kill-user-processes=false
+
+ # multilib options
+ -Dbacklight=$(meson_multilib)
+ -Dbinfmt=$(meson_multilib)
+ -Dcoredump=$(meson_multilib)
+ -Denvironment-d=$(meson_multilib)
+ -Dfirstboot=$(meson_multilib)
+ -Dhibernate=$(meson_multilib)
+ -Dhostnamed=$(meson_multilib)
+ -Dhwdb=$(meson_multilib)
+ -Dldconfig=$(meson_multilib)
+ -Dlocaled=$(meson_multilib)
+ -Dman=$(meson_multilib)
+ -Dnetworkd=$(meson_multilib)
+ -Dquotacheck=$(meson_multilib)
+ -Drandomseed=$(meson_multilib)
+ -Drfkill=$(meson_multilib)
+ -Dsysusers=$(meson_multilib)
+ -Dtimedated=$(meson_multilib)
+ -Dtimesyncd=$(meson_multilib)
+ -Dtmpfiles=$(meson_multilib)
+ -Dvconsole=$(meson_multilib)
+ )
+
+ if multilib_is_native_abi && use idn; then
+ myconf+=(
+ -Dlibidn2=$(usex libidn2 true false)
+ -Dlibidn=$(usex libidn2 false true)
+ )
+ else
+ myconf+=(
+ -Dlibidn2=false
+ -Dlibidn=false
+ )
+ fi
+
+ meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ eninja
+}
+
+multilib_src_test() {
+ eninja test
+}
+
+multilib_src_install() {
+ DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+ # meson doesn't know about docdir
+ mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+ einstalldocs
+ dodoc "${FILESDIR}"/nsswitch.conf
+
+ if use sysv-utils; then
+ local app
+ for app in halt poweroff reboot runlevel shutdown telinit; do
+ dosym ../bin/systemctl /sbin/${app}
+ done
+ dosym ../lib/systemd/systemd /sbin/init
+ else
+ # we just keep sysvinit tools, so no need for the mans
+ rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+ || die
+ rm "${ED%/}"/usr/share/man/man1/init.1 || die
+ fi
+
+ # Preserve empty dirs in /etc & /var, bug #437008
+ keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+ keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ keepdir /var/log/journal/remote
+
+ # Symlink /etc/sysctl.conf for easy migration.
+ dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+ # If we install these symlinks, there is no way for the sysadmin to remove them
+ # permanently.
+ rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+ rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+ rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+ rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+ rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+ rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+ rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
+
+ local udevdir=/lib/udev
+ use usrmerge && udevdir=/usr/lib/udev
+
+ rm -r "${ED%/}${udevdir}/hwdb.d" || die
+
+ if ! use usrmerge; then
+ # Avoid breaking boot/reboot
+ dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+ dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+ fi
+}
+
+migrate_locale() {
+ local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+ local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+ local locale_conf="${EROOT%/}/etc/locale.conf"
+
+ if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+ # If locale.conf does not exist...
+ if [[ -e ${envd_locale} ]]; then
+ # ...either copy env.d/??locale if there's one
+ ebegin "Moving ${envd_locale} to ${locale_conf}"
+ mv "${envd_locale}" "${locale_conf}"
+ eend ${?} || FAIL=1
+ else
+ # ...or create a dummy default
+ ebegin "Creating ${locale_conf}"
+ cat > "${locale_conf}" <<-EOF
+ # This file has been created by the sys-apps/systemd ebuild.
+ # See locale.conf(5) and localectl(1).
+
+ # LANG=${LANG}
+ EOF
+ eend ${?} || FAIL=1
+ fi
+ fi
+
+ if [[ ! -L ${envd_locale} ]]; then
+ # now, if env.d/??locale is not a symlink (to locale.conf)...
+ if [[ -e ${envd_locale} ]]; then
+ # ...warn the user that he has duplicate locale settings
+ ewarn
+ ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+ ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+ ewarn "and create the symlink with the following command:"
+ ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+ ewarn
+ else
+ # ...or just create the symlink if there's nothing here
+ ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+ ln -n -s ../locale.conf "${envd_locale_def}"
+ eend ${?} || FAIL=1
+ fi
+ fi
+}
+
+pkg_postinst() {
+ newusergroup() {
+ enewgroup "$1"
+ enewuser "$1" -1 -1 -1 "$1"
+ }
+
+ enewgroup input
+ enewgroup kvm 78
+ enewgroup render
+ enewgroup systemd-journal
+ newusergroup systemd-bus-proxy
+ newusergroup systemd-coredump
+ newusergroup systemd-journal-gateway
+ newusergroup systemd-journal-remote
+ newusergroup systemd-journal-upload
+ newusergroup systemd-network
+ newusergroup systemd-resolve
+ newusergroup systemd-timesync
+
+ systemd_update_catalog
+
+ # Keep this here in case the database format changes so it gets updated
+ # when required. Despite that this file is owned by sys-apps/hwids.
+ if has_version "sys-apps/hwids[udev]"; then
+ udevadm hwdb --update --root="${EROOT%/}"
+ fi
+
+ udev_reload || FAIL=1
+
+ # Bug 465468, make sure locales are respect, and ensure consistency
+ # between OpenRC & systemd
+ migrate_locale
+
+ systemd_reenable systemd-networkd.service systemd-resolved.service
+
+ if [[ ${FAIL} ]]; then
+ eerror "One of the postinst commands failed. Please check the postinst output"
+ eerror "for errors. You may need to clean up your system and/or try installing"
+ eerror "systemd again."
+ eerror
+ fi
+}
+
+pkg_prerm() {
+ # If removing systemd completely, remove the catalog database.
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+ fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f3e56e3d25d7..97ed32eebe70 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
inherit git-r3
else
- SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
fi
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
REQUIRED_USE="importd? ( curl gcrypt lzma )"
RESTRICT="!test? ( test )"
@@ -54,6 +54,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
nat? ( net-firewall/iptables:0= )
pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+ pcre? ( dev-libs/libpcre2 )
qrcode? ( media-gfx/qrencode:0= )
seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
selinux? ( sys-libs/libselinux:0= )
@@ -149,6 +150,8 @@ src_prepare() {
local PATCHES=(
)
+ [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
if ! use vanilla; then
PATCHES+=(
"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
@@ -158,8 +161,6 @@ src_prepare() {
)
fi
- [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
default
}
@@ -228,6 +229,7 @@ multilib_src_configure() {
-Dxz=$(meson_use lzma)
-Dlibiptc=$(meson_multilib_native_use nat)
-Dpam=$(meson_use pam)
+ -Dpcre2=$(meson_multilib_native_use pcre)
-Dpolkit=$(meson_multilib_native_use policykit)
-Dqrencode=$(meson_multilib_native_use qrcode)
-Dseccomp=$(meson_multilib_native_use seccomp)