From f65628136faa35d0c4d3b5e7332275c7b35fcd96 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Nov 2018 08:36:22 +0000 Subject: gentoo resync : 03.11.2018 --- sys-apps/Manifest.gz | Bin 50451 -> 50497 bytes sys-apps/colorized-logs/Manifest | 2 - sys-apps/colorized-logs/colorized-logs-2.3.ebuild | 24 -- sys-apps/etckeeper/Manifest | 2 +- .../etckeeper/files/etckeeper-1.18.6-gentoo.patch | 2 +- sys-apps/ethtool/Manifest | 4 +- sys-apps/ethtool/ethtool-4.17.ebuild | 14 - sys-apps/ethtool/ethtool-4.19.ebuild | 14 + sys-apps/fd/Manifest | 5 + sys-apps/fd/fd-7.2.0.ebuild | 95 +++++ sys-apps/file/Manifest | 2 +- sys-apps/file/file-5.34.ebuild | 2 +- sys-apps/iproute2/Manifest | 10 +- .../files/iproute2-4.16.0-configure-nomagic.patch | 191 --------- .../files/iproute2-4.17.0-configure-nomagic.patch | 207 ++++++++++ sys-apps/iproute2/iproute2-4.17.0-r1.ebuild | 153 +++++++ sys-apps/iproute2/iproute2-4.17.0.ebuild | 151 ------- sys-apps/iproute2/iproute2-4.18.0-r1.ebuild | 153 +++++++ sys-apps/iproute2/iproute2-4.18.0.ebuild | 151 ------- sys-apps/iproute2/iproute2-4.19.0-r1.ebuild | 153 +++++++ sys-apps/iproute2/iproute2-4.19.0.ebuild | 151 ------- sys-apps/iproute2/iproute2-9999.ebuild | 8 +- sys-apps/irqbalance/Manifest | 4 +- sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild | 4 +- sys-apps/irqbalance/irqbalance-1.5.0.ebuild | 62 +++ sys-apps/less/Manifest | 5 +- sys-apps/less/files/README.Gentoo | 22 - sys-apps/less/less-537.ebuild | 44 -- sys-apps/less/less-540-r1.ebuild | 44 ++ sys-apps/linux-misc-apps/Manifest | 2 + .../linux-misc-apps/linux-misc-apps-4.19.ebuild | 216 ++++++++++ sys-apps/osinfo-db/Manifest | 2 + sys-apps/osinfo-db/osinfo-db-20181011.ebuild | 27 ++ sys-apps/pv/Manifest | 2 +- sys-apps/pv/pv-1.6.6.ebuild | 4 +- sys-apps/systemd/Manifest | 16 +- sys-apps/systemd/files/238-initctl.patch | 46 --- sys-apps/systemd/files/238-libmount-include.patch | 72 ---- sys-apps/systemd/files/238-nspawn-wait.patch | 83 ---- sys-apps/systemd/files/238-sparc-raw-clone.patch | 42 -- .../systemd/files/238-timesync-connection.patch | 49 --- sys-apps/systemd/systemd-236-r5.ebuild | 437 -------------------- sys-apps/systemd/systemd-238-r7.ebuild | 440 -------------------- sys-apps/systemd/systemd-239-r1.ebuild | 448 --------------------- sys-apps/systemd/systemd-239-r2.ebuild | 448 +++++++++++++++++++++ sys-apps/systemd/systemd-239.ebuild | 446 -------------------- sys-apps/sysvinit/Manifest | 2 + sys-apps/sysvinit/files/inittab-2.91 | 61 +++ sys-apps/sysvinit/sysvinit-2.91-r1.ebuild | 117 ++++++ sys-apps/util-linux/Manifest | 5 +- sys-apps/util-linux/util-linux-2.32.1-r1.ebuild | 296 ++++++++++++++ sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild | 288 +++++++++++++ sys-apps/util-linux/util-linux-2.33_rc2.ebuild | 234 ----------- sys-apps/util-linux/util-linux-9999.ebuild | 70 +++- sys-apps/xinetd/Manifest | 1 - sys-apps/xinetd/files/xinetd-2.3.14-config.patch | 9 - 56 files changed, 2438 insertions(+), 3104 deletions(-) delete mode 100644 sys-apps/colorized-logs/colorized-logs-2.3.ebuild delete mode 100644 sys-apps/ethtool/ethtool-4.17.ebuild create mode 100644 sys-apps/ethtool/ethtool-4.19.ebuild create mode 100644 sys-apps/fd/fd-7.2.0.ebuild delete mode 100644 sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch create mode 100644 sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch create mode 100644 sys-apps/iproute2/iproute2-4.17.0-r1.ebuild delete mode 100644 sys-apps/iproute2/iproute2-4.17.0.ebuild create mode 100644 sys-apps/iproute2/iproute2-4.18.0-r1.ebuild delete mode 100644 sys-apps/iproute2/iproute2-4.18.0.ebuild create mode 100644 sys-apps/iproute2/iproute2-4.19.0-r1.ebuild delete mode 100644 sys-apps/iproute2/iproute2-4.19.0.ebuild create mode 100644 sys-apps/irqbalance/irqbalance-1.5.0.ebuild delete mode 100644 sys-apps/less/files/README.Gentoo delete mode 100644 sys-apps/less/less-537.ebuild create mode 100644 sys-apps/less/less-540-r1.ebuild create mode 100644 sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild create mode 100644 sys-apps/osinfo-db/osinfo-db-20181011.ebuild delete mode 100644 sys-apps/systemd/files/238-initctl.patch delete mode 100644 sys-apps/systemd/files/238-libmount-include.patch delete mode 100644 sys-apps/systemd/files/238-nspawn-wait.patch delete mode 100644 sys-apps/systemd/files/238-sparc-raw-clone.patch delete mode 100644 sys-apps/systemd/files/238-timesync-connection.patch delete mode 100644 sys-apps/systemd/systemd-236-r5.ebuild delete mode 100644 sys-apps/systemd/systemd-238-r7.ebuild delete mode 100644 sys-apps/systemd/systemd-239-r1.ebuild create mode 100644 sys-apps/systemd/systemd-239-r2.ebuild delete mode 100644 sys-apps/systemd/systemd-239.ebuild create mode 100644 sys-apps/sysvinit/files/inittab-2.91 create mode 100644 sys-apps/sysvinit/sysvinit-2.91-r1.ebuild create mode 100644 sys-apps/util-linux/util-linux-2.32.1-r1.ebuild create mode 100644 sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild delete mode 100644 sys-apps/util-linux/util-linux-2.33_rc2.ebuild delete mode 100644 sys-apps/xinetd/files/xinetd-2.3.14-config.patch (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 537cf0cc8f90..74a722a37500 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest index a84307a61a5d..f57aac5d2790 100644 --- a/sys-apps/colorized-logs/Manifest +++ b/sys-apps/colorized-logs/Manifest @@ -1,5 +1,3 @@ -DIST colorized-logs-2.3.tar.gz 10270 BLAKE2B 3b0798139e96512b4d544c76bcbece81283a77dd7deca8b018bb0ddd9535eb80f88b8f10a9a9a20c4f98b67cc97bb7673de80339bcc45c5ce46b8e8dfe53a53b SHA512 a15616f0548c0a91dc290fb6a9c6a8376b66ebc2fb1af21e1caed03c95c07b8536d8a81dd9e199d54ffa5339d0f777cabe75e23fda3bb916575fe3ac31bf51f9 DIST colorized-logs-2.4.tar.gz 10918 BLAKE2B 767d635155ebb66e212888c8e61e2ab65be665497a84c8820aa8183a5d94d30c9f2b653c16131916a907cb369d3b88a004573ae9eeaa1fda954cee239fa6da05 SHA512 5ac5734409f06262ad470a87e215c305f805a5701a604f1fc744632a25e4a1b8dd9c878897f72ad434b71ebe300c6d676cd53760a34f48b8202a62c765dcbe3f -EBUILD colorized-logs-2.3.ebuild 654 BLAKE2B 071c425ab82afe77eeebbf396dc06febd8b517a700ed4f33ac84ca4489fee4c09f714763c4e4a46edc410330df9b8854a9039218da8c9ef606402e00311804bb SHA512 0b3354ed6b78821856f61b70a9925ee2bb27972a44c1982bd287a539674bfb7c961016f3d8685a751b4a1e3262c7fb2753bc0faa3ed143eb335d7e9abb5b8bc3 EBUILD colorized-logs-2.4.ebuild 651 BLAKE2B 4d089afa28f4db7169f37e9cfd82bb275ef88939ef83d68d2e1448c16d3319701219af3e60d137279aac1b76bc8b5755e00cbd7fa27c536729cdbcb03a26812f SHA512 88c9b0cd17393496e6f735fbb228e8c44643ab7c3949b969fbef06cd52955ab0e9969a5f26e995e3fb11bf9731392feb071230c5f199f878b269d9fa6dc34200 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a diff --git a/sys-apps/colorized-logs/colorized-logs-2.3.ebuild b/sys-apps/colorized-logs/colorized-logs-2.3.ebuild deleted file mode 100644 index 0e22beb33d1e..000000000000 --- a/sys-apps/colorized-logs/colorized-logs-2.3.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="Tools for logs with ANSI color" -HOMEPAGE="https://github.com/kilobyte/colorized-logs/" -SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_install() { - cmake-utils_src_install - # Rename to not collide with dev-python/ansi2html - mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die - mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die -} diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index ebdafb433448..eb949ab87139 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,6 +1,6 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c -AUX etckeeper-1.18.6-gentoo.patch 2812 BLAKE2B 4df25391aad119d6c01cb4e35cf83a1105c7f125079b3bb3418f8b7c6cff52400eeceff8cfe5785eb968b6c4a3e9fd1112fe1fd7b654982141d9a0b7596d0ce1 SHA512 2f399e12c7bbeef539fd846532068c18fd0becdab505cbe56759c6eb7f9c4463eff49526858ffa745d4bc50619685dab81811db257506f9b537bbd7af9986958 +AUX etckeeper-1.18.6-gentoo.patch 2588 BLAKE2B 38f0b3cf6ecc2b47b59d6eee3d081f47e79cd0ebd4b3d0099a893257275fa8f7803da6b3aea7a90232632aa4106a2a8b9477bb9a78e200635958de7c8b3db93b SHA512 eb2d8f7eca7d5731518aec24c931aebe8a70f22a049d88f002d7649809762d82619b4c0bbc47a6207f2e018fc35bc497c30308adbfa7b62b4191f105cf5aeb40 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c DIST etckeeper-1.18.7.tar.gz 77568 BLAKE2B 168b5b683c25a60c6626a678aed2f650106d4db554acbc239a2cd3c937f4b399ccca4f28fded30175c5787d8bd0907a25d62e6566e7902a2e914cd01513a8c2e SHA512 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch index a229683bbb01..247f98ede828 100644 --- a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch +++ b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch @@ -27,7 +27,7 @@ index 0d268bd..81214c7 100644 -HIGHLEVEL_PACKAGE_MANAGER=apt +#HIGHLEVEL_PACKAGE_MANAGER=apt + -+# Gentoo specific: ++# Gentoo specific: +# For portage this is emerge +# For paludis this is cave +HIGHLEVEL_PACKAGE_MANAGER=emerge diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest index 52b73b56eb01..c32403e67f7c 100644 --- a/sys-apps/ethtool/Manifest +++ b/sys-apps/ethtool/Manifest @@ -1,7 +1,7 @@ DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d19d02c09b6370b1cf92c5c8a6e97f5048c98dfbb3a72b8c5889302538d8f11b9771120724b53949f9aedd11c6 SHA512 d0f881b88379b959cd34949c924b0e4d4fb1af0873192cdf8ec9cc2d2d677a4de13021efabb0a1aea1932ef38a6952d9f3eb040c478a9af770054a6170777789 -DIST ethtool-4.17.tar.xz 221516 BLAKE2B f2548b3cc89898024b884c94c2b6be110c39aac450f0f2e2bbf7b2e4908318d5110e6cfbc5f19073d0b930970ad768aad8549fb8bce432e14edd7a125084c9a0 SHA512 9c8f72e32c480ec4ece7ca49acb8af668989e1e32fb1e6b884bbb6f2ffefc2a5241b5f278766e51ab01772b4f7437d7556354583c5bb63fc59ac6daecb046e8e DIST ethtool-4.18.tar.xz 221708 BLAKE2B 8ec40fee81ffd2f1b27aafd30b062bb0afd86b653d9b9fb863c4b81dd97b21d8241f98554e4bb2956eaaa1b46067fd75415860e937fbf2adeeece17b652e8e2b SHA512 e77f9967be4634955640d9dccbc539455d333bcbad61326617dffea32cfd13a72a7dda4087caf6fff41b49c9ce476435cc1310e131705d0ad402685e10b4fb0e +DIST ethtool-4.19.tar.xz 221932 BLAKE2B 5a44d30b5b426ad89f41545617d9b36133fff8aa6c6bb0d5adacc4f5fef4e81f693ab620403a5d107d6abad177492b7adc406dc4b082c343938c228562f46f67 SHA512 5b0b83e09799a04e401563e34c4c784029803ecf83d5ba4f3a9cc92bfc7c2bc9cb0d86cb76ac9a7ffbfb379f6a0fc4bc3e0cf9b7826971e46504052e40156abd EBUILD ethtool-4.13.ebuild 453 BLAKE2B 039558a1279ee3cbfb7c11005761705fd30f8248d97cd79d089be6d7e9b27aec8f9cba28ed58bc6f80e2a33877dee10e67ddf09211d27b30371e2e2fffdfb81c SHA512 46b487cd70ed8f5bfb656a9371ef185f46761c4dcc1ad2f9cbbc20abbc5c9e2d32f6f3a52f0ae709b2444ab8514d4ada9cf66b5fdec88c342bf6ca367cd525a4 -EBUILD ethtool-4.17.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc EBUILD ethtool-4.18.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc +EBUILD ethtool-4.19.ebuild 458 BLAKE2B 638d77d13e63cc61c023c3bb6242073799b36bebcab6b3039943a500c6494f4cddfc8b57965ddc658b827963b2f72a1a9ed5bd40fdf03259f1471d4d87266830 SHA512 bdd8d430d07f3439cc9e5bc7b60fb1c280fa41ff4eb3577561ad612cba5093a67cd5cb5588589bd16f4e0ea2c34889c78f6ce878a96768584d20e0c8612c7eae MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272 diff --git a/sys-apps/ethtool/ethtool-4.17.ebuild b/sys-apps/ethtool/ethtool-4.17.ebuild deleted file mode 100644 index 373b38775050..000000000000 --- a/sys-apps/ethtool/ethtool-4.17.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" - -DEPEND="app-arch/xz-utils" diff --git a/sys-apps/ethtool/ethtool-4.19.ebuild b/sys-apps/ethtool/ethtool-4.19.ebuild new file mode 100644 index 000000000000..7b4ac9c2bac8 --- /dev/null +++ b/sys-apps/ethtool/ethtool-4.19.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" + +DEPEND="app-arch/xz-utils" diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest index 156a264228ae..13bdb874d7da 100644 --- a/sys-apps/fd/Manifest +++ b/sys-apps/fd/Manifest @@ -17,12 +17,15 @@ DIST ctrlc-3.1.1.crate 12110 BLAKE2B d6dcf6c132d64e5450c834c1e5c032f33be6fbcf226 DIST diff-0.1.11.crate 8165 BLAKE2B 6c651d00120b190b55b334c780ce7724e91f554cf3d85f99d8ae5f745bf4ced2e5b7d7aa307c6d0c2a6082534d238eb213868d3b528ea57a08a5e37ddc7051b8 SHA512 9c31d38bc29c9372984339b8d289317981ba483eee4430e936252b0fc44b1f500305082b19e6dc20b7d7fc81906f1c0d5c3f375b6db9f2c266e41c7015597073 DIST fd-7.0.0.tar.gz 49631 BLAKE2B af4cc42656fb238be5378ca7c0999b4004c6d00dc9cc8b8c9ccd5fbdf1bbd30a32d4f4d8c4d638a7e61827313466aad7b30d8aa14687c8a3435bbc70f2bc95df SHA512 d13a7ab1f5e4523bbd1c66f7ef00dbcdadb91acd047d82a3741992fa3140bd1774418175cf1e017eeff3ae3de4abd8594f3510d3a3c1069f3012d9b141adb2c1 DIST fd-7.1.0.tar.gz 53611 BLAKE2B aab494b67c2ad5271ae9c4331ba1c35c0644e8b13d84023e0f82b50ae5db4edcf52185ae8d4ef86b412ae30e26ace4bba380738fcc5b19ddbc8889e47b8774af SHA512 f203a61633ed7f84821755427b6c09944ca084c895709b379d0baf74033204b0cf93f2de9d7536cc74888e349e77c18ea150c41b86e25f79be43d6d2e49a93a1 +DIST fd-7.2.0.tar.gz 56838 BLAKE2B 526d5b7388593236810aefb3110da059db6f6a8c33884880f2424847dde30e13a4926ec5bfba97d9614f493fb9173822077daa358f4e55f78ea6d9784c9be721 SHA512 22823904e4a1645a6f248501e507cad6ef08341ac69d0e9675571a202fa2316fe6c85b274fc958676da6a8e26399b26bdb78fdca876146b0e91b4780948d8ca2 DIST fd-find-7.0.0.crate 46024 BLAKE2B 4279d093e72f42cc635729a377f11984dc7b3b96161503f6f6ee844e8bf11fbb3ef575b24b9e68504ba3c802839c02f0e35e4497994a2a4f49d00b580acefaa8 SHA512 2f5ceb1d15cab45dc8a47e036fbcd9a754ae968ac7efd9592b72d801cb6ea03afdf1159c64d6b5868faba2258ab0509d23fe834df1e5ef3f978a0107141293d2 +DIST filetime-0.2.1.crate 11797 BLAKE2B fa8f886afa7f7fea0f543e425bc06ab0bdbfbaccafb7a5bf5234fa1a3433d90398dc42bb24832132d042032e20042495fdc2763f81b8b7244c6b8d8a5e660367 SHA512 749770e2b484c7d1e94beec490ceef2552b7294e3cb5ea67033488800babf7d48898b5d6a0874b113dfe95004322476553249d57349dfc3cb575c26d4ebf5a9d DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf DIST globset-0.4.1.crate 22363 BLAKE2B 8a2c7fbe083bfdb470866bc954579f50944c11d4460ef3d2115f7e523935ba8375c1073346f42d564d1d55f32e4e8fe51fe42fa2e5c31697bd943befefe7c303 SHA512 3cc7fb4b296ebc8c0a20d8080a9cf913ec61f2ed14bd45c2aebd0c73101514b3895123a93c5e1b5037362a74e18057fd6deefb5c91ff3880aa88ca0e1fb9095c +DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6 DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a DIST ignore-0.4.3.crate 42827 BLAKE2B 0ce4296d6a16b2b3f17e2e79c372325408f2ffcbf617024720b600843e91499f00088a74b377e98deb712f0b9aa38c19cfc44857f47f5ad21b7736a4f342de0d SHA512 a4372de85ee945e68c503e743f28621d88e19facd2ec0af5dd2cfccc45c8ad25abc655c16020427a4357bd0c07f48348ccd2d19dc7d6b9046d13fcb33973a06a DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b @@ -36,6 +39,7 @@ DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422 DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874 DIST nix-0.9.0.crate 103078 BLAKE2B 762ad75889409f76f74ba486c20bdd990d03d463d68c128a0e6cef98ef3aa4ff5340b3d4c3f06919af53cae4d4782d234b444d3bd2891ef0ffca7c26d0c1c47a SHA512 e9a2ef99c63cfa8d818ca5c41d8cb1472494fac60f86bda0c7646c5835a2c1ee92c10840c8c8da28044215bfc06b97881f57f602e8da5a55daad146b8bc10988 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8 +DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3 DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48 @@ -77,4 +81,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 EBUILD fd-7.0.0.ebuild 1751 BLAKE2B 58b8d0be57486033c999bb28ab76f433712931a78e9ac7ee2a3273944813ff8caf20221018a26fc575609a039adda346d78c040fe792a9bbed89f874cfb2272f SHA512 479a588899c23188a0e9d983a6b5cd094978ac675c8bf13321073f8ae33c4c3521e515e4499dc1c297b16b8a28c3854a3ab51fbf61fb0749bbc2e9273bb905f6 EBUILD fd-7.1.0.ebuild 1749 BLAKE2B fae1daa95e6e94c91dfc62083b1a864636838932b8ac3dcc179d75e98ef61012117f6c7d320b8b702556ef5c6ef1b131d7652d197c0fc1f956c54595d557b15a SHA512 af6b9f86b63ae35efa5d7f80ab03591c3c74b9b39dcb1f3be1fb3f0162771f76fb741a7ff92a62a881ba16d1b4f94c0af0d412be34d3ec8dc37c1ff8e061dd04 +EBUILD fd-7.2.0.ebuild 1842 BLAKE2B 168cc9f3647d43c528914a06a1ff01fa27383d1fe6e96ea8028ef7d54c0bca56f080960ca7609c790b0f3938e3ee8e96796b01f49a669519c2f40b1d22bbfca9 SHA512 e2b1fb71984bfd6e60e26acf95773499a30f7816d6798cef6db814b05f294a51a071921d3ce0c1c6dc2c0d55f53bf70a11e700a3e721c79578e53ca5d4bb5385 MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758 diff --git a/sys-apps/fd/fd-7.2.0.ebuild b/sys-apps/fd/fd-7.2.0.ebuild new file mode 100644 index 000000000000..d237a8bd631e --- /dev/null +++ b/sys-apps/fd/fd-7.2.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CRATES=" +aho-corasick-0.6.6 +ansi_term-0.11.0 +atty-0.2.11 +bitflags-1.0.3 +cc-1.0.18 +cfg-if-0.1.5 +clap-2.32.0 +crossbeam-0.3.2 +ctrlc-3.1.1 +diff-0.1.11 +filetime-0.2.1 +fnv-1.0.6 +fuchsia-zircon-0.3.3 +fuchsia-zircon-sys-0.3.3 +globset-0.4.1 +humantime-1.1.1 +ignore-0.4.3 +kernel32-sys-0.2.2 +lazy_static-1.1.0 +libc-0.2.43 +log-0.4.4 +memchr-2.0.1 +nix-0.11.0 +num_cpus-1.8.0 +quick-error-1.2.2 +rand-0.4.3 +redox_syscall-0.1.40 +redox_termios-0.1.1 +regex-1.0.2 +regex-syntax-0.6.2 +remove_dir_all-0.5.1 +same-file-1.0.2 +strsim-0.7.0 +tempdir-0.3.7 +term_size-0.3.1 +termion-1.5.1 +textwrap-0.10.0 +thread_local-0.3.6 +ucd-util-0.1.1 +unicode-width-0.1.5 +utf8-ranges-1.0.0 +vec_map-0.8.1 +version_check-0.1.4 +void-1.0.2 +walkdir-2.2.0 +winapi-0.2.8 +winapi-0.3.5 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit bash-completion-r1 cargo + +DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases" +HOMEPAGE="https://github.com/sharkdp/fd" +SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris ${CRATES})" + +LICENSE="|| ( MIT Apache-2.0 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +DEPEND=">=virtual/rust-1.20.0" +RDEPEND="${DEPEND}" + +QA_FLAGS_IGNORED="/usr/bin/fd" + +src_compile() { + export SHELL_COMPLETIONS_DIR="${T}/shell_completions" + cargo_src_compile +} + +src_install() { + cargo_src_install + + newbashcomp "${T}"/shell_completions/fd.bash fd + insinto /usr/share/zsh/site-functions + doins "${T}"/shell_completions/_fd + insinto /usr/share/fish/vendor_completions.d + doins "${T}"/shell_completions/fd.fish + dodoc README.md + doman doc/*.1 +} + +src_test() { + cargo test -j $(makeopts_jobs) $(usex debug "" --release) -v || die "tests failed" +} diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index fcd4cd899084..87e74186a3cd 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -5,7 +5,7 @@ DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f0 DIST file-5.34.tar.gz 840219 BLAKE2B 20f34684e583d1cb42967f1106d979a42f55fd78097e26929ab4e6cd470b0d3a12c9f1fad89c982ed42869455ba0f3381c812ed00c31112e5ad17edcd50783e0 SHA512 57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8 DIST file-5.35.tar.gz 865425 BLAKE2B 325b95bc45b8e21b568ad816f8c1817dc170f56b78e460ac9bb18c70f22df2491c37f7f9c38c3d85010a7a609e75c26b19b6adef208137cb04c4c40fbe8c1d05 SHA512 cbecc52e9209be8bc090752d0672efa181625d4e1e688e63edd1f5657b29bad69364a477fb4ed85d1fa413b8002c8578c86153d2acaaecce78446c0ca6ea9e38 EBUILD file-5.33-r4.ebuild 3325 BLAKE2B 4d3d5d900cde2eff2fa7c79ab577ce8fa6eb7e3379b0e8d4ca6978f7c551be6d046d2ff9f8f50ad9309f2facdd67ed4140a45e13ba5958bb4ee3968f18d2fe06 SHA512 8b69bec29f3b7dd8c1102bf52683c4195a26d2feaba4437767755084aa7768d5c2331c2ff8b3b2f8c956b8b8d348a421e9572b19f0028682e8fd2c9974257363 -EBUILD file-5.34.ebuild 3163 BLAKE2B 77e1d9c8ae1dfee7000bc3fab05e4a33f5cdc5542740d99c117088723d5c386b2953b472e1fcac9a6dd4cdffa6e6b9dfba6ad6b737ee397ca0acbf774b1e6bf0 SHA512 edd22a3dad896132e1ac435c5ae6a9f10ab0e11c5f554aee56a2eb256b513fe2583cf191cf8f6e7936c483a2f113654b7e40b03ce0b5d3b1b2f4f89da29893d0 +EBUILD file-5.34.ebuild 3162 BLAKE2B e672a888646666f4277f88bb8eecb63515a79623068d0f716f92e646395bb8d5a880acae3bfeb6296d98fac14768b58d546ac3dc7a5ece3f6ae54152fce3232a SHA512 f34a5dc3dbce7402ff0832c5f4beaa69657b4309711babd4e1eab499464b4e05a6b1de878a8abee4f50c8c7e265649391b083b421e1f9d7952f2ceb7776fe308 EBUILD file-5.35.ebuild 3170 BLAKE2B 38bedde390c583373f64786ea8105e197ed13631c2506fbb33d959391f0396c875631e16926954a4f4f3d2733e4902971ec22cf199cb22c98393728e756ca5d9 SHA512 61654de52a638abd61051bc3a2bc551373906d18feea41b948f91702c0ad04b00770d99a72c0dc49c5540bb87cf25329dc9784ac29e53892fe1565280d10c257 EBUILD file-9999.ebuild 3259 BLAKE2B 786b89386f6070703ad7cbe15f93cce4ec2073a59c74db596c728e9fda8f6cb23b8023f8b482f33130f01a06742e7581b02e07ac812c944a586c842952161a36 SHA512 b1cb4176878e92d18ba2e63038d1b6ff271265a02a4e13f3c6319b1c81e0abc40cb595f5318d5b3116f949d24d9053d8ad9d39f4941520ea4ce5d5efccc9fc40 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a diff --git a/sys-apps/file/file-5.34.ebuild b/sys-apps/file/file-5.34.ebuild index 9d3bb9d660ca..8d6b96093d65 100644 --- a/sys-apps/file/file-5.34.ebuild +++ b/sys-apps/file/file-5.34.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit autotools git-r3 else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="identify a file's format by scanning binary data for patterns" diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 2f6dba93e2ed..9429617ffdef 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -3,7 +3,7 @@ AUX iproute2-4.11.0-no-ipv6.patch 1360 BLAKE2B 43881c76622159e6ae7f7499eddfc251b AUX iproute2-4.14.1-configure-nomagic.patch 7334 BLAKE2B d1a79a653cdaa5907bc93a4283aa1576ec31d3d31a13898c7d923365c1f5068c5a76e52b33bfe2b9a190c273e35fb2125788bbd56ea03b4c01965c029660464b SHA512 0d09bc0a11ec32483a10db7e42a1620087f75063ce8bc24fed30f490eed2ee01d19bd092fb6cd392735c0c9434b13f70d562a469ed3d8a3b51b7fb25ceaf5af6 AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28 AUX iproute2-4.14.1-posix-shell.patch 1841 BLAKE2B ba1ab797c264dc74180b85f842810af120462df3e15523f132b67968f7be0ae68086d9c01f33cc70fb7680ce2229c76960fe7a232ce6bd1069903976c7143349 SHA512 bb4c3c75c25ec551fe006ae15a0e3bc31c1f49861083894d6d51320be52dbac60634951332135b888faf9363857b53695f3cc418029445a4578b5e9233aec4f3 -AUX iproute2-4.16.0-configure-nomagic.patch 5104 BLAKE2B 49c1cb559afe12eccae26f4547bcbcf8a030ee37d1ef287c178f55f01472e3b5f04d14f25834c99d3df25fae06246086197bd11446f1f50970aecc261b595f08 SHA512 b46d7ec009f924cae2d32c16e0f45c49ddb68af70dfa5d1fc0806c2ede85c744261fd1157d8ac4b1b1455604de456e2f68075b838b42265c3bfa88c021752de1 +AUX iproute2-4.17.0-configure-nomagic.patch 5654 BLAKE2B b56f7a3a02822c99a1f2c7ca1bcd0af633dc2f57d454c44dabd81b923f43afee1dfdfffda1d1293c101041316c8496275d773c2495f73817fb4ff90d0a85daed SHA512 97f35b0e8a93e5570fdade6a47864518686a358c9c6b5a55832d66baae628140015a90418b49b8426f66011c8b8a9dc7713d89c3e0e45938b3dc948a92350d42 AUX iproute2-4.2.0-no-ipv6.patch 1336 BLAKE2B bafb155e6bbd902eb0fff7d8875cc4ef7956de0071273dd373ebd09ef46ba23eb22f4226a044585faa2a00c9e4c2854e57e0e06eb1ac735edea9dce2721cadcc SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5 @@ -12,9 +12,9 @@ DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd8 DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73 EBUILD iproute2-4.14.1-r4.ebuild 4275 BLAKE2B d8d6a43be5eb593ab7107bff4126cda9f41fff88ccb72fd4d3aee7464457739732b2e3a161114302f7e1d9ff18a5b3c7d73a92ed523254ff4857584bc2baa109 SHA512 ae5db8ad15d20df0ec18e2703d43be081189366f535ff700d83da449eed8c120df869a6d2873e817e07bd2920eea46387bda0866ccce0b48d0e7a71e8faa8752 -EBUILD iproute2-4.17.0.ebuild 4198 BLAKE2B 5f9c2cb3e058550c4412e400d6ecae7cac784a66641e8c11417f98aaec35a82451ac3f185f896631dcd752296fc6d7a41b3105d9ea682e13a353268ea46c089a SHA512 4bd00acc93f0012114aa74de44756dbc2dc88a1246a988479a0c0537a990c74f37ab3d4e3ae8bf3fc3cf2c1aea097e96b6f37bf0b57835c7b835dab9e305af5f -EBUILD iproute2-4.18.0.ebuild 4214 BLAKE2B 4c6a9d68cb27d3b41e8da00e1fc25c083c5277706186414d407c9000b4343dfaad8913ee640e9060b1e9acda5ed43fa642631ab3b2bf8c3a956ed1ae68cebd0f SHA512 30839985403cbda2401bccfb822d394590508836e0e780bf321f64235f372819225afbbd4dcf4ec3d05992435408ebcaba401bb7c7f2872f5e474bb2b3566f5b -EBUILD iproute2-4.19.0.ebuild 4211 BLAKE2B 66b66715368e3dcf1f0cbd3115f11bb397cf5a56434284b6d8dc9d07cb1633286358084840c7e197b6b969070d7ff77985c7c18a2859e17bb97750c2b020ebac SHA512 b70c2105b6f196aeffb5bc3c8242f2bbd631ae1bc97e64ee2d4e3868b4ced0c457f3324e23f26b4d4208d70046a2080067c42cb912ac97a490fe5988111bcb90 +EBUILD iproute2-4.17.0-r1.ebuild 4265 BLAKE2B 12f2034aebd08983d8349dfa07935bfbeb04126b2af45c1a88c00e7a40ff865fb00e498955aa2f0e6a0e1c55e702d281f653b1cf9817e8bdeebc21b8e79b1fbe SHA512 e46431a3827de15fe0d0bd4837a66f378c3e4bc067ca29ae5292faa2bcda10b3bfc79e1eedc31ab4f38db8d245750bc9de9733202e87a2a974bef2cff60640dd +EBUILD iproute2-4.18.0-r1.ebuild 4278 BLAKE2B bedd85f0cfac4e0db1e210067f287bd4be04e89d6623373ed61097ce91e59636f00ef68a1a39335dc43335e5ca6d3e5ab94091084ae6fc703b7fa939305ca15f SHA512 a71917519ea3a8cff82a3eb5f50cb71723bd3749d2dfa7d7e7a5fa4db27325a14880d9b108ef4bbe450553c65f4711f73f94208acc19b12263cd97ebd9bafa18 +EBUILD iproute2-4.19.0-r1.ebuild 4278 BLAKE2B bedd85f0cfac4e0db1e210067f287bd4be04e89d6623373ed61097ce91e59636f00ef68a1a39335dc43335e5ca6d3e5ab94091084ae6fc703b7fa939305ca15f SHA512 a71917519ea3a8cff82a3eb5f50cb71723bd3749d2dfa7d7e7a5fa4db27325a14880d9b108ef4bbe450553c65f4711f73f94208acc19b12263cd97ebd9bafa18 EBUILD iproute2-4.4.0.ebuild 3883 BLAKE2B 40d441c04e746f197263fa22f5b7bdd3302daa94896103311773feae8c68b193ee9d8c46659aaced6525f1af1bde444f1c6963e4807c7123f795fee530dccd1b SHA512 a751a4d91b63dea7cf43ec0532bffb795291d7ec9c04f762691e4e6cad9e47ce24895f315cc3ccfc11c30cfee94e66f855c477c3f95850f7c546dfd6675ad9eb -EBUILD iproute2-9999.ebuild 4246 BLAKE2B 256792b60179fb5d92d0b66871edaf53e41f31fd664593e757638c771004e875e01370cd13ed78b623d165d5be152ce7f174f02573b184177d623e73b0cb7099 SHA512 06dc3174d116d4f191beebf14df1b62765eb3ce34cf41d3cb0b78de8d4216f38875ac539740aa0c7c79f8b0cbe1ea1bcca8fda30d4471682dc103c6423272ba5 +EBUILD iproute2-9999.ebuild 4310 BLAKE2B 0569ce4999daa8315da5fa8692ad3bef4623133ea91c8520950b14c0dabeb63f922fbdda33ddad194b44ea205554a61afe225a28f9e5711bb501f3add3fd2f7d SHA512 d70a72670a882f7b1ecc13018e993282a0d532d3d8a8e024d8ab655746daf00d7316ab71ec9caad15c1d9195ba25aea722adb1b73a0753f77fefe48516f03e71 MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97 diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch deleted file mode 100644 index 01a1fe2d812f..000000000000 --- a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch +++ /dev/null @@ -1,191 +0,0 @@ -The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets -a variable as well as modifying CFLAGS & LDLIBS. - -If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks -are still in place. - -Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they -are only passed when correctly needed. - -Prior Gentoo testcase for reproduction: -USE=minimal ebuild ... compile. -- Linking with libelf & libmnl based only on presence. -- Links based on libselinux based only on presence. - -Closes: https://bugs.gentoo.org/643722 -Signed-off-by: Robin H. Johnson - -Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler - ---- iproute2-4.16.0/bridge/Makefile -+++ iproute2-4.16.0/bridge/Makefile -@@ -2,6 +2,7 @@ - BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o - - include ../config.mk -+include ../config.include - - all: bridge - ---- iproute2-4.16.0/config.include -+++ iproute2-4.16.0/config.include -@@ -0,0 +1,22 @@ -+# We can only modify CFLAGS/LDLIBS after all the config options are known. -+ifeq ($(IP_CONFIG_SETNS),y) -+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) -+endif -+ifeq ($(HAVE_ELF),y) -+ CFLAGS += $(HAVE_ELF_CFLAGS) -+ LDLIBS += $(HAVE_ELF_LDLIBS) -+endif -+ifeq ($(HAVE_SELINUX),y) -+ CFLAGS += $(HAVE_SELINUX_CFLAGS) -+ LDLIBS += $(HAVE_SELINUX_LDLIBS) -+endif -+ifeq ($(HAVE_MNL),y) -+ CFLAGS += $(HAVE_MNL_CFLAGS) -+ LDLIBS += $(HAVE_MNL_LDLIBS) -+endif -+ -+# Rules can only be declared after all variables in them are known. -+%.o: %.c -+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< -+ -+# vim: ft=make: ---- iproute2-4.16.0/configure -+++ iproute2-4.16.0/configure -@@ -212,7 +212,7 @@ - then - echo "IP_CONFIG_SETNS:=y" >>$CONFIG - echo "yes" -- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG -+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG - else - echo "no" - fi -@@ -257,8 +257,8 @@ - echo "HAVE_ELF:=y" >>$CONFIG - echo "yes" - -- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG -- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG -+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG -+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG - else - echo "no" - fi -@@ -272,8 +272,8 @@ - echo "HAVE_SELINUX:=y" >>$CONFIG - echo "yes" - -- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG -- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG -+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG -+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG - else - echo "no" - fi -@@ -286,8 +286,8 @@ - echo "HAVE_MNL:=y" >>$CONFIG - echo "yes" - -- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG -- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG -+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG -+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG - else - echo "no" - fi -@@ -426,7 +426,3 @@ - - echo -n "libcap support: " - check_cap -- --echo >> $CONFIG --echo "%.o: %.c" >> $CONFIG --echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG ---- iproute2-4.16.0/devlink/Makefile -+++ iproute2-4.16.0/devlink/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - TARGETS := - ---- iproute2-4.16.0/genl/Makefile -+++ iproute2-4.16.0/genl/Makefile -@@ -2,6 +2,7 @@ - GENLOBJ=genl.o - - include ../config.mk -+include ../config.include - SHARED_LIBS ?= y - - CFLAGS += -fno-strict-aliasing ---- iproute2-4.16.0/ip/Makefile -+++ iproute2-4.16.0/ip/Makefile -@@ -15,6 +15,7 @@ - RTMONOBJ=rtmon.o - - include ../config.mk -+include ../config.include - - ALLOBJ=$(IPOBJ) $(RTMONOBJ) - SCRIPTS=ifcfg rtpr routel routef ---- iproute2-4.16.0/lib/Makefile -+++ iproute2-4.16.0/lib/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - CFLAGS += -fPIC - ---- iproute2-4.16.0/misc/Makefile -+++ iproute2-4.16.0/misc/Makefile -@@ -5,6 +5,7 @@ - TARGETS=ss nstat ifstat rtacct lnstat - - include ../config.mk -+include ../config.include - - ifeq ($(HAVE_BERKELEY_DB),y) - TARGETS += arpd ---- iproute2-4.16.0/netem/Makefile -+++ iproute2-4.16.0/netem/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - DISTGEN = maketable normal pareto paretonormal - DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist ---- iproute2-4.16.0/rdma/Makefile -+++ iproute2-4.16.0/rdma/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - TARGETS := - ---- iproute2-4.16.0/tc/Makefile -+++ iproute2-4.16.0/tc/Makefile -@@ -4,6 +4,7 @@ - emp_ematch.yacc.o emp_ematch.lex.o - - include ../config.mk -+include ../config.include - - SHARED_LIBS ?= y - ---- iproute2-4.16.0/tipc/Makefile -+++ iproute2-4.16.0/tipc/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - TARGETS := - diff --git a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch new file mode 100644 index 000000000000..30b5db3bc3c1 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch @@ -0,0 +1,207 @@ +The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets +a variable as well as modifying CFLAGS & LDLIBS. + +If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks +are still in place. + +Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they +are only passed when correctly needed. + +Prior Gentoo testcase for reproduction: +USE=minimal ebuild ... compile. +- Linking with libelf, libmnl & libcap based only on presence. +- Links based on libselinux based only on presence. + +Closes: https://bugs.gentoo.org/643722 +Signed-off-by: Robin H. Johnson + +Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler +Added libcap to v4.17.0 by Lars Wendler + +--- iproute2-4.17.0/bridge/Makefile ++++ iproute2-4.17.0/bridge/Makefile +@@ -2,6 +2,7 @@ + BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o + + include ../config.mk ++include ../config.include + + all: bridge + +--- iproute2-4.17.0/config.include ++++ iproute2-4.17.0/config.include +@@ -0,0 +1,26 @@ ++# We can only modify CFLAGS/LDLIBS after all the config options are known. ++ifeq ($(IP_CONFIG_SETNS),y) ++ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) ++endif ++ifeq ($(HAVE_ELF),y) ++ CFLAGS += $(HAVE_ELF_CFLAGS) ++ LDLIBS += $(HAVE_ELF_LDLIBS) ++endif ++ifeq ($(HAVE_SELINUX),y) ++ CFLAGS += $(HAVE_SELINUX_CFLAGS) ++ LDLIBS += $(HAVE_SELINUX_LDLIBS) ++endif ++ifeq ($(HAVE_MNL),y) ++ CFLAGS += $(HAVE_MNL_CFLAGS) ++ LDLIBS += $(HAVE_MNL_LDLIBS) ++endif ++ifeq ($(HAVE_CAP),y) ++ CFLAGS += $(HAVE_CAP_CFLAGS) ++ LDLIBS += $(HAVE_CAP_LDLIBS) ++endif ++ ++# Rules can only be declared after all variables in them are known. ++%.o: %.c ++ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< ++ ++# vim: ft=make: +--- iproute2-4.17.0/configure ++++ iproute2-4.17.0/configure +@@ -212,7 +212,7 @@ + then + echo "IP_CONFIG_SETNS:=y" >>$CONFIG + echo "yes" +- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG ++ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG + else + echo "no" + fi +@@ -257,8 +257,8 @@ + echo "HAVE_ELF:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG +- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG ++ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG ++ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG + else + echo "no" + fi +@@ -272,8 +272,8 @@ + echo "HAVE_SELINUX:=y" >>$CONFIG + echo "yes" + +- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG +- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG + else + echo "no" + fi +@@ -286,8 +286,8 @@ + echo "HAVE_MNL:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG ++ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG ++ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG + else + echo "no" + fi +@@ -343,8 +343,8 @@ + echo "HAVE_CAP:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG ++ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG ++ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG + else + echo "no" + fi +@@ -426,7 +426,3 @@ + + echo -n "libcap support: " + check_cap +- +-echo >> $CONFIG +-echo "%.o: %.c" >> $CONFIG +-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG +--- iproute2-4.17.0/devlink/Makefile ++++ iproute2-4.17.0/devlink/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-4.17.0/genl/Makefile ++++ iproute2-4.17.0/genl/Makefile +@@ -2,6 +2,7 @@ + GENLOBJ=genl.o + + include ../config.mk ++include ../config.include + SHARED_LIBS ?= y + + CFLAGS += -fno-strict-aliasing +--- iproute2-4.17.0/ip/Makefile ++++ iproute2-4.17.0/ip/Makefile +@@ -15,6 +15,7 @@ + RTMONOBJ=rtmon.o + + include ../config.mk ++include ../config.include + + ALLOBJ=$(IPOBJ) $(RTMONOBJ) + SCRIPTS=ifcfg rtpr routel routef +--- iproute2-4.17.0/lib/Makefile ++++ iproute2-4.17.0/lib/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + CFLAGS += -fPIC + +--- iproute2-4.17.0/misc/Makefile ++++ iproute2-4.17.0/misc/Makefile +@@ -5,6 +5,7 @@ + TARGETS=ss nstat ifstat rtacct lnstat + + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_BERKELEY_DB),y) + TARGETS += arpd +--- iproute2-4.17.0/netem/Makefile ++++ iproute2-4.17.0/netem/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + DISTGEN = maketable normal pareto paretonormal + DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist +--- iproute2-4.17.0/rdma/Makefile ++++ iproute2-4.17.0/rdma/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-4.17.0/tc/Makefile ++++ iproute2-4.17.0/tc/Makefile +@@ -4,6 +4,7 @@ + emp_ematch.yacc.o emp_ematch.lex.o + + include ../config.mk ++include ../config.include + + SHARED_LIBS ?= y + +--- iproute2-4.17.0/tipc/Makefile ++++ iproute2-4.17.0/tipc/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + diff --git a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild new file mode 100644 index 000000000000..29261b7f6ae1 --- /dev/null +++ b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 caps elf +iptables ipv6 minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl ) + caps? ( sys-libs/libcap ) + 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 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 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 +) + +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 "/^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 \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 + + # 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_CAP := $(usex caps 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 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + EOF +} + +src_compile() { + emake V=1 +} + +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.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild deleted file mode 100644 index 03a8a55c50ad..000000000000 --- a/sys-apps/iproute2/iproute2-4.17.0.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# 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 elf +iptables ipv6 minimal selinux" - -# 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 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 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722 -) - -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 "/^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 \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 - - # 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 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_compile() { - emake V=1 -} - -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.18.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild new file mode 100644 index 000000000000..fe34c36583b5 --- /dev/null +++ b/sys-apps/iproute2/iproute2-4.18.0-r1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 caps elf +iptables ipv6 minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl ) + caps? ( sys-libs/libcap ) + 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 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 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 +) + +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 "/^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 \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 + + # 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_CAP := $(usex caps 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 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + EOF +} + +src_compile() { + emake V=1 +} + +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.18.0.ebuild b/sys-apps/iproute2/iproute2-4.18.0.ebuild deleted file mode 100644 index 7d284f1e5446..000000000000 --- a/sys-apps/iproute2/iproute2-4.18.0.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2018 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 elf +iptables ipv6 minimal selinux" - -# 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 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 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722 -) - -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 "/^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 \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 - - # 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 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_compile() { - emake V=1 -} - -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.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild new file mode 100644 index 000000000000..fe34c36583b5 --- /dev/null +++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 caps elf +iptables ipv6 minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl ) + caps? ( sys-libs/libcap ) + 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 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 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 +) + +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 "/^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 \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 + + # 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_CAP := $(usex caps 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 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + EOF +} + +src_compile() { + emake V=1 +} + +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.19.0.ebuild b/sys-apps/iproute2/iproute2-4.19.0.ebuild deleted file mode 100644 index e35ecc5e6ec1..000000000000 --- a/sys-apps/iproute2/iproute2-4.19.0.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# 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 elf +iptables ipv6 minimal selinux" - -# 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 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 - "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722 -) - -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 "/^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 \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 - - # 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 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_compile() { - emake V=1 -} - -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-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index c70b80f70382..f9527624933e 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb elf +iptables ipv6 minimal selinux" +IUSE="atm caps 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 ) + caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) @@ -43,7 +44,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 ) src_prepare() { @@ -101,6 +102,7 @@ src_configure() { # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest index 5175b28398ff..3011a4c48e03 100644 --- a/sys-apps/irqbalance/Manifest +++ b/sys-apps/irqbalance/Manifest @@ -3,6 +3,8 @@ AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c6 AUX irqbalance.init.4 524 BLAKE2B 473ee234adf186f620ec022cf20d61b3aaec368611659ce29be47e1038a0d54e4c353264326353cfbca9e43486e4b9bff17086c8484357512dbd9dc74997ff06 SHA512 3b438b142915139d403f6162271e00807db6f0e9432798b3f2955e798dd58ecb07a6c8920cc85032e65cc5a6d4c16fc65402119d6334920ea6715c4f918f6cbc DIST irqbalance-1.3.0.tar.gz 53225 BLAKE2B 01820d3a3e465896823927dfb43655c4c5efd1eb043a25b438d7b0802c5a6dd7a966825cfb1e71a32d47eca41b72260ba29190e49d9f585c4bf70b676db75c81 SHA512 6328d3e419689192a9dce99ccfd803aaf3ad0e766498e63da1c8c5fbbd7ef669b94fa4102b841fa7aca3729ca595f72c05a0ae4373922fb340b6832648de12c4 DIST irqbalance-1.4.0.tar.gz 53431 BLAKE2B 35271fab011cb917e5472079025f88df45142b0622d94570f62ef7cce7f2a4e9c9c0b77a79121afa5e7edf4510707c7ace52e894b2af44a5a26b543160f481d0 SHA512 d95909c5e86efa452d0d440df0335b398bd2bf973d6a84e29068534f8c4dc033df90913bf507a6d1b7cdab11b288bafbd2c88b4e476f04e32d5f4c89efe4f7d9 +DIST irqbalance-1.5.0.tar.gz 55150 BLAKE2B b111e9fd4cfec968b261f6ae8a6876d15845849ebf28d7304fd8af3bdeb93b8b9a626888c5728b69925f02a5e472c3512f5862726c6ae9a4d378c46ebcf39069 SHA512 343421fd533d7d161fd05a0edfadaddf1da6ced854a19e9f10ea6c12b97b2ef1629aad855214d9700d31d056bb816bf3ec90cdf7c643a1b6e8af1de5befa64f5 EBUILD irqbalance-1.3.0.ebuild 1339 BLAKE2B 9f78de3dbbcf32ae2ac58dbd27462451e802c0b5d0d1c8bd43d598611f8901584c724438cd31a94776b82a8f09455ea34610e4ecd29efb777a3e1541517dbb68 SHA512 d41e57841284df007f65fb30ef653b824594d337d178fd51164c646a5b05080c3d5a20a084435d21a0593b7b572d5b28903860fb539a2e2ad80615efd9cc81c3 -EBUILD irqbalance-1.4.0-r1.ebuild 1378 BLAKE2B 33bd7d885601927c4cf8257f3221740720e89fc377eed6b902fb07b434316957aa6b8003c1b4fb62d5297bdad9627849f77b375ea8462ce4ac71430379730e98 SHA512 525ea4f2d8568468302141fd24bba7857cede16098a6f591e77403b529290c39776f8ec8e5efc608c92f82a5f2ea41f6c01b0a0a989950c3e8a55fca62c57ce3 +EBUILD irqbalance-1.4.0-r1.ebuild 1374 BLAKE2B e391ae237bf015788b1ffa76201b8d0a7e7f92d9e1000497a1a6152cc95023953722fa5899a578fa3c593752cffabd8917e535904d1c95a8b34c725ed28226f6 SHA512 a3c87cfbdc20d5a822876cb03c8677c3d86355257dc3c8cd8885da487531de5cb4891dadec99a353a6a12f27c6a60110ad097b5d20ba800a427a50c35cc23449 +EBUILD irqbalance-1.5.0.ebuild 1325 BLAKE2B 5031bb519a52565a6c9423a8f4c89942bfd318a0d6163bf39b663d9a80c1154bde8023ca27a94a5e3d391b71c6520bd94e001cb9799800fca9324713db47a743 SHA512 80eef9318ea50679ae4a39c15e7ebab095f26e0d021a906a160958f4ca0e3460251a396d980de69876499249a793754714f9997f0d542346a520118acd2231ed MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04 diff --git a/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild index c3874ddf72d9..7b44df67003a 100644 --- a/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild +++ b/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" IUSE="caps +numa selinux tui" CDEPEND=" diff --git a/sys-apps/irqbalance/irqbalance-1.5.0.ebuild b/sys-apps/irqbalance/irqbalance-1.5.0.ebuild new file mode 100644 index 000000000000..1a0cac954ef8 --- /dev/null +++ b/sys-apps/irqbalance/irqbalance-1.5.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit autotools systemd linux-info + +DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system" +HOMEPAGE="https://github.com/Irqbalance/irqbalance" +SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="caps +numa selinux tui" + +CDEPEND=" + dev-libs/glib:2 + caps? ( sys-libs/libcap-ng ) + numa? ( sys-process/numactl ) + tui? ( sys-libs/ncurses:0=[unicode] ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-irqbalance ) +" + +pkg_setup() { + CONFIG_CHECK="~PCI_MSI" + linux-info_pkg_setup +} + +src_prepare() { + # Follow systemd policies + # https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy + sed \ + -e 's/ $IRQBALANCE_ARGS//' \ + -e '/EnvironmentFile/d' \ + -i misc/irqbalance.service || die + + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with caps libcap-ng) + $(use_enable numa) + $(use_with tui irqbalance-ui) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance + newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance + systemd_dounit misc/irqbalance.service +} diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index bbd26c35f402..c7916e87a1eb 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,12 +1,11 @@ -AUX README.Gentoo 823 BLAKE2B d4920f827b4c0c210715f4f05c1365c3388b01ca41e8e08add41f6784c89e9f26296ca2b71d0bcc22f58a773c602dac4bd9a7361bd6173501db4ceb24a9a3926 SHA512 fe18f4f5bac70f31ca833cb25d4f1aecde03c3993495ab964cc67f0e52737e3d04aa2263eff26ded279121cc346ef77738743943b5b092c9586c5622ee3a6c92 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd823a8f5a00a110df3492d299b04a66b003528549991c0b87e1ee80835a0383667991b6a8bba50 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10 DIST less-531.tar.gz 340466 BLAKE2B 6ac75b623fce478114d18cff429659499fedf4ef1a7bb067465ace91c28a7968efb224a4994a1e376a8cf40b110492f10ecda634628029107b38187044a0cd1e SHA512 180b665f194d7cc40d4bbb37bd64b10be463c0705e81795bef84b20dbba1c61825bb3e3da8bcd79f9176bb3af7b1f4e4c3dfe0829a5a2195a11f5b42294daca1 -DIST less-537.tar.gz 341608 BLAKE2B 87425a8c0779f88d6f9029ae7ffde944d68f095dc4113a07839a523f76c96cb29bc1c076b6a0a64685ed75f86b37b47e75102663fef014027dcf1e8459c97b18 SHA512 2c4b8d2fb76843c68ee4401c373d3c01cce591a425d002d885f208b8dd4c822c5f2ee52b2fde29a5c366ed1f48cd73679c70a8329acd1cb2866a76a58b4e2063 DIST less-538.tar.gz 341589 BLAKE2B ce2c451da4f25e1fd93c738817f92fb12453b3091b34f8162ff11645a0bc223ca158ed3facb5eac611799117c8d20c14597abd5a0924a4f39d1ac18cd4afb638 SHA512 55012727f855de1c5e451dead0533e0d8505c0c829ff4f624bfadee998278ca372f201e1f58c23f09e0c4a2d424a17fcce6d3ebb18dd1c3bb757f5ccd8aaa330 +DIST less-540.tar.gz 342724 BLAKE2B d5184ae3e44ea111d9a3fc87166779cf19ac63b26b25ff149610fd5728e20457c9469fff885759a1230b831b0c306569179c2a1e25c6c15c85604855726e3153 SHA512 1cee065b9a16db74ef0ccdffa149071bf66dd40d82c3d5581b0a7706f75ed4afaf4beca9e5d928d20605e390d5b0a6c1b346a67d8abb90d93bf140cbe03d435d EBUILD less-530.ebuild 1381 BLAKE2B 13673dbd46b697128c6db8ff626dbb90ccf8ece61472cd0388f6ba10eeda57b4c4e3c084729b81230423fbd96342ec19f251a4168575f83209afdda6cec10a67 SHA512 e787c5b63dcf1d2a2dc80d843bc5e674596ad992220849557ec6ffd93ba53f9279cd21fb02cd652ba2fa0c0d0ada2c6dfcf18198194c0089f770da3a4a40980a EBUILD less-531.ebuild 1408 BLAKE2B 70268fa7b95805f7c8d5837537e378a881b383c104d5c264b2113554a926659319e1457c470eb6ce1d2215fb2409e2d296643086ff7ca5666c4aa54b996050dd SHA512 7c4b7197acf8d0bc99fb4b3ed5fae4d1a85517d9e70b051fe093597eea640346f03107d0e383bd1e4f23359d2eddf5d6081099b68c103a8146dcd20611ed119c -EBUILD less-537.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc EBUILD less-538.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc +EBUILD less-540-r1.ebuild 1420 BLAKE2B eb6835cbf7f1874c6ac461d1e8f506bb010f8acaa9eb075d28c67b910ea4209f508a9c5de372cbbe65da1b809e89fdd2112f2c3178990e3a348daba5525a0c08 SHA512 cd357d2d6a5b63121fa7bd3265ab5d85bf171afd71bd384d6f4aa6d8789c061ad3e39988144777dbe340e3ef6123eaf2b6238a48b89e7b3e45a98d332cd853a3 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/less/files/README.Gentoo b/sys-apps/less/files/README.Gentoo deleted file mode 100644 index dca832808f1e..000000000000 --- a/sys-apps/less/files/README.Gentoo +++ /dev/null @@ -1,22 +0,0 @@ -This version of less comes with some Gentoo enhancements: - - default lesspipe.sh script to "view" files - - colorization support - -To see what file types are supported, just read the /usr/bin/lesspipe.sh -script (it's just a plain text bash script). - -Colorization support is disabled by default. To enable it, export the -LESSCOLOR variable to "yes": - $ export LESSCOLOR=yes - -We also provide a colorization script, 'code2color', that is used by -default. If you wish to use another script, simply export the LESSCOLORIZER -variable to name of the script: - $ export LESSCOLORIZER=some-other-script - -If you want to use the code2color script and the default color schemes are -not acceptable, you can develop your own schemes and save them in one of -the following places: - /etc/code2color - ~/.code2color - CODE2COLOR_CONFIG env var diff --git a/sys-apps/less/less-537.ebuild b/sys-apps/less/less-537.ebuild deleted file mode 100644 index c4d58efa2269..000000000000 --- a/sys-apps/less/less-537.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Excellent text file viewer" -HOMEPAGE="http://www.greenwoodsoftware.com/less/" -SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="pcre unicode" - -DEPEND=">=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2:0= - pcre? ( dev-libs/libpcre )" -RDEPEND="${DEPEND}" - -src_configure() { - export ac_cv_lib_ncursesw_initscr=$(usex unicode) - export ac_cv_lib_ncurses_initscr=$(usex !unicode) - local myeconfargs=( - --with-regex=$(usex pcre pcre posix) - --with-editor="${EPREFIX}"/usr/libexec/editor - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newbin "${FILESDIR}"/lesspipe.sh lesspipe - newenvd "${FILESDIR}"/less.envd 70less -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-483-r1" ; then - elog "The lesspipe.sh symlink has been dropped. If you are still setting" - elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." - elog "Colorization support has been dropped. If you want that, check out" - elog "the new app-text/lesspipe package." - fi -} diff --git a/sys-apps/less/less-540-r1.ebuild b/sys-apps/less/less-540-r1.ebuild new file mode 100644 index 000000000000..3bc3bf389320 --- /dev/null +++ b/sys-apps/less/less-540-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Excellent text file viewer" +HOMEPAGE="http://www.greenwoodsoftware.com/less/" +SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="pcre unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:0= + pcre? ( dev-libs/libpcre2 )" +RDEPEND="${DEPEND}" + +src_configure() { + export ac_cv_lib_ncursesw_initscr=$(usex unicode) + export ac_cv_lib_ncurses_initscr=$(usex !unicode) + local myeconfargs=( + --with-regex=$(usex pcre pcre2 posix) + --with-editor="${EPREFIX}"/usr/libexec/editor + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newbin "${FILESDIR}"/lesspipe.sh lesspipe + newenvd "${FILESDIR}"/less.envd 70less +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-483-r1" ; then + elog "The lesspipe.sh symlink has been dropped. If you are still setting" + elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." + elog "Colorization support has been dropped. If you want that, check out" + elog "the new app-text/lesspipe package." + fi +} diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest index 17d4a0b0f29b..8ca55d09081a 100644 --- a/sys-apps/linux-misc-apps/Manifest +++ b/sys-apps/linux-misc-apps/Manifest @@ -4,9 +4,11 @@ AUX hpfall.confd 144 BLAKE2B 9abe0f8d8a3454d88aaa00c186b4513045cbdc96a7b1679780f AUX hpfall.initd 1098 BLAKE2B 0f854ffc7ee8649ca04aec13aaac0709ced20dcdf1981b9ad23076c9d97c0f8e2119ce9c40744b5af5d79f2680986f993f8a6680878b8dc153efa733e6528b72 SHA512 64c716255d8ecc5828d7c54b4aef9406353e2d3a2f0965882342344c533bebf7826b4a76e58263b974dfc1162b49688e2009eeb5a467e4361ab8241d23a028d7 DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 DIST linux-3.6.tar.bz2 82296001 BLAKE2B 454e1c86dd5b7d2f9ff8ba777feda3743b620ecf4325c06b7270b2b1f60d2af2797836b509252e7140980ab0ba620d8fc98dd5d3968d19f8101c9327af262eef SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 +DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e EBUILD linux-misc-apps-3.18.ebuild 4978 BLAKE2B 4c09d901e4b791679f4803d1cd6d794d20644e61946211e60b1f25c7e137ed0f3526b6df50562dc7435dddb8378ee4e62301fa156257554c8e3d7b534782b6a3 SHA512 3467e5f785f114e4030d4826485a4c4510a94d7e211fe65c475235efe7046329036ce657b3fb535da80c8b81da4f41ae273b6a8035d1fdd4b3a2518b69b0daf5 EBUILD linux-misc-apps-3.6-r2.ebuild 5061 BLAKE2B ee39fcd10e0fbfe0f46d78b2bd78c60fe49f053a1b49f9845f026e8d58ff26303fe1de52c5c166e3fffd4fe37e30e1992f2a907658082b8878eea2fac451b816 SHA512 7d69ae7fbf372dd5b93010e5875216d0e430778dc4589ed930c108c2e7524719aa1fb830cb7af8a688ce30a1b24c285033528c307c75ca91dc8f20f98e955121 +EBUILD linux-misc-apps-4.19.ebuild 6290 BLAKE2B ae19e5b4c7f79920e524e13baf594bb38a0b4680cd3d0162e57e8b6015c826e2f58af7fd8d968de37e1bdce45771513b9ea69b2e3827eb22034d029a4259a39c SHA512 54162973f094624dff8ca3e5611fd3f77d25269b43fccd503d867064563fff1fe6424352318c4c4646976c4357e19855bd6ca553db97088bdaafcd9dfcbb6c1e EBUILD linux-misc-apps-4.4-r1.ebuild 6319 BLAKE2B a914fa773d8f70b55cbaf7331413fc81d8c81c219e081d10ca750f29a3a6928d8cbf9e77e54de6b61a70618e6175b378f6034d7d5f7f8ac256f5247e3f803f47 SHA512 9a4e12c44d0faa1910c4f7ad60fea624f2070e75baadf3fa675827331dd5a84c1bf3a9e57315baf9ed309b5ea2f7c73590fd1bc8173672f83c22372893c7fac7 EBUILD linux-misc-apps-4.4.ebuild 5477 BLAKE2B 3444ab2a9b4b44b96f121015795f4e5d3b288acc221901868c8358d96f2407dcf8067da7428c4363a467580fa2ee05f654a81280776045692f682dbfec8bba48 SHA512 dc9992b78dcdbcbd2548ad3fa520588e7980a03af1e1743f2afe62ec4d643b810693b4d4254e7de18f17f049cd6947943825227ee21ddcbc4d17e3313aa0f4ff MISC metadata.xml 318 BLAKE2B 87a15c795438a1025ba5624d0c00bfc1e3de3172205b20a4cdb27d5a0d524bc35d1aeb64e58b8c5fadd08d151a82913c35454c36ee5e653da86a6031ab707d24 SHA512 c5b90254b92fd0bd40596718daed1e9b5fd2c0039a814932811e33fb6827eac660aadd324bd45117d60ca56148b2f8213a075be1b255d6e8c006e2702f76833d diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild new file mode 100644 index 000000000000..cd2873bba20d --- /dev/null +++ b/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic + +DESCRIPTION="Misc tools bundled with kernel sources" +HOMEPAGE="https://kernel.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="static-libs tcpd usbip" + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-pre/-git}" + +LINUX_V=$(get_version_component_range 1-2) + +if [ ${PV/_rc} != ${PV} ]; then + LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1)) + PATCH_VERSION=$(get_version_component_range 1-3) + LINUX_PATCH=patch-${PV//_/-}.xz + SRC_URI="mirror://kernel/linux/kernel/v3.x/testing/${LINUX_PATCH} + mirror://kernel/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}" +elif [ $(get_version_component_count) == 4 ]; then + # stable-release series + LINUX_VER=$(get_version_component_range 1-3) + LINUX_PATCH=patch-${PV}.xz + SRC_URI="mirror://kernel/linux/kernel/v3.x/${LINUX_PATCH}" +else + LINUX_VER=${PV} +fi + +LINUX_SOURCES=linux-${LINUX_VER}.tar.xz +SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v3.x/${LINUX_SOURCES}" + +# pmtools also provides turbostat +# usbip available in seperate package now +RDEPEND="sys-apps/hwids + >=dev-libs/glib-2.6 + >=sys-kernel/linux-headers-$(get_version_component_range 1-2) + usbip? ( + !net-misc/usbip + tcpd? ( sys-apps/tcp-wrappers ) + virtual/libudev + ) + !sys-power/pmtools" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/linux-${LINUX_VER}" + +# All of these are integrated with the kernel build system, +# No make install, and ideally build with with the root Makefile +TARGETS_SIMPLE=( + samples/watchdog/watchdog-simple.c + tools/accounting/getdelays.c + tools/cgroup/cgroup_event_listener.c + tools/laptop/freefall/freefall.c + tools/testing/selftests/networking/timestamping/timestamping.c + tools/vm/slabinfo.c + usr/gen_init_cpio.c + # Broken: + #tools/lguest/lguest.c # fails to compile + #tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere + #tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header +) +# tools/vm/page-types.c - broken, header path issue +# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace +# Documentation/networking/ifenslave.c - obsolete +# Documentation/ptp/testptp.c - pending linux-headers-3.0 + +# These have a broken make install, no DESTDIR +TARGET_MAKE_SIMPLE=( + samples/mei:mei-amt-version + tools/firewire:nosy-dump + tools/iio:iio_event_monitor + tools/iio:iio_generic_buffer + tools/iio:lsiio + tools/laptop/dslm:dslm + tools/power/x86/turbostat:turbostat + tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy + tools/thermal/tmon:tmon +) +# tools/perf - covered by dev-utils/perf +# tools/usb - testcases only +# tools/virtio - testcaes only + + #for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do +src_unpack() { + unpack ${LINUX_SOURCES} + + MY_A= + for _AFILE in ${A}; do + [[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue + [[ ${_AFILE} == ${LINUX_PATCH} ]] && continue + MY_A="${MY_A} ${_AFILE}" + done + [[ -n ${MY_A} ]] && unpack ${MY_A} +} + +src_prepare() { + if [[ -n ${LINUX_PATCH} ]]; then + epatch "${DISTDIR}"/${LINUX_PATCH} + fi + + pushd tools/usb/usbip/ >/dev/null && + sed -i 's/-Werror[^ ]* //g' configure.ac && + eautoreconf -i -f -v && + popd >/dev/null || die "usbip" + + sed -i \ + -e '/^nosy-dump.*LDFLAGS/d' \ + -e '/^nosy-dump.*CFLAGS/d' \ + -e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \ + "${S}"/tools/firewire/Makefile +} + +kernel_asm_arch() { + a="${1:${ARCH}}" + case ${a} in + # Merged arches + x86|amd64) echo x86 ;; + ppc*) echo powerpc ;; + # Non-merged + alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;; + *) die "TODO: Update the code for your asm-ARCH symlink" ;; + esac +} + +src_configure() { + if use usbip; then + pushd tools/usb/usbip/ || die + econf \ + $(use_enable static-libs static) \ + $(use tcpd || echo --without-tcp-wrappers) \ + --with-usbids-dir=/usr/share/misc + popd + fi +} + +src_compile() { + local karch=$(kernel_asm_arch "${ARCH}") + # This is the minimal amount needed to start building host binaries. + #emake allmodconfig ARCH=${karch} + #emake prepare modules_prepare ARCH=${karch} + #touch Module.symvers + + # Now we can start building + append-cflags -I./tools/lib + for s in ${TARGETS_SIMPLE[@]} ; do + dir=$(dirname $s) src=$(basename $s) bin=${src%.c} + einfo "Building $s => $bin" + emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c} + done + + for t in ${TARGET_MAKE_SIMPLE[@]} ; do + dir=${t/:*} target_binfile=${t#*:} + target=${target_binfile/:*} binfile=${target_binfile/*:} + [ -z "${binfile}" ] && binfile=$target + einfo "Building $dir => $binfile (via emake $target)" + emake -C $dir ARCH=${karch} $target + done + + if use usbip; then + emake -C tools/usb/usbip + fi +} + +src_install() { + into /usr + for s in ${TARGETS_SIMPLE[@]} ; do + dir=$(dirname $s) src=$(basename $s) bin=${src%.c} + einfo "Installing $s => $bin" + dosbin ${dir}/${bin} + done + + for t in ${TARGET_MAKE_SIMPLE[@]} ; do + dir=${t/:*} target_binfile=${t#*:} + target=${target_binfile/:*} binfile=${target_binfile/*:} + [ -z "${binfile}" ] && binfile=$target + einfo "Installing $dir => $binfile" + dosbin ${dir}/${binfile} + done + + if use usbip; then + pushd tools/usb/usbip/ >/dev/null || die "usbip" + emake DESTDIR="${D}" install + newdoc README README.usbip + newdoc AUTHORS AUTHORS.usbip + popd >/dev/null + dodoc drivers/usb/usbip/usbip_protocol.txt + fi + + mv -f "${D}"/usr/sbin/{,iio_}generic_buffer + + newconfd "${FILESDIR}"/freefall.confd freefall + newinitd "${FILESDIR}"/freefall.initd freefall + prune_libtool_files +} + +pkg_postinst() { + echo + elog "The cpupower utility is maintained separately at sys-power/cpupower" + elog "The lguest utility no longer builds, and has been dropped." + elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed" + if find /etc/runlevels/ -name hpfall ; then + ewarn "You must change hpfall to freefall in your runlevels!" + fi + if use usbip; then + elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client" + elog "machine's kernel config and USBIP_HOST on the server." + fi +} diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest index f1d25b41e26f..ea8fb3f5e214 100644 --- a/sys-apps/osinfo-db/Manifest +++ b/sys-apps/osinfo-db/Manifest @@ -1,7 +1,9 @@ DIST osinfo-db-20180531.tar.xz 70868 BLAKE2B 919a2767d24af91e9aa7b14f3a238b9239aa774bec04233c95929981531d1fabb24ebfdc5c92ab401f51cf6bbf2432b6e8486a833d06a96a51e1893f39f6f641 SHA512 48b3bd2e52c16829f70d62ad8b1f32313956fcb7085cd906965f1d7b12f61952c60123ef335fbd4a1dd86aebc9751b9bf44f71c61f4bb6ac9bcb30d514ac36a9 DIST osinfo-db-20180612.tar.xz 71356 BLAKE2B 3dcf9d843d32eb4e5be7cda47e8c8d123939b381d41f0596d8fd5794c64130b1fed39b367a1f6b58c34e91b5a38811af54066311ece209cbcaf268d1f032e55c SHA512 02c92bca33ae35abe28fb575c73ab96fedf5652e7822a10a213f084390b3d863e3ea83469d8a2bbf6ed69328803d48f2f35a1e45f938ca698a63e08b82c05e9d DIST osinfo-db-20180720.tar.xz 73976 BLAKE2B 23f92ba745f0e21ae839ab1bdfec7128dd33d60871f90cfc37c74b1720cfa74c04c63b609283cb5f1b10e5211f7be931478c4dcc6ed683f40100a371311b2e77 SHA512 9c62c1427ca71931984f9edb80d2784a40596d9000b91b70d66ad4a9956a50a57ec1b38de9a56e2d4889cbdec9cceda68e6a9ede49d6fea0bb0f35326350d6b3 +DIST osinfo-db-20181011.tar.xz 77900 BLAKE2B dcfbac56772d24ff416b1432404d5be82b9683bf2f3a3d7a6cdd730a07b0953b3acfdefff436dbe8339dc9dd2bbd628f1aa5871ce83a6f114c899f5e37e49df1 SHA512 0ea06d7356f1a89d98bda0c2a47b1b4c3a34059ee00e1160b7571239f4095154ddda91e3d0ae798dcbb2279fd7a3ea9099a65ef304785fe208bcdab47bc9aaa4 EBUILD osinfo-db-20180531.ebuild 671 BLAKE2B c2911f510895eb36e53bb93ecbc8914cbbfdec31c836f6828688ac022aa3f0dcba8fd22effde1238736bb2b5029404e232933eac6bcd41ce1b9c1ac28a0c5a7a SHA512 1ededfeaa0e2271d861deab2b9ed94eae3c6fa323af8b50b850a8ccd3d2f9128f6701252ccedf80c385a0f4d1dbfa979859fbd4b74d92a8b786c92de8da4a453 EBUILD osinfo-db-20180612.ebuild 674 BLAKE2B 1e05c5e43f9bd1b9caa05505d8f2e14eaca4605fcf00e857baf4810a5038dbed48ab7c9de19732f22c649d85d9a9588aefecddbeef9e7c1499523d39ab7330b3 SHA512 fb407f5ae28e4309b92836504ed11c819e4b9a12509527b4030300a8826a9c54d7491544d771c84a5e93b1a844b3c3accae6e1159cecc5e385ea0ec29a918179 EBUILD osinfo-db-20180720.ebuild 674 BLAKE2B 1e05c5e43f9bd1b9caa05505d8f2e14eaca4605fcf00e857baf4810a5038dbed48ab7c9de19732f22c649d85d9a9588aefecddbeef9e7c1499523d39ab7330b3 SHA512 fb407f5ae28e4309b92836504ed11c819e4b9a12509527b4030300a8826a9c54d7491544d771c84a5e93b1a844b3c3accae6e1159cecc5e385ea0ec29a918179 +EBUILD osinfo-db-20181011.ebuild 671 BLAKE2B d0f8709bfe7cca393adb179bef4c40b11ccb5061b8e3454ec97e3e4a4f80198b7c3ce42c1fbb702e41a15f022704f4949cf423605f3565540061cfb463a1d9ca SHA512 31d0459256798eb2768c375ec7b5b1b0916bb4c3b2d8fdfd0db9f5a6034c2dc5e3e1778dc08d0e3f2f77b7169c1798169d3299522ddd6e4b64826e82d33dee7d MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/osinfo-db/osinfo-db-20181011.ebuild b/sys-apps/osinfo-db/osinfo-db-20181011.ebuild new file mode 100644 index 000000000000..d81f82552c17 --- /dev/null +++ b/sys-apps/osinfo-db/osinfo-db-20181011.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="osinfo database files" +HOMEPAGE="https://libosinfo.org/" +SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz" +S="${WORKDIR}" + +LICENSE="GPL-2+" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND="" +DEPEND="${RDEPEND} + sys-apps/osinfo-db-tools +" +# we don't depend on intltool here, contrary to README, as the tarball already +# contains the processed results with translations in XML files + +src_unpack() { :; } + +src_install() { + osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}" +} diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest index 5c26848e81b5..8ad2776ff687 100644 --- a/sys-apps/pv/Manifest +++ b/sys-apps/pv/Manifest @@ -1,5 +1,5 @@ DIST pv-1.6.0.tar.bz2 107723 BLAKE2B 95118fc6406f73e800e99468457ba00f0b8f0345eef58f7ff7f4e10b90419cb36b37af094dbe5bd84b7832dfcc96e536dfb845a061f99a0b118192e90821fdc1 SHA512 bd405901812ca50b910adbcf1d2c540dc0b8612f03687866734a79cfa5b5b8100024c18a1d1413c6613e1f2085989cbb77907da89bec7eda37cdeaa7597129d5 DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26 EBUILD pv-1.6.0-r1.ebuild 1367 BLAKE2B 68332f62167add5091841d2d8c8c9ae9379296eea40471674880ec53034bc4a6da69d935042ebb57960a0996bc3a586a955fd7b69837e488842011ad3b8dd04a SHA512 2e13378c2cb765413a6fc87e6b4f6ded4afee8a27b5468b71cc17a688231acf656b9f1234d3b4fa84d3218430aeda4ee53120e80808ced958088109dcf05377b -EBUILD pv-1.6.6.ebuild 1398 BLAKE2B c077a3b62bcff24b084e23059aba0edc526711b29fa64d853446b3b1730cbe83b1e8b3d05d02e8be930bdc9b976f6b9c634503a3b1fa6f0ffcf2f667653195cc SHA512 a96ce67602502c1113db6aa87cdaa1a40ce95c5acea04a765ffcb860efc14ccf37cd3e2abe33c511e38031d918c288902dadaa246cc3a5366fc13642dae42491 +EBUILD pv-1.6.6.ebuild 1392 BLAKE2B fc22a4d89c81c3b6547a5f984bed460725e14847a8d9550dfe690a84d5f07a1691911929cc849126d6e74af7c746a5b3ed146a3209aafcc31ed8d63455a7797e SHA512 2e174a99a37766abcca64bb75801fa09e0f1368b904c06374a9b839e6eb0c0f96d05f904dacb89316919105e0328b97f7e1c047cd3087f4698cc347908cc36ec MISC metadata.xml 334 BLAKE2B f38b13fd2aa1e836db200a4f9867a5cbc50caa54372977003b4dfd52f92dc2a165d121de1bcd86e7b489911c31c64bff30af3364930ac708dc8f26f7dab6fa14 SHA512 ae252c205325a4937f8ab6c60c8be5a032ff8f11087b7a1fe737ed9c4fa6325b34dbcab9bc16467096de93baa330cec51909f72686cc4152d653fd1456333fb3 diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild index 7cf983647200..94d0b91d0f16 100644 --- a/sys-apps/pv/pv-1.6.6.ebuild +++ b/sys-apps/pv/pv-1.6.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="http://www.ivarch.com/programs/sources/${P}.tar.bz2" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris" IUSE="debug nls" PV_LINGUAS=( de fr pl pt ) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 572fd89ee76a..ec53f0501974 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,23 +1,11 @@ -AUX 238-initctl.patch 1497 BLAKE2B 7f916414a8bb92e5d8a2b47fc9adf90da73c9fb27bd32eb2a89c5d0b56215bac1ac8c7e9e011268b2f3126fa272c0a118f5e2916f6eca48f60e359a056cf6d92 SHA512 1963c653321fd69a66f75dc441e36d47d7eb15c193066845e43a6f62d436d9a7fefd98c6418cdb08fca823720fa62887c93e67de427e599ee19b1f72301cfe62 -AUX 238-libmount-include.patch 2164 BLAKE2B d9d86e8affb6a6d5cc8cb42b4f1744936b0773318d466a7f76b43a382ffc6aca7d863cbfef7ea8a114615db35d1a6f57b22a2fd451a82b71cfac3383bb019870 SHA512 4f1d82195623a213b6439aec6a2ff17b027f4ed079e6917957635503125a0917d4069c8055b5b9d1be235c47d62235f4c7baa0cfb9184d48f06bac356b69706a -AUX 238-nspawn-wait.patch 3415 BLAKE2B db43b0128709bba3bd50199645e2e819d0b86eb6839f3bff34b21ce989f5e9301d541265fdb0dbaa76cae00df492581a624e9ca694d4d6d1f2d1cabf5a02612c SHA512 8f1c940da604d72948aa14e735f31ce6b349d274f18836233f15bdec7605e7a52a9ac1016cbd98fdd57d547e31ff882f3244029fba58ac4a408aad41f378a0a0 -AUX 238-sparc-raw-clone.patch 1802 BLAKE2B 79998e7582b0a724ccd715f5d4f9ca1e08078a46e29b7cc08fd917ac9046d8aa997a0d2986cc48f7ebc10ff4c4ce6adafe46c3b603e9104df9b767ac13b35f96 SHA512 9a3f31f37211b186f5a17a084795498599f71fe3d8da2fa37d2a3cb2445d31e8929b5253533e66fac868cc4b9c8f3cb4405765cea0d55db67347dffdb8f8bc61 -AUX 238-timesync-connection.patch 2105 BLAKE2B 388ac432261486ecc01f937be7e1cf9f3f7238d509363f389e960c13ceb4146468cf972312b2b240c60191d609526f65c2d30d979d6640e02e0ef0326d3f1ec0 SHA512 7420933ebd65ba6191a2738ad5d1a16e17a9d631afaf6839e31388ff8758e16db5e60c5bea02cff3ab6850b0ee019e4626ef4905d63899c9e39b25db9f7d3074 AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 -DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19 SHA512 b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875 -DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d -DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c -DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 -DIST systemd-239-patches-0.tar.gz 14007 BLAKE2B a1653ac6cb46347fa1e1a4a81a7003af0e565ac2ba43e1aaed9df87d7e4bd13cdcf26ffc9527f46defa226d7d11b03fbc6b018f0734a6654a0f4bf88bf4ef6e7 SHA512 a640a446db153523a2ca97b811e20bc42c8273d2c494ebd8a6c5cd33718c714e37544533749cad57e887c17635cbfca01b86b52e9f5a12878ef70f2e95fc7485 +DIST systemd-239-patches-1.tar.gz 20639 BLAKE2B 9b03367becdef20d16056cdbbeaaefd9f10bf6c56528ad1a738684ab08d99a464411c23aea32d47307b0399f092107069d09ad42fb07217f8eca520cc4010b84 SHA512 757c7fc8f60ccf99d2803128a8c4d8b924093b150384569c5ffb3bc39f06728e99b18e2f77ff0f1c16bbd45bc75cbb0f385dac0135443d70c7dcd9cc1e84a490 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f -EBUILD systemd-236-r5.ebuild 12925 BLAKE2B 7af4a9109f2273d2ddb7aa777e7e2e6d055e7b3bf7c6c56b6b02faf3c010af467d09477d7c03efbf58a9511ba4cd2cff3a1e92d0a7f793419d41fe87fb0b5d97 SHA512 ab0bb749a02f9e296d6a4dffc481616bc286127b970122d9d1337cadf3cfe40be44e9f76cf95d0f89d758ef329f4c06bb734643e40f16afca00329b71780449c -EBUILD systemd-238-r7.ebuild 13147 BLAKE2B 0fd72c09cb7d7648d5a48722a13443924de26f6810b05aa196cf4f757bcfed60d7e4750b10a7e87104441ecd737fe3bd897d89b9b58b9a7acb926f5df2c887e3 SHA512 8917208a24c8a8866854812c1e3157cd8976f7875b8304e0fa08d75b25f850fb2185947f4f7ff0a040e389f7635288b30edaed1849b542a51535909c9bd10a11 -EBUILD systemd-239-r1.ebuild 13270 BLAKE2B 4033be3376a5a44bb37e5a7d526e45a64231b88d4bd7e9c91142d83878b8c01aa949c7ec8006c92f852b8df4c8b57ec8ff70b702d72a0fa59bf9135cb8ca3170 SHA512 2d95f9d569e16c77164859f43162927e60ac55bab17ca1a2b59352e04b515403a492686efd28efd92a308270003fc2a168f34015ecd80c14085ce3953a520dc2 -EBUILD systemd-239.ebuild 13174 BLAKE2B c704d7a943b0ee21ffb56aa3b738aba283f5ee94d64f0a25982053cbcc593025271c7db75082ad797d36ea26eed578efc5a816c5a1d19be41a521ec2a0852928 SHA512 209b339a8b5e398c7f9abfc92e854f33205f168e3b14e97524fa6e7d96f1a41f0ecbf572e46fb2f42e91ea802c52117daa8d6f4002f8b5ba4f4e2af19864b833 +EBUILD systemd-239-r2.ebuild 13262 BLAKE2B e5bb431329ae30c4dd97ee10eab291726cedf7f98de1c545a540cd10759fe166f7c62ade238a63ce18f838318d3b32b8d025d45a88719e6eeba79ac903257773 SHA512 ff84149c3eda1116d0991822124cce9933fbb5cd62d89dfb86cd466eab6c9883a70ed28c0dedf1520ad12e48454f2fcc35ed4a8470bf809314809199f71ed9bc EBUILD systemd-9999.ebuild 13193 BLAKE2B 47f6b232fad63001b5ef81efdfeb7640e2fae9e5ae9da4f3141c5080d6a3357c6b1e3d10a887ae453dd2f709bc05963cae0407b91a0f83a6453ec68f71e88ffa SHA512 d6dbcd019db7000202103895f51e1e15625145b44e87d45896947be2e97b72059abb0678e6b148d3e50d00a4135822703bbe93a8e9caba2503ca9ab77e529368 MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1 diff --git a/sys-apps/systemd/files/238-initctl.patch b/sys-apps/systemd/files/238-initctl.patch deleted file mode 100644 index 399916977433..000000000000 --- a/sys-apps/systemd/files/238-initctl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4d8c7c1b3a5feebca948a3b8663f5be887b57731 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 30 Mar 2018 11:00:17 -0400 -Subject: [PATCH] units: initctl: move the fifo to /run/initctl to match - sysvinit - -The fifo location was moved in sysvinit-2.89. - -http://git.savannah.nongnu.org/cgit/sysvinit.git/commit/?id=80dbcf3de3c1b83aeaa713a8fe5b8d35d8649af2 ---- - units/systemd-initctl.service.in | 2 +- - units/systemd-initctl.socket | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in -index 6cfed3da11f..2b4b957dce3 100644 ---- a/units/systemd-initctl.service.in -+++ b/units/systemd-initctl.service.in -@@ -8,7 +8,7 @@ - # (at your option) any later version. - - [Unit] --Description=/dev/initctl Compatibility Daemon -+Description=initctl Compatibility Daemon - Documentation=man:systemd-initctl.service(8) - DefaultDependencies=no - -diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket -index 61f877ba7d2..9d975799081 100644 ---- a/units/systemd-initctl.socket -+++ b/units/systemd-initctl.socket -@@ -8,12 +8,12 @@ - # (at your option) any later version. - - [Unit] --Description=/dev/initctl Compatibility Named Pipe -+Description=initctl Compatibility Named Pipe - Documentation=man:systemd-initctl.service(8) - DefaultDependencies=no - Before=sockets.target - - [Socket] --ListenFIFO=/run/systemd/initctl/fifo -+ListenFIFO=/run/initctl - Symlinks=/dev/initctl - SocketMode=0600 diff --git a/sys-apps/systemd/files/238-libmount-include.patch b/sys-apps/systemd/files/238-libmount-include.patch deleted file mode 100644 index 6a02dff65e40..000000000000 --- a/sys-apps/systemd/files/238-libmount-include.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001 -From: Michael Olbrich -Date: Mon, 26 Mar 2018 17:34:53 +0200 -Subject: [PATCH] core: don't include libmount.h in a header file (#8580) - -linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_* -definitions. - -To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h -should be included. And missing.h must be included last. - -Without this, building systemd may fail with: - -In file included from [...]/libmount/libmount.h:31:0, - from ../systemd-238/src/core/manager.h:23, - from ../systemd-238/src/core/emergency-action.h:37, - from ../systemd-238/src/core/unit.h:34, - from ../systemd-238/src/core/dbus-timer.h:25, - from ../systemd-238/src/core/timer.c:26: -[...]/sys/mount.h:57:2: error: expected identifier before numeric constant ---- - src/core/dbus-execute.c | 1 + - src/core/manager.h | 3 ++- - src/core/mount.c | 2 ++ - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index 7344623ebf6..c342093bca4 100644 ---- a/src/core/dbus-execute.c -+++ b/src/core/dbus-execute.c -@@ -18,6 +18,7 @@ - along with systemd; If not, see . - ***/ - -+#include - #include - #include - -diff --git a/src/core/manager.h b/src/core/manager.h -index 28c5da225b1..e09e0cdf5e9 100644 ---- a/src/core/manager.h -+++ b/src/core/manager.h -@@ -20,7 +20,6 @@ - along with systemd; If not, see . - ***/ - --#include - #include - #include - -@@ -34,6 +33,8 @@ - #include "list.h" - #include "ratelimit.h" - -+struct libmnt_monitor; -+ - /* Enforce upper limit how many names we allow */ - #define MANAGER_MAX_NAMES 131072 /* 128K */ - -diff --git a/src/core/mount.c b/src/core/mount.c -index 0e755da5c02..0154ebda5d6 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -23,6 +23,8 @@ - #include - #include - -+#include -+ - #include "sd-messages.h" - - #include "alloc-util.h" diff --git a/sys-apps/systemd/files/238-nspawn-wait.patch b/sys-apps/systemd/files/238-nspawn-wait.patch deleted file mode 100644 index a740e8933453..000000000000 --- a/sys-apps/systemd/files/238-nspawn-wait.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 7511655807e90aa33ea7b71991401a79ec36bb41 Mon Sep 17 00:00:00 2001 -From: Philip Sequeira -Date: Thu, 5 Apr 2018 14:04:27 +0000 -Subject: [PATCH] nspawn: wait for network namespace creation before interface - setup (#8633) - -Otherwise, network interfaces can be "moved" into the container's -namespace while it's still the same as the host namespace, in which case -e.g. host0 for a veth ends up on the host side instead of inside the -container. - -Regression introduced in 0441378080489e4ab6704cd0a2d78cb1ceaca899. - -Fixes #8599. ---- - src/nspawn/nspawn.c | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 810f1247ea2..a5bc50c1f4c 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -2329,6 +2329,9 @@ static int inner_child( - r = unshare(CLONE_NEWNET); - if (r < 0) - return log_error_errno(errno, "Failed to unshare network namespace: %m"); -+ -+ /* Tell the parent that it can setup network interfaces. */ -+ (void) barrier_place(barrier); /* #3 */ - } - - r = mount_sysfs(NULL, arg_mount_settings); -@@ -2337,7 +2340,7 @@ static int inner_child( - - /* Wait until we are cgroup-ified, so that we - * can mount the right cgroup path writable */ -- if (!barrier_place_and_sync(barrier)) { /* #3 */ -+ if (!barrier_place_and_sync(barrier)) { /* #4 */ - log_error("Parent died too early"); - return -ESRCH; - } -@@ -2448,7 +2451,7 @@ static int inner_child( - /* Let the parent know that we are ready and - * wait until the parent is ready with the - * setup, too... */ -- if (!barrier_place_and_sync(barrier)) { /* #4 */ -+ if (!barrier_place_and_sync(barrier)) { /* #5 */ - log_error("Parent died too early"); - return -ESRCH; - } -@@ -3533,6 +3536,14 @@ static int run(int master, - - if (arg_private_network) { - -+ if (!arg_network_namespace_path) { -+ /* Wait until the child has unshared its network namespace. */ -+ if (!barrier_place_and_sync(&barrier)) { /* #3 */ -+ log_error("Child died too early"); -+ return -ESRCH; -+ } -+ } -+ - r = move_network_interfaces(*pid, arg_network_interfaces); - if (r < 0) - return r; -@@ -3656,7 +3667,7 @@ static int run(int master, - * its setup (including cgroup-ification), and that - * the child can now hand over control to the code to - * run inside the container. */ -- (void) barrier_place(&barrier); /* #3 */ -+ (void) barrier_place(&barrier); /* #4 */ - - /* Block SIGCHLD here, before notifying child. - * process_pty() will handle it with the other signals. */ -@@ -3684,7 +3695,7 @@ static int run(int master, - return r; - - /* Let the child know that we are ready and wait that the child is completely ready now. */ -- if (!barrier_place_and_sync(&barrier)) { /* #4 */ -+ if (!barrier_place_and_sync(&barrier)) { /* #5 */ - log_error("Child died too early."); - return -ESRCH; - } diff --git a/sys-apps/systemd/files/238-sparc-raw-clone.patch b/sys-apps/systemd/files/238-sparc-raw-clone.patch deleted file mode 100644 index 736a498e918c..000000000000 --- a/sys-apps/systemd/files/238-sparc-raw-clone.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e4aa2c34d526c108dd8fa37448b19bdb38de52c9 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 24 May 2018 10:48:55 -0400 -Subject: [PATCH] basic: fix raw_clone() on 32-bit sparc - -The clone syscall uses the same semantics as on 64-bit. The trap number -for syscall entry is different. - -Bug: https://bugs.gentoo.org/656368 ---- - src/basic/raw-clone.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h -index d8a68663180..d35540903ab 100644 ---- a/src/basic/raw-clone.h -+++ b/src/basic/raw-clone.h -@@ -39,10 +39,10 @@ static inline pid_t raw_clone(unsigned long flags) { - /* On s390/s390x and cris the order of the first and second arguments - * of the raw clone() system call is reversed. */ - ret = (pid_t) syscall(__NR_clone, NULL, flags); --#elif defined(__sparc__) && defined(__arch64__) -+#elif defined(__sparc__) - { - /** -- * sparc64 always returns the other process id in %o0, and -+ * sparc always returns the other process id in %o0, and - * a boolean flag whether this is the child or the parent in - * %o1. Inline assembly is needed to get the flag returned - * in %o1. -@@ -52,7 +52,11 @@ static inline pid_t raw_clone(unsigned long flags) { - asm volatile("mov %2, %%g1\n\t" - "mov %3, %%o0\n\t" - "mov 0 , %%o1\n\t" -+#if defined(__arch64__) - "t 0x6d\n\t" -+#else -+ "t 0x10\n\t" -+#endif - "mov %%o1, %0\n\t" - "mov %%o0, %1" : - "=r"(in_child), "=r"(child_pid) : diff --git a/sys-apps/systemd/files/238-timesync-connection.patch b/sys-apps/systemd/files/238-timesync-connection.patch deleted file mode 100644 index a48a88e9e68d..000000000000 --- a/sys-apps/systemd/files/238-timesync-connection.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6d254dba01491b994115ecef8c4017fbe5451606 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 16 Apr 2018 12:24:36 +0900 -Subject: [PATCH] timesync: establish connection when network become online and - the manager is not connected yet - -This also introduces `manager_is_connected()` helper function, which -returns true when the manager is sending a request, resolving a server -name, or in a poll interval. - -Follow-up for 3e85ec072180b6fbec82d715186985536859a29d. -Fixes #8719. ---- - src/timesync/timesyncd-manager.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c -index cfdc43b0ff2..0c5d3e2d6f7 100644 ---- a/src/timesync/timesyncd-manager.c -+++ b/src/timesync/timesyncd-manager.c -@@ -1036,6 +1036,12 @@ static int manager_network_read_link_servers(Manager *m) { - return r; - } - -+static bool manager_is_connected(Manager *m) { -+ /* Return true when the manager is sending a request, resolving a server name, or -+ * in a poll interval. */ -+ return m->server_socket >= 0 || m->resolve_query || m->event_timer; -+} -+ - static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - Manager *m = userdata; - bool changed, connected, online; -@@ -1051,13 +1057,13 @@ static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t re - online = network_is_online(); - - /* check if the client is currently connected */ -- connected = m->server_socket >= 0 || m->resolve_query || m->exhausted_servers; -+ connected = manager_is_connected(m); - - if (connected && !online) { - log_info("No network connectivity, watching for changes."); - manager_disconnect(m); - -- } else if (!connected && online && changed) { -+ } else if ((!connected || changed) && online) { - log_info("Network configuration changed, trying to establish connection."); - - if (m->current_server_address) diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild deleted file mode 100644 index 9c9f8dd71f87..000000000000 --- a/sys-apps/systemd/systemd-236-r5.ebuild +++ /dev/null @@ -1,437 +0,0 @@ -# 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}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~floppym/dist/${P}-patches-2.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 policykit qrcode +seccomp selinux +split-usr ssl +sysv-utils test 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-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}] ) - 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= )" - -# 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 - ! "${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-238-r7.ebuild b/sys-apps/systemd/systemd-238-r7.ebuild deleted file mode 100644 index e18151acc1b8..000000000000 --- a/sys-apps/systemd/systemd-238-r7.ebuild +++ /dev/null @@ -1,440 +0,0 @@ -# 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 - https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz" - KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc 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 +split-usr ssl +sysv-utils test 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-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.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" - -# 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 - ! "${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-239-r1.ebuild b/sys-apps/systemd/systemd-239-r1.ebuild deleted file mode 100644 index 69bfa21435eb..000000000000 --- a/sys-apps/systemd/systemd-239-r1.ebuild +++ /dev/null @@ -1,448 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# 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 - https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~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 +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test 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-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.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" - -# 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 ) - resolvconf? ( !net-dns/openresolv ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - ! "${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-239-r2.ebuild b/sys-apps/systemd/systemd-239-r2.ebuild new file mode 100644 index 000000000000..b6d91862a74a --- /dev/null +++ b/sys-apps/systemd/systemd-239-r2.ebuild @@ -0,0 +1,448 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 + https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz" + KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc 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 +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test 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-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.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" + +# 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 ) + resolvconf? ( !net-dns/openresolv ) + !build? ( || ( + sys-apps/util-linux[kill(-)] + sys-process/procps[kill(+)] + sys-apps/coreutils[kill(-)] + ) ) + !sys-auth/nss-myhostname + ! "${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-239.ebuild b/sys-apps/systemd/systemd-239.ebuild deleted file mode 100644 index 08a0c54c349b..000000000000 --- a/sys-apps/systemd/systemd-239.ebuild +++ /dev/null @@ -1,446 +0,0 @@ -# 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~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 +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test 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-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.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" - -# 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 ) - resolvconf? ( !net-dns/openresolv ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - ! "${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/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index d9800a554665..99f694793a69 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,4 +1,5 @@ AUX inittab-2.88 1928 BLAKE2B abf5b94c6021f8d46543e9028e89359e4c6aff2ebed7f6dd20b3529a73a7885d0c1acf9417bda1e5ca7fcd191a3020419631b15c6da3992567bddd61949bcf0b SHA512 71476e1e07e288796887c7cfdf359523403816adb939c5c364b4fafef3dabd3e7eefb354bc09343606af4804a10247b5f345b404a5490fcdae8937287a84a990 +AUX inittab-2.91 1981 BLAKE2B 4917bad0474c3ab7aa02d481697ed0ce207b3c4c0f54beac794af07e76ad7d98420da77d7a08a32cbec32199196f630c92f67b9d57fedda23f49c97be113aa81 SHA512 2020a37686c3800335693b0ad977b4fcb5d6ee5abb09b5e683369ff0ab943e17c15a9a7cae02ca96d11ee310d7b8ad2814562f5a56fb82abedb3d60e2a7d2aef AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee AUX sysvinit-2.86-shutdown-single.patch 1229 BLAKE2B fc95e0a3db23300776bc61890f491449f0b078f3814d73b1fae278a3e28f8b3b567056f71ecfbd917e74aec1594cfdb7b15e6808a09ccda594ec8e1a683d5957 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575 AUX sysvinit-2.88-makefile.patch 1546 BLAKE2B 4634bc8e62bf8a38778f0fd186a0a380159ae52cdfc089af9b9bacdf4a9db5d5d5f8093c68d2340852f2f080193eeec5f878e4aac3f019a5740850691ee36a87 SHA512 8cc6d2b3fe43d9040aa9f54b2ac448c3dbe986de629638052ddc294b2589ed283b51cc25d9b73e8dac5c5183a5c0675799fa425cf44523636c3ad1a943f1e4a5 @@ -13,5 +14,6 @@ DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0 EBUILD sysvinit-2.88-r9.ebuild 3470 BLAKE2B 6963eb9b677c53c0b7fe67c6dd3d9cf4b0ee89f8670abc6e9d8481b2d0dab41c7428b6293f00f039d286eac0c223ebe4d250bfda27fb82beca8812b188de232d SHA512 3beb173dc4b830874f20e16f9d079abba86c2813f81719d091c174aed9591a803fb92d5fa2d20884f8aebb755b6735fa6183613271a576cd93f51c17a072b0f5 EBUILD sysvinit-2.89-r1.ebuild 3375 BLAKE2B 71bbe33ad11398149b4ebd7e9cc42b1c3809a4173f25a0e7e960e083d1f715a6baea2027b120611c334bf9f2a14699d50e94a7a67b5c6cd4f3e6a680e80e8446 SHA512 c3a34770ec58142cc18b2a9607fad0a1235d56f9c8e1b5594c39bbbe654e17a0d39da35e4ee887b893519705838c8b60737659a1346565da4aa1c22d5463b577 EBUILD sysvinit-2.90.ebuild 3375 BLAKE2B 73d413d29a9e6331351cfc505e72f12e56335d1b0c188209d87e8baf6b224cef75a0f5c575d64134c55a8930bcb5ec79256880035eedc3624485ba92748fa1b2 SHA512 c2afaf594ec8f1cbc7c78261c2021d61a733b9bd744e21507950999504c1f8f9ce65071394e64e40664ae514096f9ed3d5acc1961819d8a795cd86b1e6712935 +EBUILD sysvinit-2.91-r1.ebuild 3353 BLAKE2B 46c55733c853f5591a1d6a2ed7d850c192c90fab76241de3be91844f5934e44b62f326cbbf5871dc23bce2a29d3ad339aff402c000a850f84c808d08ded0e8c3 SHA512 69c114c07a54a81e72d79ee8ae365bbee4d990958c77f5e6fd2b7ffbb3a6ef2f23b25183b122d3a515a4a65965492bd8772fb7af0c7eb86b15efbf60edc5a3e0 EBUILD sysvinit-2.91.ebuild 3353 BLAKE2B 5fb9f6d78adb1602c6eac4326c91a567d9c6102081469c79868d40bdebb7b562f49e746d17f74b45b418c8905ade25827b1b900d757209a10a660c0640a78b35 SHA512 5bbe681adfd50cf2a87de5c82407e8f4ec3d0db78ba7a3cb964dfb3772a2ce6bb67a162cf6ddcbae84d528fee37e5508bf3647d5c538bcf978a63ded08efba75 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f diff --git a/sys-apps/sysvinit/files/inittab-2.91 b/sys-apps/sysvinit/files/inittab-2.91 new file mode 100644 index 000000000000..f9ed8d1126a3 --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.91 @@ -0,0 +1,61 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# Modified by: William Hubbs, +# + +# Default runlevel. +id:3:initdefault: + +# System initialization, mount local filesystems, etc. +si::sysinit:/sbin/openrc sysinit + +# Further system initialization, brings up the boot runlevel. +rc::bootwait:/sbin/openrc boot + +l0u:0:wait:/sbin/telinit u +l0:0:wait:/sbin/openrc shutdown +l0s:0:wait:/sbin/halt -dhnp +l1:1:wait:/sbin/openrc single +l2:2:wait:/sbin/openrc nonetwork +l3:3:wait:/sbin/openrc default +l4:4:wait:/sbin/openrc default +l5:5:wait:/sbin/openrc default +l6u:6:wait:/sbin/telinit u +l6:6:wait:/sbin/openrc reboot +l6r:6:wait:/sbin/reboot -dkn +#z6:6:respawn:/sbin/sulogin + +# new-style single-user +su0:S:wait:/sbin/openrc single +su1:S:wait:/sbin/sulogin + +# TERMINALS +#x1:12345:respawn:/sbin/agetty 38400 console linux +c1:12345:respawn:/sbin/agetty 38400 tty1 linux +c2:2345:respawn:/sbin/agetty 38400 tty2 linux +c3:2345:respawn:/sbin/agetty 38400 tty3 linux +c4:2345:respawn:/sbin/agetty 38400 tty4 linux +c5:2345:respawn:/sbin/agetty 38400 tty5 linux +c6:2345:respawn:/sbin/agetty 38400 tty6 linux + +# SERIAL CONSOLES +#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 + +# What to do at the "Three Finger Salute". +ca:12345:ctrlaltdel:/sbin/shutdown -r now + +# Used by /etc/init.d/xdm to control DM startup. +# Read the comments in /etc/init.d/xdm for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/xdm is not added +# to the "default" runlevel. +x:a:once:/etc/X11/startDM.sh diff --git a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild new file mode 100644 index 000000000000..da9b190c71d3 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="/sbin/init - parent of all processes" +HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux ibm static kernel_FreeBSD" + +CDEPEND=" + selinux? ( + >=sys-libs/libselinux-1.28 + )" +DEPEND="${CDEPEND} + virtual/os-headers" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-shutdown ) + !::g' \ + -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ + src/Makefile || die + + # pidof has moved to >=procps-3.3.9 + sed -i -r \ + -e '/\/bin\/pidof/d' \ + -e '/^MAN8/s:\::g' \ + src/Makefile || die + + # Mung inittab for specific architectures + cd "${WORKDIR}" || die + cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab" + local insert=() + use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) + use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) + use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) + use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) + use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) + if use ibm ; then + insert+=( + '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' + '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' + ) + fi + (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab + if use kernel_FreeBSD ; then + sed -i \ + -e 's/linux/cons25/g' \ + -e 's/ttyS0/cuaa0/g' \ + -e 's/ttyS1/cuaa1/g' \ + inittab #121786 + fi + if use x86 || use amd64 ; then + sed -i \ + -e '/ttyS[01]/s:9600:115200:' \ + inittab + fi + if [[ ${#insert[@]} -gt 0 ]] ; then + printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab + fi +} + +src_compile() { + tc-export CC + append-lfs-flags + export DISTRO= #381311 + export VERSION="${PV}" + use static && append-ldflags -static + emake -C src $(usex selinux 'WITH_SELINUX=yes' '') +} + +src_install() { + emake -C src install ROOT="${D}" + dodoc README doc/* + + insinto /etc + doins "${WORKDIR}"/inittab + + # dead symlink + rm "${ED%/}"/usr/bin/lastb || die +} + +pkg_postinst() { + # Reload init to fix unmounting problems of / on next reboot. + # This is really needed, as without the new version of init cause init + # not to quit properly on reboot, and causes a fsck of / on next reboot. + if [[ ${ROOT} == / ]] ; then + if [[ -e /dev/initctl && ! -e /run/initctl ]]; then + ln -s /dev/initctl /run/initctl + fi + # Do not return an error if this fails + /sbin/telinit U &>/dev/null + fi + + elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" + elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." +} diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index b35a84bb033d..63f7ba9374f4 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -6,7 +6,8 @@ DIST util-linux-2.32.1.tar.xz 4561088 BLAKE2B 9e89b7fa2eacd51ad8c5cf90cc78df73de DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482 DIST util-linux-2.33-rc2.tar.xz 4613036 BLAKE2B ac17fc3efea4f5d637e00cf367f087dfc25cea9f024aa2d6510262b3db236fb0e0b280db35d32848e9569603a494fd59a516ae02a178f8d7ac1f9f3936493563 SHA512 7a38a7408a42a47f4e67ead068b5418490c8871ed452613cd2459bd7af64b1a218dc4e826197730b2de60d5d757c02ef79dc7e0f8aeb3f24be9cf8934e40a5ad EBUILD util-linux-2.32-r4.ebuild 7269 BLAKE2B 415ff80ef80ad95e10e4fc79c830e0ed5bfeaad4671a049eeb081ac7ee2fa7ff67ec47f9368af0fea2b19896b2b00bbac8cd00e331c8a56241fe116670b26665 SHA512 89746556f3753e5cbbb10bb1e56c275f5dd434b61a6e6d3bc7366cc02dcf7a596f1343eb674caf427909706e8ee00ad0aa6b03a84526028f719e977de2390db3 +EBUILD util-linux-2.32.1-r1.ebuild 8501 BLAKE2B 1516985e647b7c2df8b15c86fbd2b00db3e620ad530a7c28cb61a63254f062fb70abe56eae8cb447178c5b27b6f5bd8382f5c3e129f1b9971c3ad51cd720b3e9 SHA512 3eb54f75017cf4a04c1bd348b8d1d32280c7d1806aff8713dfc411dd780cbdb6f2a245f1585d95b291a241b60fdd60acf5992cae4c7fd6dce7ea88f7ab3c2442 EBUILD util-linux-2.32.1.ebuild 7370 BLAKE2B f613cace23c64e8d7e69dfe785cc1cc4a2e7c77897867d2e84943559e7030841ec929fa8b178d75096ce1ec0adf2af861fcfc99bc7d446760727432637212c2f SHA512 ea7131a22979df1efcbd041ce5539ef3b3ca5df31713ea46952af3fbee143a5b609b114fdc1be6e0d981f23e82d1bfce2fa489f2e5aeae0d19a01ff04530b5ca -EBUILD util-linux-2.33_rc2.ebuild 7106 BLAKE2B 0bd60a716b8e26afd8232c18a802aee9c290c27a17d3d827538726c511f74a0a96b9ef37129713156d83292f226ff818f8a129243fd4e876903ad67a8d3f91f7 SHA512 0a407281f42dab3413e6861bd809dd92cdb6d9bb21618934193bd78f74b1ba4e1c3e4aef5fe3da1b8cf51e413b1d09111c05fad83474c533c07faaaec51c6462 -EBUILD util-linux-9999.ebuild 7109 BLAKE2B 6b87ab1217a31c3387048d6c32331e2f7f3e428791eb6c1affab05de219814cefd8f25cc2ac7ca237e60a38dcda27a1966e4ba46908cee4970acebd9dfd2c166 SHA512 2e3ee3b8c31486e3ac92e2e3838e619671e34755393f48bd2389582ba00b17b8abd8c92e026cd81d87ab6e10b5a0b4f213059ed43e91180c6c2371f195997986 +EBUILD util-linux-2.33_rc2-r1.ebuild 8240 BLAKE2B ca8992075b02fb86f2c5e74438228058a948cb0ef9ce84c6aaf20399a1e513ee66b520f5d44c3df6b4e8ea03cca35a8c0a200b843b87bf7cac40ea601d29d3b6 SHA512 3a8729e25f36bb00b9cf2d5fbf8059fcf94ddd9ce9bfa297471e6ceae4307696b76aa18a2aadd7c2a14b16b3be1d201bf8da184f3cbdd5d903b5459c0336f7e9 +EBUILD util-linux-9999.ebuild 8240 BLAKE2B ca8992075b02fb86f2c5e74438228058a948cb0ef9ce84c6aaf20399a1e513ee66b520f5d44c3df6b4e8ea03cca35a8c0a200b843b87bf7cac40ea601d29d3b6 SHA512 3a8729e25f36bb00b9cf2d5fbf8059fcf94ddd9ce9bfa297471e6ceae4307696b76aa18a2aadd7c2a14b16b3be1d201bf8da184f3cbdd5d903b5459c0336f7e9 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133 diff --git a/sys-apps/util-linux/util-linux-2.32.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.32.1-r1.ebuild new file mode 100644 index 000000000000..8334aa825c11 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.32.1-r1.ebuild @@ -0,0 +1,296 @@ +# Copyright 1999-2018 Gentoo Authors +# Copyright 2018 Sony Interactive Entertainment Inc. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" + +# Most lib deps here are related to programs rather than our libs, +# so we rarely need to specify ${MULTILIB_USEDEP}. +RDEPEND="caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib:= ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + !build? ( systemd? ( sys-apps/systemd ) ) + udev? ( virtual/libudev:= )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" +RDEPEND+=" + kill? ( + !sys-apps/coreutils[kill] + !sys-process/procps[kill] + ) + !net-wireless/rfkill + !sys-process/schedutils + !sys-apps/setarch + ! "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +python_configure() { + local myeconfargs=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + --with-python + ) + if use userland_GNU; then + myeconfargs+=( + --enable-libblkid + --enable-libmount + --enable-pylibmount + ) + fi + mkdir "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + popd >/dev/null || die +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + + local myeconfargs=( + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + --with-bashcompletiondir="$(get_bashcompdir)" + --without-python + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') + $(tc-has-tls || echo --disable-tls) + $(use_enable nls) + $(use_enable unicode widechar) + $(use_enable static-libs static) + $(use_with selinux) + $(usex ncurses '' '--without-tinfo') + ) + # build programs only on GNU, on *BSD we want libraries only + if multilib_is_native_abi && use userland_GNU; then + myeconfargs+=( + --disable-chfn-chsh + --disable-login + --disable-nologin + --disable-pylibmount + --disable-su + --enable-agetty + --enable-bash-completion + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-rfkill + --enable-schedutils + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable caps setpriv) + $(use_enable cramfs) + $(use_enable fdformat) + $(use_enable tty-helpers mesg) + $(use_enable tty-helpers wall) + $(use_enable tty-helpers write) + $(use_enable kill) + ) + else + myeconfargs+=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + # build libraries + --enable-libuuid + --enable-libblkid + --enable-libsmartcols + --enable-libfdisk + ) + if use userland_GNU; then + # those libraries don't work on *BSD + myeconfargs+=( + --enable-libmount + ) + fi + fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi && use python; then + python_foreach_impl python_configure + fi +} + +python_compile() { + pushd "${BUILD_DIR}" >/dev/null || die + emake all + popd >/dev/null || die +} + +multilib_src_compile() { + emake all + + if multilib_is_native_abi && use python; then + python_foreach_impl python_compile + fi +} + +python_test() { + pushd "${BUILD_DIR}" >/dev/null || die + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + popd >/dev/null || die +} + +multilib_src_test() { + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + if multilib_is_native_abi && use python; then + python_foreach_impl python_test + fi +} + +python_install() { + pushd "${BUILD_DIR}" >/dev/null || die + emake DESTDIR="${D}" install + python_optimize + popd >/dev/null || die +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use userland_GNU; then + # need the libs in / + gen_usr_ldscript -a blkid fdisk mount smartcols uuid + fi + + if multilib_is_native_abi && use python; then + python_foreach_impl python_install + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die + + if ! use userland_GNU; then + # manpage collisions + # TODO: figure out a good way to keep them + rm "${ED%/}"/usr/share/man/man3/uuid* || die + fi + + if use pam; then + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + fi + + # Note: + # Bash completion for "runuser" command is provided by same file which + # would also provide bash completion for "su" command. However, we don't + # use "su" command from this package. + # This triggers a known QA warning which we ignore for now to magically + # keep bash completion for "su" command which shadow package does not + # provide. +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild b/sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild new file mode 100644 index 000000000000..cdfc75a44ba2 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild @@ -0,0 +1,288 @@ +# Copyright 1999-2018 Gentoo Authors +# Copyright 2018 Sony Interactive Entertainment Inc. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" + +# Most lib deps here are related to programs rather than our libs, +# so we rarely need to specify ${MULTILIB_USEDEP}. +RDEPEND="caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib:= ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + !build? ( systemd? ( sys-apps/systemd ) ) + udev? ( virtual/libudev:= )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" +RDEPEND+=" + kill? ( + !sys-apps/coreutils[kill] + !sys-process/procps[kill] + ) + !net-wireless/rfkill + !sys-process/schedutils + !sys-apps/setarch + ! "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +python_configure() { + local myeconfargs=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + --with-python + ) + if use userland_GNU; then + myeconfargs+=( + --enable-libblkid + --enable-libmount + --enable-pylibmount + ) + fi + mkdir "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + popd >/dev/null || die +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + + local myeconfargs=( + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + --with-bashcompletiondir="$(get_bashcompdir)" + --without-python + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') + $(tc-has-tls || echo --disable-tls) + $(use_enable nls) + $(use_enable unicode widechar) + $(use_enable static-libs static) + $(use_with selinux) + $(usex ncurses '' '--without-tinfo') + ) + # build programs only on GNU, on *BSD we want libraries only + if multilib_is_native_abi && use userland_GNU; then + myeconfargs+=( + --disable-chfn-chsh + --disable-login + --disable-nologin + --disable-pylibmount + --disable-su + --enable-agetty + --enable-bash-completion + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-rfkill + --enable-schedutils + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable caps setpriv) + $(use_enable cramfs) + $(use_enable fdformat) + $(use_enable tty-helpers mesg) + $(use_enable tty-helpers wall) + $(use_enable tty-helpers write) + $(use_enable kill) + ) + else + myeconfargs+=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + # build libraries + --enable-libuuid + --enable-libblkid + --enable-libsmartcols + --enable-libfdisk + ) + if use userland_GNU; then + # those libraries don't work on *BSD + myeconfargs+=( + --enable-libmount + ) + fi + fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi && use python; then + python_foreach_impl python_configure + fi +} + +python_compile() { + pushd "${BUILD_DIR}" >/dev/null || die + emake all + popd >/dev/null || die +} + +multilib_src_compile() { + emake all + + if multilib_is_native_abi && use python; then + python_foreach_impl python_compile + fi +} + +python_test() { + pushd "${BUILD_DIR}" >/dev/null || die + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + popd >/dev/null || die +} + +multilib_src_test() { + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + if multilib_is_native_abi && use python; then + python_foreach_impl python_test + fi +} + +python_install() { + pushd "${BUILD_DIR}" >/dev/null || die + emake DESTDIR="${D}" install + python_optimize + popd >/dev/null || die +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use userland_GNU; then + # need the libs in / + gen_usr_ldscript -a blkid fdisk mount smartcols uuid + fi + + if multilib_is_native_abi && use python; then + python_foreach_impl python_install + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die + + if ! use userland_GNU; then + # manpage collisions + # TODO: figure out a good way to keep them + rm "${ED%/}"/usr/share/man/man3/uuid* || die + fi + + if use pam; then + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + fi + + # Note: + # Bash completion for "runuser" command is provided by same file which + # would also provide bash completion for "su" command. However, we don't + # use "su" command from this package. + # This triggers a known QA warning which we ignore for now to magically + # keep bash completion for "su" command which shadow package does not + # provide. +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sys-apps/util-linux/util-linux-2.33_rc2.ebuild b/sys-apps/util-linux/util-linux-2.33_rc2.ebuild deleted file mode 100644 index 7060ef533f6d..000000000000 --- a/sys-apps/util-linux/util-linux-2.33_rc2.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-single-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" - -# Most lib deps here are related to programs rather than our libs, -# so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND="caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib:= ) - ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) - nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" -RDEPEND+=" - kill? ( - !sys-apps/coreutils[kill] - !sys-process/procps[kill] - ) - !net-wireless/rfkill - !sys-process/schedutils - !sys-apps/setarch - ! "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - - local myeconfargs=( - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - --with-bashcompletiondir="$(get_bashcompdir)" - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_with python) - $(multilib_native_use_with readline) - $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(tc-has-tls || echo --disable-tls) - $(use_enable nls) - $(use_enable unicode widechar) - $(use_enable static-libs static) - $(use_with selinux) - $(usex ncurses '' '--without-tinfo') - ) - # build programs only on GNU, on *BSD we want libraries only - if multilib_is_native_abi && use userland_GNU; then - myeconfargs+=( - --disable-chfn-chsh - --disable-login - --disable-nologin - --disable-su - --enable-agetty - --enable-bash-completion - --enable-line - --enable-partx - --enable-raw - --enable-rename - --enable-rfkill - --enable-schedutils - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable caps setpriv) - $(use_enable cramfs) - $(use_enable fdformat) - $(use_enable tty-helpers mesg) - $(use_enable tty-helpers wall) - $(use_enable tty-helpers write) - $(use_enable kill) - ) - else - myeconfargs+=( - --disable-all-programs - --disable-bash-completion - --without-systemdsystemunitdir - # build libraries - --enable-libuuid - --enable-libblkid - --enable-libsmartcols - --enable-libfdisk - ) - if use userland_GNU; then - # those libraries don't work on *BSD - myeconfargs+=( - --enable-libmount - ) - fi - fi - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use userland_GNU; then - # need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die - - if ! use userland_GNU; then - # manpage collisions - # TODO: figure out a good way to keep them - rm "${ED%/}"/usr/share/man/man3/uuid* || die - fi - - if use pam; then - newpamd "${FILESDIR}/runuser.pamd" runuser - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l - fi - - # Note: - # Bash completion for "runuser" command is provided by same file which - # would also provide bash completion for "su" command. However, we don't - # use "su" command from this package. - # This triggers a known QA warning which we ignore for now to magically - # keep bash completion for "su" command which shadow package does not - # provide. -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index b0e8d25cd4ca..cdfc75a44ba2 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -1,4 +1,5 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors +# Copyright 2018 Sony Interactive Entertainment Inc. # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +7,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-single-r1 multilib-minimal multiprocessing systemd + pam python-r1 multilib-minimal multiprocessing systemd MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -62,10 +63,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" -pkg_setup() { - use python && python-single-r1_pkg_setup -} - src_prepare() { default @@ -108,6 +105,26 @@ lfs_fallocate_test() { rm -f "${T}"/fallocate.${ABI}.c } +python_configure() { + local myeconfargs=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + --with-python + ) + if use userland_GNU; then + myeconfargs+=( + --enable-libblkid + --enable-libmount + --enable-pylibmount + ) + fi + mkdir "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + popd >/dev/null || die +} + multilib_src_configure() { lfs_fallocate_test # The scanf test in a run-time test which fails while cross-compiling. @@ -120,9 +137,9 @@ multilib_src_configure() { local myeconfargs=( --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" --with-bashcompletiondir="$(get_bashcompdir)" + --without-python $(multilib_native_use_enable suid makeinstall-chown) $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_with python) $(multilib_native_use_with readline) $(multilib_native_use_with slang) $(multilib_native_use_with systemd) @@ -142,6 +159,7 @@ multilib_src_configure() { --disable-chfn-chsh --disable-login --disable-nologin + --disable-pylibmount --disable-su --enable-agetty --enable-bash-completion @@ -179,10 +197,44 @@ multilib_src_configure() { fi fi ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi && use python; then + python_foreach_impl python_configure + fi +} + +python_compile() { + pushd "${BUILD_DIR}" >/dev/null || die + emake all + popd >/dev/null || die +} + +multilib_src_compile() { + emake all + + if multilib_is_native_abi && use python; then + python_foreach_impl python_compile + fi +} + +python_test() { + pushd "${BUILD_DIR}" >/dev/null || die + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + popd >/dev/null || die } multilib_src_test() { emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + if multilib_is_native_abi && use python; then + python_foreach_impl python_test + fi +} + +python_install() { + pushd "${BUILD_DIR}" >/dev/null || die + emake DESTDIR="${D}" install + python_optimize + popd >/dev/null || die } multilib_src_install() { @@ -191,8 +243,10 @@ multilib_src_install() { if multilib_is_native_abi && use userland_GNU; then # need the libs in / gen_usr_ldscript -a blkid fdisk mount smartcols uuid + fi - use python && python_optimize + if multilib_is_native_abi && use python; then + python_foreach_impl python_install fi } diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest index a551de2f6eda..d805a28934b9 100644 --- a/sys-apps/xinetd/Manifest +++ b/sys-apps/xinetd/Manifest @@ -1,5 +1,4 @@ AUX xinetd-2.3.14-DESTDIR.patch 1725 BLAKE2B e6812de025a32c6adce24093753a4e44a345096ac8d2bd43d34e7472bf2deaea4c3b70abc9f0fbc98bf933b0d90166abcdaad9c829adbebe422dc51265306c6d SHA512 31976a84faf2f890a0fb33404c3e07d399be5eeaad49b00f52a459df38f12bb3ecd743577c5a7aa4f0fd90c025a262683307e736e97d51e35591756a7c69698b -AUX xinetd-2.3.14-config.patch 154 BLAKE2B d003faa46d6ecc20d57d087896acc3f39a12592a76454a236a9a87bbcd9cae8735da64a90db5c074242109bfb776475997675363963053b76691d22cd976af4f SHA512 ae8e7254e029da714e9f65cdeac3f3f9a8f09e962248aea38842e356a3c860f5bde5bb1ed81cd79cbad3e34989d8f37273791a725794b372ce0b5c5fedae1432 AUX xinetd-2.3.14-install-contrib.patch 728 BLAKE2B 4624096a41c3ce819f8976b561e761a65b7308dbaa7863e6c287f99a1ac206497c5ef9dc0222a0d81ab565d280394a44573b3ba7734879b24644a53efe6e5f77 SHA512 15b8b1649b02e2d8834eb057bef7345497d230a4b10600e9b3e2a83511f9c7df115009ba1f38b1c4907417735454cafbbc41a96266fbb4370c584ecf1aa1638b AUX xinetd-2.3.15-config.patch 437 BLAKE2B 50cf65153ee242dd0bc7ec587ee7f50de6d7385e1f6ffa213b11e70f2f584d42ee544f7be297b38275290338afaf689cb0aed9d1435a14bb3e0f0b25b6a42ba9 SHA512 58a9880ca154441c5cfc3ed978a0224601d406a4422435a430b885985a0fbe7ef0d750f54047cb0d7fc5c6ab7bc35433776bb5c6c2c61525e2a04b49d509ad66 AUX xinetd-2.3.15-creds.patch 367 BLAKE2B d2ffeb2d83b1c604556e240177417d79e2d4ce499c4fdb0b431a414835a4e2eaa5b24e01ab4e698211bfd2e63d2872ebd9456af81faa2fb755342bfe2cdfa2fb SHA512 5d1d883620ed6c1ae0e391687a1a10769eb4c2436cf8bae60ddbbb7b8d1250272c2aa7068c308ee1f3540a41fcdf8ae890a7687ff0213553c59f6a91718f46c1 diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-config.patch b/sys-apps/xinetd/files/xinetd-2.3.14-config.patch deleted file mode 100644 index c368dea56e1b..000000000000 --- a/sys-apps/xinetd/files/xinetd-2.3.14-config.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- contrib/xinetd.conf -+++ contrib/xinetd.conf -@@ -22,5 +22,5 @@ - # - # no_access = --# only_from = -+ only_from = localhost - # max_load = 0 - cps = 50 10 -- cgit v1.2.3