From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- sys-apps/Manifest.gz | Bin 48706 -> 48699 bytes sys-apps/apparmor-utils/Manifest | 2 +- .../apparmor-utils/apparmor-utils-3.0.1.ebuild | 4 +- sys-apps/arrayprobe/Manifest | 2 +- sys-apps/arrayprobe/metadata.xml | 3 - sys-apps/baobab/Manifest | 4 +- sys-apps/baobab/baobab-3.38.0.ebuild | 38 --- sys-apps/baobab/baobab-40.0.ebuild | 2 +- sys-apps/busybox/Manifest | 8 +- sys-apps/busybox/busybox-1.32.1-r1.ebuild | 343 +++++++++++++++++++++ sys-apps/busybox/busybox-1.32.1.ebuild | 339 -------------------- sys-apps/busybox/busybox-1.33.0.ebuild | 339 -------------------- sys-apps/busybox/busybox-1.33.1.ebuild | 343 +++++++++++++++++++++ sys-apps/busybox/busybox-9999.ebuild | 17 +- sys-apps/coreutils/Manifest | 5 +- sys-apps/coreutils/coreutils-8.31-r1.ebuild | 212 ------------- sys-apps/coreutils/coreutils-8.32-r1.ebuild | 2 +- .../files/coreutils-8.31-sandbox-env-test.patch | 52 ---- sys-apps/edac-utils/Manifest | 2 +- sys-apps/edac-utils/edac-utils-0.18.ebuild | 4 +- sys-apps/edid-fixdim/Manifest | 2 +- sys-apps/edid-fixdim/edid-fixdim-1.ebuild | 4 +- sys-apps/fwupd/Manifest | 4 +- sys-apps/fwupd/fwupd-1.5.9-r1.ebuild | 168 ++++++++++ sys-apps/fwupd/fwupd-1.5.9.ebuild | 168 ---------- sys-apps/fwupd/fwupd-1.6.0-r1.ebuild | 171 ++++++++++ sys-apps/fwupd/fwupd-1.6.0.ebuild | 171 ---------- sys-apps/gnome-disk-utility/Manifest | 6 +- .../gnome-disk-utility-3.38.2.ebuild | 62 ---- .../gnome-disk-utility-40.0.ebuild | 63 ---- .../gnome-disk-utility-40.1.ebuild | 2 +- sys-apps/hwinfo/Manifest | 2 + sys-apps/hwinfo/hwinfo-21.74.ebuild | 61 ++++ sys-apps/ibm-powerpc-utils/Manifest | 5 +- .../files/ibm-powerpc-utils-1.3.8-musl.patch | 95 ++++++ .../ibm-powerpc-utils-1.3.8-r1.ebuild | 3 +- .../ibm-powerpc-utils-99999.ebuild | 3 +- sys-apps/iproute2/Manifest | 3 - .../files/iproute2-4.20.0-configure-nomagic.patch | 208 ------------- sys-apps/iproute2/iproute2-5.7.0.ebuild | 159 ---------- sys-apps/irqbalance/Manifest | 4 +- sys-apps/irqbalance/irqbalance-1.7.0.ebuild | 62 ---- sys-apps/irqbalance/irqbalance-1.8.0.ebuild | 2 +- sys-apps/less/Manifest | 4 +- sys-apps/less/less-563-r1.ebuild | 44 --- sys-apps/less/less-589.ebuild | 44 +++ sys-apps/lshw/Manifest | 2 +- sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 2 +- sys-apps/memtest86+/Manifest | 3 +- sys-apps/memtest86+/memtest86+-5.01-r4.ebuild | 114 ------- sys-apps/memtest86+/memtest86+-5.01-r5.ebuild | 2 +- sys-apps/memtest86-bin/Manifest | 4 +- .../memtest86-bin/memtest86-bin-9.0_p2000.ebuild | 35 --- sys-apps/memtest86-bin/memtest86-bin-9.1.ebuild | 35 +++ sys-apps/nawk/Manifest | 2 +- sys-apps/nawk/metadata.xml | 17 +- sys-apps/opal-utils/Manifest | 2 + sys-apps/opal-utils/opal-utils-6.8.ebuild | 93 ++++++ sys-apps/osinfo-db/Manifest | 4 +- sys-apps/osinfo-db/osinfo-db-20210312.ebuild | 25 -- sys-apps/osinfo-db/osinfo-db-20210426.ebuild | 2 +- sys-apps/pkgcore/Manifest | 10 +- .../files/pkgcore-0.10.13-metadata-xsd-2.patch | 40 --- sys-apps/pkgcore/pkgcore-0.11.2-r2.ebuild | 48 --- sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild | 54 ---- sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild | 51 --- sys-apps/pkgcore/pkgcore-0.12.0.ebuild | 51 +++ sys-apps/pkgcore/pkgcore-0.12.1.ebuild | 47 +++ sys-apps/portage/Manifest | 2 + sys-apps/portage/portage-3.0.19.ebuild | 266 ++++++++++++++++ sys-apps/razercfg/Manifest | 2 +- sys-apps/razercfg/razercfg-0.42.ebuild | 4 +- sys-apps/readahead-list/Manifest | 2 +- .../readahead-list-1.20060421.1016-r3.ebuild | 7 +- sys-apps/sdparm/Manifest | 4 +- sys-apps/sdparm/sdparm-1.11-r1.ebuild | 34 -- sys-apps/sdparm/sdparm-1.12.ebuild | 2 +- sys-apps/sg3_utils/Manifest | 2 +- sys-apps/sg3_utils/sg3_utils-1.42.ebuild | 4 +- sys-apps/smartmontools/Manifest | 2 - sys-apps/smartmontools/smartmontools-7.1-r1.ebuild | 147 --------- sys-apps/systemd-tmpfiles/Manifest | 3 + .../systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild | 238 ++++++++++++++ sys-apps/sysvinit/Manifest | 6 - sys-apps/sysvinit/files/inittab-2.95 | 61 ---- .../files/sysvinit-2.95_beta-shutdown-h.patch | 87 ------ sys-apps/sysvinit/sysvinit-2.97.ebuild | 144 --------- sys-apps/sysvinit/sysvinit-2.98-r1.ebuild | 144 --------- sys-apps/usbredir/Manifest | 4 +- sys-apps/usbredir/usbredir-0.8.0.ebuild | 40 --- sys-apps/usbredir/usbredir-0.9.0.ebuild | 2 +- sys-apps/util-linux/Manifest | 3 - .../util-linux-2.35.1-cleanup-pidfd-include.patch | 36 --- sys-apps/util-linux/util-linux-2.35.2.ebuild | 319 ------------------- 94 files changed, 2044 insertions(+), 3405 deletions(-) delete mode 100644 sys-apps/baobab/baobab-3.38.0.ebuild create mode 100644 sys-apps/busybox/busybox-1.32.1-r1.ebuild delete mode 100644 sys-apps/busybox/busybox-1.32.1.ebuild delete mode 100644 sys-apps/busybox/busybox-1.33.0.ebuild create mode 100644 sys-apps/busybox/busybox-1.33.1.ebuild delete mode 100644 sys-apps/coreutils/coreutils-8.31-r1.ebuild delete mode 100644 sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch create mode 100644 sys-apps/fwupd/fwupd-1.5.9-r1.ebuild delete mode 100644 sys-apps/fwupd/fwupd-1.5.9.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.6.0-r1.ebuild delete mode 100644 sys-apps/fwupd/fwupd-1.6.0.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-40.0.ebuild create mode 100644 sys-apps/hwinfo/hwinfo-21.74.ebuild create mode 100644 sys-apps/ibm-powerpc-utils/files/ibm-powerpc-utils-1.3.8-musl.patch delete mode 100644 sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch delete mode 100644 sys-apps/iproute2/iproute2-5.7.0.ebuild delete mode 100644 sys-apps/irqbalance/irqbalance-1.7.0.ebuild delete mode 100644 sys-apps/less/less-563-r1.ebuild create mode 100644 sys-apps/less/less-589.ebuild delete mode 100644 sys-apps/memtest86+/memtest86+-5.01-r4.ebuild delete mode 100644 sys-apps/memtest86-bin/memtest86-bin-9.0_p2000.ebuild create mode 100644 sys-apps/memtest86-bin/memtest86-bin-9.1.ebuild create mode 100644 sys-apps/opal-utils/opal-utils-6.8.ebuild delete mode 100644 sys-apps/osinfo-db/osinfo-db-20210312.ebuild delete mode 100644 sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch delete mode 100644 sys-apps/pkgcore/pkgcore-0.11.2-r2.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild create mode 100644 sys-apps/pkgcore/pkgcore-0.12.0.ebuild create mode 100644 sys-apps/pkgcore/pkgcore-0.12.1.ebuild create mode 100644 sys-apps/portage/portage-3.0.19.ebuild delete mode 100644 sys-apps/sdparm/sdparm-1.11-r1.ebuild delete mode 100644 sys-apps/smartmontools/smartmontools-7.1-r1.ebuild create mode 100644 sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild delete mode 100644 sys-apps/sysvinit/files/inittab-2.95 delete mode 100644 sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch delete mode 100644 sys-apps/sysvinit/sysvinit-2.97.ebuild delete mode 100644 sys-apps/sysvinit/sysvinit-2.98-r1.ebuild delete mode 100644 sys-apps/usbredir/usbredir-0.8.0.ebuild delete mode 100644 sys-apps/util-linux/files/util-linux-2.35.1-cleanup-pidfd-include.patch delete mode 100644 sys-apps/util-linux/util-linux-2.35.2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index faa14a17389a..a4a0d3a39a3f 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index 2d1bb528c443..355d74853c8d 100644 --- a/sys-apps/apparmor-utils/Manifest +++ b/sys-apps/apparmor-utils/Manifest @@ -3,5 +3,5 @@ DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 EBUILD apparmor-utils-2.13.4-r1.ebuild 2225 BLAKE2B 03e025478bc9bf820f2713f46560977a896b8c13d9ad7a6d10d5275c65381dc8ba583029ccf55ce97edfe53de30e34221544748b55441f299cf4880453f71b85 SHA512 231dcfdfc50e8ad87f048f5da649833260078889901d42fe9755ad2ad5f40a9f182825249ae3b4e4fec26975f2000eb35beed09bfab06a1ba80807d104febb0b EBUILD apparmor-utils-3.0.0-r1.ebuild 2270 BLAKE2B 95fe0b156112e24ce36ddd845ebba2b39f2e46f9b2ebfeca8caf51c8677652f981fe96d59c67964c9302aa0d5347202581c95f8c816fc664547e6f4d2b6f4cc5 SHA512 9e7a204150878852efafee1c9d76d63ae247e5a110f779f2262e47eec0ec168489ad9fb6a14b3c0cb5e6c36357e64c06c326de453056530c150a2cdbbb9166ba -EBUILD apparmor-utils-3.0.1.ebuild 2267 BLAKE2B af3f742a1382850fc0041f44034e4bd07e55b40fe78de9b117f00db48c1f33b69a7347bde5a36ade00aacbdaa19ddb495177455acd160b44c7391153e5c9718f SHA512 af728a36ce7769daa02f5aa9644537af6b3d0694945a0f21efae38e21057f69b7068c2e18c68b19762280e8a725cf969b1617fcb8bffe7eedadf63a13eef976e +EBUILD apparmor-utils-3.0.1.ebuild 2271 BLAKE2B 3f271bdaace473c8a1625f2655ff53e14c650072074fe9efdbea7809ec2b9faccdefe969505435f6acfe85f1763b53e6ff574132580f82f04d5cdcf0002386f6 SHA512 7464d7ce47e75ddfd4600306430ac26d25ced6f3a15874105c09e0749ddf80b17bd4ea9288f43cf05e7becd55ab7a9ab271361cd4b6f29ee7acafa5a3edc1689 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8 diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild index 3ebacd48cc58..2b76a3e45135 100644 --- a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild +++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{3_7,3_8} ) +PYTHON_COMPAT=( python{3_7,3_8,3_9} ) inherit eapi7-ver perl-module python-r1 toolchain-funcs MY_PV="$(ver_cut 1-2)" diff --git a/sys-apps/arrayprobe/Manifest b/sys-apps/arrayprobe/Manifest index a85bafa25d11..dff9f8df9971 100644 --- a/sys-apps/arrayprobe/Manifest +++ b/sys-apps/arrayprobe/Manifest @@ -2,4 +2,4 @@ AUX 2.0-ida_headers.patch 15371 BLAKE2B 2a551fd71e90255abb853fd9ab544e839fa4a44b AUX 2.0-malloc-strlen.patch 1080 BLAKE2B 55a1ba7f3c18bc4d2b1bef277a250a9cab8aff7eaf9760981a564a3df671875fd47be0b658b01bd379d1682788c856271c66046ea412cca3838a2da4ff202a16 SHA512 6eca6fdc118ab21451640540f4ab76213a8a79d9e6bb4cbb1519535c8b44b955824486fdeab622cf6fe1ad421b36012399d029ae2679deb159a56918e7003981 DIST arrayprobe-2.0.tar.gz 83831 BLAKE2B 6a9b76260c91b271068be914161bd99c4ce2285c58ce98c689f6bef32200701430bb65306e74a1d9277d7a4d9e4aa0adf4af60af0c4264020ae07a73f49a51de SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870 EBUILD arrayprobe-2.0-r2.ebuild 558 BLAKE2B 4b94a0963538e77755d008decd74b4f26d3a787058bc4864252843c452548a37192ead816eb8b33de43f6fba62fb29f561b618bb01bc61705ccc3dba749f575c SHA512 af2f61ca914863caa32b63c21fda428e63817b1cec1f4d401f89cea5e4cc3ae50a982fde8d04486df1ce4b1afbd0b9ec8c46569dd54d4e4612c165f7babd7bda -MISC metadata.xml 330 BLAKE2B 30259c749509242f02c31dd55057f4ab4ba7e13cdda877ef28e5a66c6d4da5b12684bbb6a2e144cae18cb6dc9bbc1b5c1fb14b1bfcf17474151a6624a1041036 SHA512 a7b0f31767ddd2a38acc2af4700f6129e6a78553f6bee63827d7706064570dccd5e5bf48b407b9e534bef4bbc6b384c326a79121079e68d25e3494601b3b0e1b +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/arrayprobe/metadata.xml b/sys-apps/arrayprobe/metadata.xml index f35b285c1eee..56c124413057 100644 --- a/sys-apps/arrayprobe/metadata.xml +++ b/sys-apps/arrayprobe/metadata.xml @@ -1,9 +1,6 @@ - - chainsaw@gentoo.org - base-system@gentoo.org Gentoo Base System diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest index cb048e6faac7..5bd0925bde64 100644 --- a/sys-apps/baobab/Manifest +++ b/sys-apps/baobab/Manifest @@ -1,5 +1,3 @@ -DIST baobab-3.38.0.tar.xz 579948 BLAKE2B b0ad702ff105e8308b7b9a5904b9331c0fe99db8b78a154a4b67ebc8b09992d967d896c713df42640319bab3c03de1130b88daf4f23be996ee3bc0bdb633a625 SHA512 764fc97ccab01d056fb657cda3c04e742d865e4c6ca16d4a5212a9d5470e961c8fe3523a27ab28945c38c25c1155903897e178b9ffaf0a6c07c6a044e29a750c DIST baobab-40.0.tar.xz 581744 BLAKE2B 12fc2023a19512117c235a54ac36045e1a733c4d64d8ff1ea77d6be624d442ed66bca83788ffc19be36855207cb693c8f1aa4793c8750e84d60c1b84e79b869b SHA512 31ab768f7e089c12717bc363111fe936f4a15986b69ee53b8f9aab19973ff5bf4970fdfa4d936af4d46673a9f08063518a6c314453e698e6068485152e400650 -EBUILD baobab-3.38.0.ebuild 716 BLAKE2B 4517ebecc5a6c6c9d96fe680cedaccfb69967f435afd05e92a2036be150dbe3687b723be81ce1ce5a63d4efc944144e476cd8b61ce1c815bc16a831f564ec736 SHA512 8ebe2322af4370235c695c1ba813184696cda7882898dde65ce5b65ebfd68d8580a50cfe273d33bef6733393b8b0cef7b28dd11559b40410be0af38afe8cb0bf -EBUILD baobab-40.0.ebuild 814 BLAKE2B d873a555763d064b111c26fd5acf5976083a89909820b4a2d085cb1b445ca01ddc5081bdebe5f308c47d447af20bd7b8c4e96dbd4ef4578b636d1fe3c78a24bc SHA512 415dc3a9a5c1627e28b78b5c3969c31829a061426c1e8a1d9602f41fa981a17f0e3e837f8f0346595e42846f8a67511b460637de5b2b2a546379870e3531beb5 +EBUILD baobab-40.0.ebuild 812 BLAKE2B 282faed42f2340d0c0cec2dbe6976106f1a601d085c5b3948d9d6000f8505ee29ed3e5ca56576e1a500eaddf268c779393caa4bbe480bc12c76de05b419e717f SHA512 c95443f3a13b4ca58768d0833f14331892d8833696ce7431f7d34c5713ea780e7a60d601ca1c00493ee045adbdf9b57f2d27eedc56a39561e978eadcdafec2cd MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/baobab/baobab-3.38.0.ebuild b/sys-apps/baobab/baobab-3.38.0.ebuild deleted file mode 100644 index b3ff70089509..000000000000 --- a/sys-apps/baobab/baobab-3.38.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils vala xdg meson - -DESCRIPTION="Disk usage browser for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Baobab" - -LICENSE="GPL-2+ FDL-1.1+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-libs/glib-2.44:2 - >=x11-libs/gtk+-3.20:3" -DEPEND="${RDEPEND}" -BDEPEND=" - $(vala_depend) - dev-util/itstool - >=sys-devel/gettext-0.21 - virtual/pkgconfig" - -src_prepare() { - vala_src_prepare - xdg_src_prepare -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sys-apps/baobab/baobab-40.0.ebuild b/sys-apps/baobab/baobab-40.0.ebuild index ff893b860427..b594a695c112 100644 --- a/sys-apps/baobab/baobab-40.0.ebuild +++ b/sys-apps/baobab/baobab-40.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab" LICENSE="GPL-2+ FDL-1.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/glib-2.44:2 diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 0202d3735b29..bc68281b9fb7 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -14,8 +14,8 @@ AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e75 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5 DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd -DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a -EBUILD busybox-1.32.1.ebuild 9579 BLAKE2B ca46d5c3161015e8623926604d79dd230eb7587ba442e5249fcaede9c9156ddcbd19e0a15eeacda3816dd51ec8ea0b11a9a4177a4ebb4dcdfd327612e2f4ad4e SHA512 ee80215d96d29bee8d675ba462046139dba49a00e4d089e29f471d296acc1d5b7ba04143a2821ca13cbc46d1814c9c8380abe2ef82a065ee926e34d67acfcf4a -EBUILD busybox-1.33.0.ebuild 9586 BLAKE2B 8e8f1adbd071258c916ec7be204528854b9a8312f86ea67eaeab08b0b9b3a1b8a71bd802e338a105f6e32c7784aa1c7b038f9d786c776844865a2918c2dcfdc5 SHA512 43d16032edae71ed1c03a141c82525086f454dbc320c6f3746d0a6e17a124271a0eefa75cc2ac90e8faad11cee86e382fcb4002ee046e4772aada0498d517227 -EBUILD busybox-9999.ebuild 9550 BLAKE2B 2c2706c0ba15593df3b377c4b2fd10dc163c7f07ca1d99307ffd2a5ea3de8d5ebfa6c0876f3d5319d3d75fc15e2aca7d6873abb0424341b0d3b8a7677e473fde SHA512 ff39fd205050834de39a706df3c7b360d5a9b394d55d2f2633c7f7bcfe739e8f6d5ce566656593a01c351c69d54468cac2f0ebbd470d557b6106cf23544f5c92 +DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a +EBUILD busybox-1.32.1-r1.ebuild 9641 BLAKE2B 95830049ca9fd1ba62152d401bfab07c1f85221b2df691055d31c8eebda7ebe7441c51704b00dbc80529929e8e34a24ffbdbeb57ed46eb5d11cde24bec912f1d SHA512 7b1a7849cb2ca44237156533c48ca942663cdaa9794876ae3f5ac8d5052ce41695de561d32779ebb79c53ef07453b22bb1cdbb581b9f6a6999909f0c4f7b667e +EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406 +EBUILD busybox-9999.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 diff --git a/sys-apps/busybox/busybox-1.32.1-r1.ebuild b/sys-apps/busybox/busybox-1.32.1-r1.ebuild new file mode 100644 index 000000000000..7deed6114019 --- /dev/null +++ b/sys-apps/busybox/busybox-1.32.1-r1.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# See `man savedconfig.eclass` for info on how to use USE=savedconfig. + +EAPI=7 + +inherit flag-o-matic savedconfig toolchain-funcs + +DESCRIPTION="Utilities for rescue and embedded systems" +HOMEPAGE="https://www.busybox.net/" +if [[ ${PV} == "9999" ]] ; then + MY_P=${P} + EGIT_REPO_URI="https://git.busybox.net/busybox" + inherit git-r3 +else + MY_P=${PN}-${PV/_/-} + SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" # GPL-2 only +SLOT="0" +IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" +REQUIRED_USE="pam? ( !static )" +RESTRICT="test" + +# TODO: Could make pkgconfig conditional on selinux? bug #782829 +COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) + pam? ( sys-libs/pam ) + virtual/libcrypt:=" +DEPEND="${COMMON_DEPEND} + static? ( + virtual/libcrypt[static-libs] + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) + >=sys-kernel/linux-headers-2.6.39" +BDEPEND="virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + mdev? ( !::g' \ + Makefile.flags || die + #sed -i '/bbsh/s:^//::' include/applets.h + sed -i '/^#error Aborting compilation./d' applets/applets.c || die + use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile + sed -i \ + -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ + -e "/^AR\>/s:=.*:= $(tc-getAR):" \ + -e "/^CC\>/s:=.*:= $(tc-getCC):" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ + Makefile || die + sed -i \ + -e 's:-static-libgcc::' \ + Makefile.flags || die +} + +src_configure() { + # check for a busybox config before making one of our own. + # if one exist lets return and use it. + + restore_config .config + if [ -f .config ]; then + yes "" | emake -j1 -s oldconfig >/dev/null + return 0 + else + ewarn "Could not locate user configfile, so we will save a default one" + fi + + # setup the config file + emake -j1 -s allyesconfig >/dev/null + # nommu forces a bunch of things off which we want on #387555 + busybox_config_option n NOMMU + sed -i '/^#/d' .config + yes "" | emake -j1 -s oldconfig >/dev/null + + # now turn off stuff we really don't want + busybox_config_option n DMALLOC + busybox_config_option n FEATURE_2_4_MODULES #607548 + busybox_config_option n FEATURE_SUID_CONFIG + busybox_config_option n BUILD_AT_ONCE + busybox_config_option n BUILD_LIBBUSYBOX + busybox_config_option n FEATURE_CLEAN_UP + busybox_config_option n MONOTONIC_SYSCALL + busybox_config_option n USE_PORTABLE_CODE + busybox_config_option n WERROR + # triming the BSS size may be dangerous + busybox_config_option n FEATURE_USE_BSS_TAIL + + # These cause trouble with musl. + if use elibc_musl; then + busybox_config_option n FEATURE_UTMP + busybox_config_option n EXTRA_COMPAT + busybox_config_option n FEATURE_VI_REGEX_SEARCH + fi + + # If these are not set and we are using a uclibc/busybox setup + # all calls to system() will fail. + busybox_config_option y ASH + busybox_config_option y SH_IS_ASH + busybox_config_option n HUSH + busybox_config_option n SH_IS_HUSH + + busybox_config_option '"/run"' PID_FILE_PATH + busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH + + # disable ipv6 applets + if ! use ipv6; then + busybox_config_option n FEATURE_IPV6 + busybox_config_option n TRACEROUTE6 + busybox_config_option n PING6 + busybox_config_option n UDHCPC6 + fi + + busybox_config_option pam PAM + busybox_config_option static STATIC + busybox_config_option syslog {K,SYS}LOGD LOGGER + busybox_config_option systemd FEATURE_SYSTEMD + busybox_config_option math FEATURE_AWK_LIBM + + # disable features that uClibc doesn't (yet?) provide. + if use elibc_uclibc; then + busybox_config_option n FEATURE_SYNC_FANCY #567598 + busybox_config_option n NSENTER + fi + + # all the debug options are compiler related, so punt them + busybox_config_option n DEBUG_SANITIZE + busybox_config_option n DEBUG + busybox_config_option y NO_DEBUG_LIB + busybox_config_option n DMALLOC + busybox_config_option n EFENCE + busybox_config_option $(usex debug y n) TFTP_DEBUG + + busybox_config_option selinux SELINUX + + # this opt only controls mounting with /dev/null +} + +src_compile() { + unset KBUILD_OUTPUT #88088 + export SKIP_STRIP=y + + emake V=1 busybox + + # bug #701512 + emake V=1 doc +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + dodir /bin + if use sep-usr ; then + # install /ginit to take care of mounting stuff + exeinto / + newexe busybox_unstripped ginit + dosym /ginit /bin/bb + dosym bb /bin/busybox + else + newbin busybox_unstripped busybox + dosym busybox /bin/bb + fi + if use mdev ; then + dodir /$(get_libdir)/mdev/ + use make-symlinks || dosym /bin/bb /sbin/mdev + cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf + + exeinto /$(get_libdir)/mdev/ + doexe "${FILESDIR}"/mdev/* + + newinitd "${FILESDIR}"/mdev.initd mdev + fi + if use livecd ; then + dosym busybox /bin/vi + fi + + # add busybox daemon's, bug #444718 + if busybox_config_enabled FEATURE_NTPD_SERVER; then + newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" + newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" + fi + if busybox_config_enabled SYSLOGD; then + newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" + newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" + fi + if busybox_config_enabled KLOGD; then + newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" + newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" + fi + if busybox_config_enabled WATCHDOG; then + newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" + newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" + fi + if busybox_config_enabled UDHCPC; then + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) + exeinto "${path%/*}" + newexe examples/udhcp/simple.script "${path##*/}" + fi + if busybox_config_enabled UDHCPD; then + insinto /etc + doins examples/udhcp/udhcpd.conf + fi + + # bundle up the symlink files for use later + emake DESTDIR="${ED}" install + rm _install/bin/busybox + # for compatibility, provide /usr/bin/env + mkdir -p _install/usr/bin + ln -s /bin/env _install/usr/bin/env + tar cf busybox-links.tar -C _install . || : #;die + insinto /usr/share/${PN} + use make-symlinks && doins busybox-links.tar + + dodoc AUTHORS README TODO + + cd docs || die + doman busybox.1 + docinto txt + dodoc *.txt + docinto pod + dodoc *.pod + docinto html + dodoc *.html + + cd ../examples || die + docinto examples + dodoc inittab depmod.pl *.conf *.script undeb unrpm +} + +pkg_preinst() { + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then + ewarn "setting USE=make-symlinks and emerging to / is very dangerous." + ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." + ewarn "If you are creating a binary only and not merging this is probably ok." + ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." + die "silly options will destroy your system" + fi + + if use make-symlinks ; then + mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die + fi +} + +pkg_postinst() { + savedconfig_pkg_postinst + + if use make-symlinks ; then + cd "${T}" || die + mkdir _install + tar xf busybox-links.tar -C _install || die + cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + fi + + if use sep-usr ; then + elog "In order to use the sep-usr support, you have to update your" + elog "kernel command line. Add the option:" + elog " init=/ginit" + elog "To launch a different init than /sbin/init, use:" + elog " init=/ginit /sbin/yourinit" + elog "To get a rescue shell, you may boot with:" + elog " init=/ginit bb" + fi +} diff --git a/sys-apps/busybox/busybox-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1.ebuild deleted file mode 100644 index 56929b85f919..000000000000 --- a/sys-apps/busybox/busybox-1.32.1.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI=7 - -inherit flag-o-matic savedconfig toolchain-funcs - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="https://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${P} - EGIT_REPO_URI="https://git.busybox.net/busybox" - inherit git-r3 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" # GPL-2 only -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" -REQUIRED_USE="pam? ( !static )" -RESTRICT="test" - -# TODO: Could make pkgconfig conditional on selinux? bug #782829 -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam ) - virtual/libcrypt:=" -DEPEND="${COMMON_DEPEND} - static? ( - virtual/libcrypt[static-libs] - selinux? ( sys-libs/libselinux[static-libs(+)] ) - ) - >=sys-kernel/linux-headers-2.6.39" -BDEPEND="virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - mdev? ( !::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s allyesconfig >/dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_2_4_MODULES #607548 - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - # triming the BSS size may be dangerous - busybox_config_option n FEATURE_USE_BSS_TAIL - - # These cause trouble with musl. - if use elibc_musl; then - busybox_config_option n FEATURE_UTMP - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - fi - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option y SH_IS_ASH - busybox_config_option n HUSH - busybox_config_option n SH_IS_HUSH - - busybox_config_option '"/run"' PID_FILE_PATH - busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - busybox_config_option pam PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # disable features that uClibc doesn't (yet?) provide. - if use elibc_uclibc; then - busybox_config_option n FEATURE_SYNC_FANCY #567598 - busybox_config_option n NSENTER - fi - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG_SANITIZE - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - docinto html - dodoc *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.33.0.ebuild b/sys-apps/busybox/busybox-1.33.0.ebuild deleted file mode 100644 index 1b069a81190c..000000000000 --- a/sys-apps/busybox/busybox-1.33.0.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI=7 - -inherit flag-o-matic savedconfig toolchain-funcs - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="https://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${P} - EGIT_REPO_URI="https://git.busybox.net/busybox" - inherit git-r3 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" # GPL-2 only -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" -REQUIRED_USE="pam? ( !static )" -RESTRICT="test" - -# TODO: Could make pkgconfig conditional on selinux? bug #782829 -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam ) - virtual/libcrypt:=" -DEPEND="${COMMON_DEPEND} - static? ( - virtual/libcrypt[static-libs] - selinux? ( sys-libs/libselinux[static-libs(+)] ) - ) - >=sys-kernel/linux-headers-2.6.39" -BDEPEND="virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - mdev? ( !::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s allyesconfig >/dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_2_4_MODULES #607548 - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - # triming the BSS size may be dangerous - busybox_config_option n FEATURE_USE_BSS_TAIL - - # These cause trouble with musl. - if use elibc_musl; then - busybox_config_option n FEATURE_UTMP - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - fi - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option y SH_IS_ASH - busybox_config_option n HUSH - busybox_config_option n SH_IS_HUSH - - busybox_config_option '"/run"' PID_FILE_PATH - busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - busybox_config_option pam PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # disable features that uClibc doesn't (yet?) provide. - if use elibc_uclibc; then - busybox_config_option n FEATURE_SYNC_FANCY #567598 - busybox_config_option n NSENTER - fi - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG_SANITIZE - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - docinto html - dodoc *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.33.1.ebuild b/sys-apps/busybox/busybox-1.33.1.ebuild new file mode 100644 index 000000000000..e9062e18e44c --- /dev/null +++ b/sys-apps/busybox/busybox-1.33.1.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# See `man savedconfig.eclass` for info on how to use USE=savedconfig. + +EAPI=7 + +inherit flag-o-matic savedconfig toolchain-funcs + +DESCRIPTION="Utilities for rescue and embedded systems" +HOMEPAGE="https://www.busybox.net/" +if [[ ${PV} == "9999" ]] ; then + MY_P=${P} + EGIT_REPO_URI="https://git.busybox.net/busybox" + inherit git-r3 +else + MY_P=${PN}-${PV/_/-} + SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" # GPL-2 only +SLOT="0" +IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" +REQUIRED_USE="pam? ( !static )" +RESTRICT="test" + +# TODO: Could make pkgconfig conditional on selinux? bug #782829 +COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) + pam? ( sys-libs/pam ) + virtual/libcrypt:=" +DEPEND="${COMMON_DEPEND} + static? ( + virtual/libcrypt[static-libs] + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) + >=sys-kernel/linux-headers-2.6.39" +BDEPEND="virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + mdev? ( !::g' \ + Makefile.flags || die + #sed -i '/bbsh/s:^//::' include/applets.h + sed -i '/^#error Aborting compilation./d' applets/applets.c || die + use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile + sed -i \ + -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ + -e "/^AR\>/s:=.*:= $(tc-getAR):" \ + -e "/^CC\>/s:=.*:= $(tc-getCC):" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ + Makefile || die + sed -i \ + -e 's:-static-libgcc::' \ + Makefile.flags || die +} + +src_configure() { + # check for a busybox config before making one of our own. + # if one exist lets return and use it. + + restore_config .config + if [ -f .config ]; then + yes "" | emake -j1 -s oldconfig >/dev/null + return 0 + else + ewarn "Could not locate user configfile, so we will save a default one" + fi + + # setup the config file + emake -j1 -s allyesconfig >/dev/null + # nommu forces a bunch of things off which we want on #387555 + busybox_config_option n NOMMU + sed -i '/^#/d' .config + yes "" | emake -j1 -s oldconfig >/dev/null + + # now turn off stuff we really don't want + busybox_config_option n DMALLOC + busybox_config_option n FEATURE_2_4_MODULES #607548 + busybox_config_option n FEATURE_SUID_CONFIG + busybox_config_option n BUILD_AT_ONCE + busybox_config_option n BUILD_LIBBUSYBOX + busybox_config_option n FEATURE_CLEAN_UP + busybox_config_option n MONOTONIC_SYSCALL + busybox_config_option n USE_PORTABLE_CODE + busybox_config_option n WERROR + # triming the BSS size may be dangerous + busybox_config_option n FEATURE_USE_BSS_TAIL + + # These cause trouble with musl. + if use elibc_musl; then + busybox_config_option n FEATURE_UTMP + busybox_config_option n EXTRA_COMPAT + busybox_config_option n FEATURE_VI_REGEX_SEARCH + fi + + # If these are not set and we are using a uclibc/busybox setup + # all calls to system() will fail. + busybox_config_option y ASH + busybox_config_option y SH_IS_ASH + busybox_config_option n HUSH + busybox_config_option n SH_IS_HUSH + + busybox_config_option '"/run"' PID_FILE_PATH + busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH + + # disable ipv6 applets + if ! use ipv6; then + busybox_config_option n FEATURE_IPV6 + busybox_config_option n TRACEROUTE6 + busybox_config_option n PING6 + busybox_config_option n UDHCPC6 + fi + + busybox_config_option pam PAM + busybox_config_option static STATIC + busybox_config_option syslog {K,SYS}LOGD LOGGER + busybox_config_option systemd FEATURE_SYSTEMD + busybox_config_option math FEATURE_AWK_LIBM + + # disable features that uClibc doesn't (yet?) provide. + if use elibc_uclibc; then + busybox_config_option n FEATURE_SYNC_FANCY #567598 + busybox_config_option n NSENTER + fi + + # all the debug options are compiler related, so punt them + busybox_config_option n DEBUG_SANITIZE + busybox_config_option n DEBUG + busybox_config_option y NO_DEBUG_LIB + busybox_config_option n DMALLOC + busybox_config_option n EFENCE + busybox_config_option $(usex debug y n) TFTP_DEBUG + + busybox_config_option selinux SELINUX + + # this opt only controls mounting with /dev/null +} + +src_compile() { + unset KBUILD_OUTPUT #88088 + export SKIP_STRIP=y + + emake V=1 busybox + + # bug #701512 + emake V=1 doc +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + dodir /bin + if use sep-usr ; then + # install /ginit to take care of mounting stuff + exeinto / + newexe busybox_unstripped ginit + dosym /ginit /bin/bb + dosym bb /bin/busybox + else + newbin busybox_unstripped busybox + dosym busybox /bin/bb + fi + if use mdev ; then + dodir /$(get_libdir)/mdev/ + use make-symlinks || dosym /bin/bb /sbin/mdev + cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf + + exeinto /$(get_libdir)/mdev/ + doexe "${FILESDIR}"/mdev/* + + newinitd "${FILESDIR}"/mdev.initd mdev + fi + if use livecd ; then + dosym busybox /bin/vi + fi + + # add busybox daemon's, bug #444718 + if busybox_config_enabled FEATURE_NTPD_SERVER; then + newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" + newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" + fi + if busybox_config_enabled SYSLOGD; then + newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" + newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" + fi + if busybox_config_enabled KLOGD; then + newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" + newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" + fi + if busybox_config_enabled WATCHDOG; then + newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" + newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" + fi + if busybox_config_enabled UDHCPC; then + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) + exeinto "${path%/*}" + newexe examples/udhcp/simple.script "${path##*/}" + fi + if busybox_config_enabled UDHCPD; then + insinto /etc + doins examples/udhcp/udhcpd.conf + fi + + # bundle up the symlink files for use later + emake DESTDIR="${ED}" install + rm _install/bin/busybox + # for compatibility, provide /usr/bin/env + mkdir -p _install/usr/bin + ln -s /bin/env _install/usr/bin/env + tar cf busybox-links.tar -C _install . || : #;die + insinto /usr/share/${PN} + use make-symlinks && doins busybox-links.tar + + dodoc AUTHORS README TODO + + cd docs || die + doman busybox.1 + docinto txt + dodoc *.txt + docinto pod + dodoc *.pod + docinto html + dodoc *.html + + cd ../examples || die + docinto examples + dodoc inittab depmod.pl *.conf *.script undeb unrpm +} + +pkg_preinst() { + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then + ewarn "setting USE=make-symlinks and emerging to / is very dangerous." + ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." + ewarn "If you are creating a binary only and not merging this is probably ok." + ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." + die "silly options will destroy your system" + fi + + if use make-symlinks ; then + mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die + fi +} + +pkg_postinst() { + savedconfig_pkg_postinst + + if use make-symlinks ; then + cd "${T}" || die + mkdir _install + tar xf busybox-links.tar -C _install || die + cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + fi + + if use sep-usr ; then + elog "In order to use the sep-usr support, you have to update your" + elog "kernel command line. Add the option:" + elog " init=/ginit" + elog "To launch a different init than /sbin/init, use:" + elog " init=/ginit /sbin/yourinit" + elog "To get a rescue shell, you may boot with:" + elog " init=/ginit bb" + fi +} diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index d52691079702..e9062e18e44c 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -27,10 +27,13 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" + pam? ( sys-libs/pam ) + virtual/libcrypt:=" DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) + static? ( + virtual/libcrypt[static-libs] + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) >=sys-kernel/linux-headers-2.6.39" BDEPEND="virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} @@ -216,6 +219,9 @@ src_compile() { export SKIP_STRIP=y emake V=1 busybox + + # bug #701512 + emake V=1 doc } src_install() { @@ -287,7 +293,8 @@ src_install() { dodoc AUTHORS README TODO - cd docs + cd docs || die + doman busybox.1 docinto txt dodoc *.txt docinto pod @@ -295,7 +302,7 @@ src_install() { docinto html dodoc *.html - cd ../examples + cd ../examples || die docinto examples dodoc inittab depmod.pl *.conf *.script undeb unrpm } diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 66e8f1a7b22b..922cdff7f6a3 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -1,9 +1,6 @@ -AUX coreutils-8.31-sandbox-env-test.patch 1570 BLAKE2B 8f5625a63df985062c28fdca1bb6743b02de8d22db3e86a0e4f54253b4c9b2c010cfcb0b54384e19b9a329d2054797c651388a0b965ca0e12a8cb6ba96a9780f SHA512 b3803e39e62a96836decb0fa37efe5dc4b29d73658a9303cc6789cb45fb7313a6aea7dd503be80973c69cd56fccaee2d60d04bba2f1d0bdc867c9d4bc99a2c33 AUX coreutils-8.32-ls-restore-8.31-behavior.patch 2824 BLAKE2B 7df44f4e330225a429678b3d5f20736d7c5c4f7d09f51f71d7e1111c3181d494aa12796c823244473063f7905aef35b74703860343c5e30f38520ee340690ede SHA512 6d55806aa16e0f654b15bfefb20f2c16193c7e9fcf7c087309b3254272d20467dea69ac53fff345b510751e165c33197c3053b7308578f79492afba0a1eeb6e5 AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174ad6dd3157be16a28c527b37d1c58b421538a6238e93317689e6cd35b7dc5a0f480a4322c432986697a9e0af60019650eae92c0a SHA512 fd3573cf5a4b4fbba132d0fac5ad6eb4af5aa548a8c0c747653e47acfb97c01e31d7430db543df47d9a2680792d2583de70e1f1d49b2feb75887e9f8638527b7 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 -DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 -EBUILD coreutils-8.31-r1.ebuild 5834 BLAKE2B 5dd1a356f99e4db05ffcefaff61c0b74d8310b04c050a8ed73713514bc47ad4153ab1a9b89db901fe0ac011a6cf3036d8a11dd12a782564939537d115bbf2b41 SHA512 caaaa8e2d22b79c95facc15a3b917c8d194d76f024fb358c9de2e68356c65c18fff871c092e121507c5b2287fca16da4e642e13612c2b8296d92864210e20933 -EBUILD coreutils-8.32-r1.ebuild 5950 BLAKE2B 1bc00f9caed909d0054aaa2ae6a044758a6bdba05b2b39082ee6c7014436a1c6e4300300d87337d8c7dec9812486173da905f29aeee9f3eece1503e3705a9d8f SHA512 d8c15eb91c5b770340801f3c46bfb9d37529db128d2bce399b6d441e1d5d51cbc72894dccff73e4b0160c9adf6b9ca2f391e3432c9c2b7990fbfd36d2c39777a +EBUILD coreutils-8.32-r1.ebuild 5952 BLAKE2B f36627a733cc12af6662232d75938deb476470daa22084be267487a38d0ae42d32ff79c17f42dda25f8d8a7d95fb5b5f8a487de0bec45f364249bd25bceeeec8 SHA512 ec173a036db1b88010acfa13b301370ac80c7da2f1e29ee4b9c8c36e64ed60d98c5c9c111d0f14d93bf3c34b517fe47a98b3c30d3ccf0e17dcedbeec17d93908 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044 diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild deleted file mode 100644 index 6c16ecc18fb4..000000000000 --- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_7 ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -PATCH="${PN}-8.30-patches-01" -DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" -HOMEPAGE="https://www.gnu.org/software/coreutils/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${PATCH}.tar.xz - https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" -IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" -RESTRICT="!test? ( test )" - -LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) - caps? ( sys-libs/libcap ) - gmp? ( dev-libs/gmp:=[static-libs] ) - xattr? ( sys-apps/attr[static-libs] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) - selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - app-arch/xz-utils - test? ( - dev-lang/perl - dev-perl/Expect - dev-util/strace - ${PYTHON_DEPS} - )" -RDEPEND+=" - hostname? ( !sys-apps/net-tools[hostname] ) - kill? ( - !sys-apps/util-linux[kill] - !sys-process/procps[kill] - ) - !app-misc/realpath - ! "${ww}" - #!${EPREFIX}/bin/sh - exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@" - EOF - chmod a+rx "${ww}" || die - done - } - mkwrap mount umount - - addwrite /dev/full - #export RUN_EXPENSIVE_TESTS="yes" - #export FETISH_GROUPS="portage wheel" - env PATH="${T}/mount-wrappers:${PATH}" \ - emake -j1 -k check -} - -src_install() { - default - - insinto /etc - newins src/dircolors.hin DIR_COLORS - - if use split-usr ; then - cd "${ED%/}"/usr/bin || die - dodir /bin - - # Move critical binaries into /bin (required by FHS) - local fhs="cat chgrp chmod chown cp date dd df echo false ln ls - mkdir mknod mv pwd rm rmdir stty sync true uname" - mv ${fhs} ../../bin/ || die "Could not move FHS bins!" - - if use hostname ; then - mv hostname ../../bin/ || die - fi - - if use kill ; then - mv kill ../../bin/ || die - fi - - # Move critical binaries into /bin (common scripts) - # (Why are these required for booting?) - local com="basename chroot cut dir dirname du env expr head mkfifo - mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" - mv ${com} ../../bin/ || die "Could not move common bins!" - - # Create a symlink for uname in /usr/bin/ since autotools require it. - # (Other than uname, we need to figure out why we are - # creating symlinks for these in /usr/bin instead of leaving - # the files there in the first place...) - local x - for x in ${com} uname ; do - dosym ../../bin/${x} /usr/bin/${x} - done - fi -} - -pkg_postinst() { - ewarn "Make sure you run 'hash -r' in your active shells." - ewarn "You should also re-source your shell settings for LS_COLORS" - ewarn " changes, such as: source /etc/profile" -} diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild index 4ff6e6859fbd..47b5462e103f 100644 --- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild +++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit flag-o-matic python-any-r1 toolchain-funcs diff --git a/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch b/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch deleted file mode 100644 index f81ea13776b3..000000000000 --- a/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch +++ /dev/null @@ -1,52 +0,0 @@ -Skip tests known to fail when running under Gentoo sandbox. - ---- a/tests/du/long-from-unreadable.sh -+++ b/tests/du/long-from-unreadable.sh -@@ -29,6 +29,9 @@ - # unnecessarily to using FTS_NOCHDIR mode in this corner case. - - . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -+# Avoid #413621 until #548250 is resolved -+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" -+ - print_ver_ du - - require_perl_ ---- a/tests/ls/stat-free-symlinks.sh -+++ b/tests/ls/stat-free-symlinks.sh -@@ -17,6 +17,9 @@ - # along with this program. If not, see . - - . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -+# Avoid #413621 until #548250 is resolved -+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" -+ - print_ver_ ls - require_strace_ stat - ---- a/tests/misc/env-S.pl -+++ b/tests/misc/env-S.pl -@@ -30,6 +30,11 @@ $env = $1; - # Turn off localization of executable's output. - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -+# Skip if sandbox is enabled -+if ($ENV{SANDBOX_ACTIVE}) { -+ CuSkip::skip "Gentoo: Test known bad under sandbox (#675802)\n"; -+} -+ - my @Tests = - ( - # Test combination of -S and regular arguments ---- a/tests/rm/deep-2.sh -+++ b/tests/rm/deep-2.sh -@@ -17,6 +17,9 @@ - # along with this program. If not, see . - - . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -+# Avoid #413621 until #548250 is resolved -+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" -+ - print_ver_ rm - require_perl_ - diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest index 821cc6905ad8..6b7428a8a312 100644 --- a/sys-apps/edac-utils/Manifest +++ b/sys-apps/edac-utils/Manifest @@ -1,3 +1,3 @@ DIST edac-utils-0.18.tar.gz 285909 BLAKE2B 7d2662daf94c4ff796760b4863837861015397016bb79202baaa194608b61450d6749981cec621571267ac818a09af758167d2d768513e7d5bf7e763aed7ee51 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa -EBUILD edac-utils-0.18.ebuild 1081 BLAKE2B 5b908382e61359ab98b9ee9b48e0d5b03f897c2ace823d025471162fe182bece523b4547936bb1824fc4498daad19f424dc8901469fe6d1e4d1a06ca8a6fe490 SHA512 9a8ab22e0ca78384d1f516a0006779f41173ea3c6e5c2585e4c242fe4c020e68be29f7c759fe5e3dd39f9aa3c9cb5b00d8deefa406520d1f58e4a547671f626f +EBUILD edac-utils-0.18.ebuild 1085 BLAKE2B d8509b37fab1eb499ea479ff82a70b02d4ebe1a0fe89fcce536632ff950a27923716fb36ff2b6c02c9114ef453b21f98f6ef4b96d1b88ac2d7f853e092bdb973 SHA512 f473e7238fee5057140507e7efc9865e99778851f42349ea028f08a44820946dbf08e7f3fc996223ddf7a13edecf79a58042f68b30397ff3c9f0819cc3f2cf22 MISC metadata.xml 254 BLAKE2B 1392a93224819fb2dcdf8e7842fad36812de4dcee5e7424e55932c71885354ee8e308b407a8c7ff5f22b3fde199c17a83c2fc743f0f56d8d21e92dc5b3a43252 SHA512 ef70b7addb82535bb76effbc086b2e94c868c0eeefd321bed35d554f4117007ff5dba431561b16e90ff42a23011568b877959d9d59eac6c7c59642ed9d46bd91 diff --git a/sys-apps/edac-utils/edac-utils-0.18.ebuild b/sys-apps/edac-utils/edac-utils-0.18.ebuild index c0e1edb052e8..86bafa9ff0dc 100644 --- a/sys-apps/edac-utils/edac-utils-0.18.ebuild +++ b/sys-apps/edac-utils/edac-utils-0.18.ebuild @@ -3,8 +3,6 @@ EAPI=5 -inherit ltprune - DESCRIPTION="Userspace helper for Linux kernel EDAC drivers" HOMEPAGE="https://github.com/grondo/edac-utils" SRC_URI="https://github.com/grondo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -38,7 +36,7 @@ src_install() { # The rest is done via the udev-rule rm -rf "${D}/etc/init.d" - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/sys-apps/edid-fixdim/Manifest b/sys-apps/edid-fixdim/Manifest index b97cef3d5b71..d077ff60b9cb 100644 --- a/sys-apps/edid-fixdim/Manifest +++ b/sys-apps/edid-fixdim/Manifest @@ -1,3 +1,3 @@ DIST edid-fixdim-1.tar.gz 3236 BLAKE2B 4ae6954fa4c93f143be5e84f364f4b229054bd385aa0bc2ec85b4dfcd2eece8e5e3f1a4039188fcb3fe979f0de473b6c876c73e9ba642d0e10f8656d62c36d8f SHA512 614908e2ca94c97cb998f789ec383a72237c5be4544cf8b02d7754817bea90de87993acc11d917c1c5b54009ca8f41560e7468d97dc3f21b7e2891a36d4dbffd -EBUILD edid-fixdim-1.ebuild 530 BLAKE2B 136fd2fae223ccec47df065da9526b4474f7cb76bdb2fc181b04f99d370bc2faa8bcc5da83cc41ba79e61656731ab6d788b773172c46f9c61b138dd7e6085dbc SHA512 04b812a4ab85adbfd0d4d1955c6c34b212775916c48d9f971f62201d51e6ac584afd6d0ea6a7e6d0f291d904d77de6b946eda9cfb399565584813becd5b6d593 +EBUILD edid-fixdim-1.ebuild 532 BLAKE2B 37f17998c5d9bc285524bd0c1e57e9cf22ac8b93cf3711cfe6b62ca27486ddd53ff942de27f0e29ff86d293dd2df53597c27237a7cb9e523a76e90ec7d610386 SHA512 c853fe7d480d633308b523997b23bfc2305a30a4c8641e2aad079ce0fe7d5c5fdf49d307733fd2e4107152cc5f8907d040cabe7ce18406e378aba23982ff0a08 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 diff --git a/sys-apps/edid-fixdim/edid-fixdim-1.ebuild b/sys-apps/edid-fixdim/edid-fixdim-1.ebuild index e0a6d6a83a9d..48c831c16dcf 100644 --- a/sys-apps/edid-fixdim/edid-fixdim-1.ebuild +++ b/sys-apps/edid-fixdim/edid-fixdim-1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit python-single-r1 DESCRIPTION="Tool to fix screen dimensions in EDID data dumps" diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 8d65f44a2398..64354936a2e6 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -3,6 +3,6 @@ AUX fwupd-1.6.0-gusb_deps.patch 2610 BLAKE2B 462e15359979cf1d4ea288161723a71f30e AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78 DIST fwupd-1.6.0.tar.gz 3747361 BLAKE2B 6368089db78a512048268ef3cb0333c75bb95b0f62d023e3db7c854c3362b88db1b1676cc24b9a4a5fe854e7dea6c727ec3d645476ee323a0dae16caf7028478 SHA512 0f2342fba95d635348c4b153887f2ea27e4bf49972558716143051ba79c39948487eb6cc15f938738d83aa3ea3eef5ae2854c9756a60f59f52ac859d35e2a669 -EBUILD fwupd-1.5.9.ebuild 4391 BLAKE2B 6e33ce98ddddf81cbabf6e00f694309b5b266904908a93f25717529c3955e2d65811d84f5fd532f2ebdd1056f60d3d7480b2997660ead156798a595c12067edd SHA512 3a9c03bf9fcb3772e60652b505d816a4ad3c93110f57b0c41a1dd300aa8b63d412bfe281c4186347fa91f06aff08d9d697440b44ce58895b7c30d34205e09b6f -EBUILD fwupd-1.6.0.ebuild 4370 BLAKE2B 7741283317d2004c28e13b715314e9472713089cbe1f438e745b2d4661744adb77e8117117dbbeebb875486122981fb3da691fa96d594fa79d7f93b837c749d6 SHA512 5b9bd6714aade9bafaa251852b5b59a1837a67e7071b13c28da7c307c844730af162773feac532a34fe669ac2466a88744be50da68e1c2da3f11fb99a237a01e +EBUILD fwupd-1.5.9-r1.ebuild 4398 BLAKE2B 8c5e659230931788d337fa7b9b9d6f86e781819d2fd96f4f061690202a1b0483b7707c641264120da3b868e1a5d6dd469818c0be6ce7d1d81235bb137f55c682 SHA512 a6697293e77036d791d370c106e0bb9de354a2776db5eca6734e976d60f5d8b3fa89c767fb1a32453db4b260d725c38e5e5e6cf147ea39d851f5d2317a3eb77f +EBUILD fwupd-1.6.0-r1.ebuild 4377 BLAKE2B 7761382860ace3b417be28363ee7684ca70093ce61caf9ad4f29fc39c5e0d49ef8673b37cd59559ebdd9577966d70f0897b38471f82b2ab258b7efc5e7a28190 SHA512 63a48ed1b558961540e4c634353f92edcd7f05e0e35f1b11c70dcbe5fcda6dfa5feaa0eae0adb7b2f74fd27ca6afaf185814f8c1a77236fa84a70efe65a089ae MISC metadata.xml 1140 BLAKE2B 9e901230c53b487f05f290b46c53a5ee3ebd81b3aefcab2368bfc99f28e80d85554613de8cc4481047a49cf6719f1b1a442d87456ad21aecbadd573ab0959385 SHA512 93bd5bbe8a57219d825e0cc0a8ebd85534396922efcefa224d733bbd1190f201009a8223dfdf5fb2a2403439805c2205b0eef39e8a9e25d0df3733b1654b8f61 diff --git a/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild b/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild new file mode 100644 index 000000000000..6eff5c18b24e --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit linux-info meson python-single-r1 vala xdg toolchain-funcs + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + minimal? ( !introspection ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:= + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + dev-python/pycairo[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + virtual/libelf:0= + virtual/udev + archive? ( app-arch/libarchive:= ) + dell? ( >=sys-libs/libsmbios-2.4.0 ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + gnutls? ( net-libs/gnutls ) + gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) + policykit? ( >=sys-auth/polkit-0.103 ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + media-libs/fontconfig + media-libs/freetype + sys-boot/gnu-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + x11-libs/cairo + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + != 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + sed '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + vala_src_prepare +} + +src_configure() { + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + $(meson_use agent) + $(meson_use amt plugin_amt) + $(meson_use archive libarchive) + $(meson_use bluetooth bluez) + $(meson_use dell plugin_dell) + $(meson_use elogind) + $(meson_use flashrom plugin_flashrom) + $(meson_use gnutls) + $(meson_use gtk-doc gtkdoc) + $(meson_use gusb) + $(meson_use gusb plugin_altos) + $(meson_use man) + $(meson_use nvme plugin_nvme) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use systemd) + $(meson_use test tests) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_pk) + -Dconsolekit="false" + -Dcurl="true" + # Dependencies are not available (yet?) + -Dplugin_modem_manager="false" + ) + use ppc64 && emesonargs+=( -Dplugin_msr="false" ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} + +pkg_postinst() { + xdg_pkg_postinst + elog "In case you are using openrc as init system" + elog "and you're upgrading from = 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - sed '/platform-integrity/d' \ - -i plugins/meson.build || die #753521 - vala_src_prepare -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - $(meson_use agent) - $(meson_use amt plugin_amt) - $(meson_use archive libarchive) - $(meson_use bluetooth bluez) - $(meson_use dell plugin_dell) - $(meson_use elogind) - $(meson_use flashrom plugin_flashrom) - $(meson_use gnutls) - $(meson_use gtk-doc gtkdoc) - $(meson_use gusb) - $(meson_use gusb plugin_altos) - $(meson_use man) - $(meson_use nvme plugin_nvme) - $(meson_use introspection) - $(meson_use policykit polkit) - $(meson_use synaptics plugin_synaptics_mst) - $(meson_use synaptics plugin_synaptics_rmi) - $(meson_use systemd) - $(meson_use test tests) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_pk) - -Dconsolekit="false" - -Dcurl="true" - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - ) - use ppc64 && emesonargs+=( -Dplugin_msr="false" ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - doinitd "${FILESDIR}"/${PN}-r2 - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} - -pkg_postinst() { - xdg_pkg_postinst - elog "In case you are using openrc as init system" - elog "and you're upgrading from = 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + sed '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + vala_src_prepare +} + +src_configure() { + local plugins=( + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use flashrom plugin_flashrom) + $(meson_use gusb plugin_altos) + $(meson_use nvme plugin_nvme) + $(meson_use spi plugin_intel_spi) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_use uefi plugin_uefi_pk) + + # Dependencies are not available (yet?) + -Dplugin_modem_manager="false" + ) + use ppc64 && plugins+=( -Dplugin_msr="false" ) + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="false" + -Dcurl="true" + -Defi_binary="false" + -Dsupported_build="true" + $(meson_use agent) + $(meson_use archive libarchive) + $(meson_use bluetooth bluez) + $(meson_use elogind) + $(meson_use gnutls) + $(meson_use gtk-doc gtkdoc) + $(meson_use gusb) + $(meson_use lzma) + $(meson_use man) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} diff --git a/sys-apps/fwupd/fwupd-1.6.0.ebuild b/sys-apps/fwupd/fwupd-1.6.0.ebuild deleted file mode 100644 index 6d66480d42ed..000000000000 --- a/sys-apps/fwupd/fwupd-1.6.0.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit linux-info meson python-single-r1 vala xdg toolchain-funcs - -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" -HOMEPAGE="https://fwupd.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom lzma minimal introspection +man nvme policykit spi synaptics systemd test thunderbolt tpm uefi" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( elogind minimal systemd ) - dell? ( uefi ) - minimal? ( !introspection ) - spi? ( lzma ) - synaptics? ( gnutls ) - uefi? ( gnutls ) -" -RESTRICT="!test? ( test )" - -BDEPEND="$(vala_depend) - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( dev-libs/gobject-introspection ) - man? ( - app-text/docbook-sgml-utils - sys-apps/help2man - ) - test? ( - thunderbolt? ( dev-util/umockdev ) - net-libs/gnutls[tools] - ) -" -COMMON_DEPEND="${PYTHON_DEPS} - >=app-arch/gcab-1.0 - dev-db/sqlite - >=dev-libs/glib-2.45.8:2 - dev-libs/json-glib - dev-libs/libgpg-error - dev-libs/libgudev:= - >=dev-libs/libjcat-0.1.0[gpg,pkcs7] - >=dev-libs/libxmlb-0.1.13:= - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - dev-python/pycairo[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] - ') - >=net-libs/libsoup-2.51.92:2.4[introspection?] - net-misc/curl - virtual/libelf:0= - virtual/udev - archive? ( app-arch/libarchive:= ) - dell? ( >=sys-libs/libsmbios-2.4.0 ) - elogind? ( >=sys-auth/elogind-211 ) - flashrom? ( >=sys-apps/flashrom-1.2-r3 ) - gnutls? ( net-libs/gnutls ) - gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) - lzma? ( app-arch/xz-utils ) - policykit? ( >=sys-auth/polkit-0.103 ) - systemd? ( >=sys-apps/systemd-211 ) - tpm? ( app-crypt/tpm2-tss ) - uefi? ( - sys-boot/gnu-efi - sys-boot/efibootmgr - sys-fs/udisks - sys-libs/efivar - ) -" -# Block sci-chemistry/chemical-mime-data for bug #701900 -RDEPEND=" - != 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - sed '/platform-integrity/d' \ - -i plugins/meson.build || die #753521 - vala_src_prepare -} - -src_configure() { - local plugins=( - $(meson_use amt plugin_amt) - $(meson_use dell plugin_dell) - $(meson_use flashrom plugin_flashrom) - $(meson_use gusb plugin_altos) - $(meson_use nvme plugin_nvme) - $(meson_use spi plugin_intel_spi) - $(meson_use synaptics plugin_synaptics_mst) - $(meson_use synaptics plugin_synaptics_rmi) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_capsule_splash) - $(meson_use uefi plugin_uefi_pk) - - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - ) - use ppc64 && plugins+=( -Dplugin_msr="false" ) - - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - -Dconsolekit="false" - -Dcurl="true" - -Defi_binary="false" - -Dsupported_build="true" - $(meson_use agent) - $(meson_use archive libarchive) - $(meson_use bluetooth bluez) - $(meson_use elogind) - $(meson_use gnutls) - $(meson_use gtk-doc gtkdoc) - $(meson_use gusb) - $(meson_use lzma) - $(meson_use man) - $(meson_use introspection) - $(meson_use policykit polkit) - $(meson_use systemd) - $(meson_use test tests) - - ${plugins[@]} - ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - doinitd "${FILESDIR}"/${PN}-r2 - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index ff1a5488025c..4c62e10b4282 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,7 +1,3 @@ -DIST gnome-disk-utility-3.38.2.tar.xz 1375128 BLAKE2B e437eead1273bb2931462ac6c7a7dfea75c603c5325af003d403f4b5130b28e95496724c1939e5dd2e3c8b517eb0d3cdf51952299451546b41f9f5eaddcf9e63 SHA512 3afc0a40e82f0ab3608302af3d83acb15a758581122188125f9572e95a802359d1af0a1e99fb0cd8fb612413aac09e3d33404d08a2d5e189b79d4f284c92cb82 -DIST gnome-disk-utility-40.0.tar.xz 1386880 BLAKE2B 680057797dc820197adbb3a8dea53c9545343ef03037d22ac3f3f87f34a0727d02c2b602a5886006e30acf97a1c1358258ff6f947be2192d835f955020b366cb SHA512 c53e1bef93dc024bc69be60848825f8175841319a2a7b92a75f48432423c5465151536f597c69707ebff37e5bc8e2c96d8a10f0f0e7ebe7cdc961a74841efd80 DIST gnome-disk-utility-40.1.tar.xz 1387480 BLAKE2B ef3650cadd2f5e264abbf805fa0af1c7e9e30e067c946d91dd879600e2db5b9af83cc8f7990954cd8d859a7456d4054ddb9bcad0ed716a08b848f78dddda98d8 SHA512 be7a298f6ca9afad5dfd420a5ff5386a1e096f7d956339d5528702b2bd2b657dad4b9017b0ae519d13480fe0806fa64fd1c94e2c1136ee00a6b17c7f21a0acf1 -EBUILD gnome-disk-utility-3.38.2.ebuild 1384 BLAKE2B f5e559be1ecd9842ab766d6b4e9e2a69159fd7d5b038773ab9098ea13e8078fd8f8eac9e28fd011335ad010f766b6a9ee7c347003c2fd171eed5d6db03c43dc9 SHA512 8b14526b8fddd184c6bedb70866ed94e04149117b4ae3d024783ebfc775f00fa72a32d03fb0cda7275db784434bca25eaf7df1f619dfd52bc38d79563fbdbd3e -EBUILD gnome-disk-utility-40.0.ebuild 1417 BLAKE2B 1dac5bf2964ef979ea0b72d13b17f7409bd2558c20909a028aa58cd716bd60063a018d869bd75543f65a28d4724a881b437204f0511d4456e69c4c2e01cdccd0 SHA512 c266092beed51eb7747ec2c4ce6e68b5749a8885f26ea736236b6aeb7c5ad9a436a693eb9af4b8e6c051d7a377f984ef4d13d2a445e6d5581efde84faa65e4ff -EBUILD gnome-disk-utility-40.1.ebuild 1417 BLAKE2B 1dac5bf2964ef979ea0b72d13b17f7409bd2558c20909a028aa58cd716bd60063a018d869bd75543f65a28d4724a881b437204f0511d4456e69c4c2e01cdccd0 SHA512 c266092beed51eb7747ec2c4ce6e68b5749a8885f26ea736236b6aeb7c5ad9a436a693eb9af4b8e6c051d7a377f984ef4d13d2a445e6d5581efde84faa65e4ff +EBUILD gnome-disk-utility-40.1.ebuild 1415 BLAKE2B 6ffbd4a575fb6fffc8e41e1e131bbd4b20c3266b19c70ffc07be2d1e1c7c2e38eef9b3539f22d7f511fd03743c86a4ad3a61a056bcdbab7abdef966b264a3e15 SHA512 2dd1b065e38589751bca0692fefd154d3e265b6ea30efa3a24f4f83964c737acb1ed9922bfde59dbf18688829b2bf06ce9401459fc41e1c648d88c287b052b34 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild deleted file mode 100644 index 6168bb1b1391..000000000000 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="Disk Utility for GNOME using udisks" -HOMEPAGE="https://wiki.gnome.org/Apps/Disks" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="fat elogind gnome systemd" -REQUIRED_USE="?? ( elogind systemd )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" - -DEPEND=" - >=media-libs/libdvdread-4.2.0:0= - >=dev-libs/glib-2.31:2 - >=x11-libs/gtk+-3.16.0:3 - >=media-libs/libcanberra-0.1[gtk3] - >=app-arch/xz-utils-5.0.5 - >=x11-libs/libnotify-0.7:= - >=app-crypt/libsecret-0.7 - >=dev-libs/libpwquality-1.0.0 - >=sys-fs/udisks-2.7.6:2 - elogind? ( >=sys-auth/elogind-209 ) - systemd? ( >=sys-apps/systemd-209:0= ) -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - fat? ( sys-fs/dosfstools ) - gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) -" -# libxml2 for xml-stripblanks in gresource -BDEPEND=" - dev-libs/libxml2:2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) - $(meson_use gnome gsd_plugin) - -Dman=true - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.0.ebuild deleted file mode 100644 index 3192512980a0..000000000000 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="Disk Utility for GNOME using udisks" -HOMEPAGE="https://wiki.gnome.org/Apps/Disks" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="fat elogind gnome systemd" -REQUIRED_USE="?? ( elogind systemd )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DEPEND=" - >=media-libs/libdvdread-4.2.0:0= - >=dev-libs/glib-2.31:2 - >=x11-libs/gtk+-3.16.0:3 - >=media-libs/libcanberra-0.1[gtk3] - >=gui-libs/libhandy-1.1.90:1= - >=app-arch/xz-utils-5.0.5 - >=x11-libs/libnotify-0.7:= - >=app-crypt/libsecret-0.7 - >=dev-libs/libpwquality-1.0.0 - >=sys-fs/udisks-2.7.6:2 - elogind? ( >=sys-auth/elogind-209 ) - systemd? ( >=sys-apps/systemd-209:0= ) -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - fat? ( sys-fs/dosfstools ) - gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) -" -# libxml2 for xml-stripblanks in gresource -BDEPEND=" - dev-libs/libxml2:2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) - $(meson_use gnome gsd_plugin) - -Dman=true - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild index 3192512980a0..5879c632cfb8 100644 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-2+" SLOT="0" IUSE="fat elogind gnome systemd" REQUIRED_USE="?? ( elogind systemd )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" DEPEND=" >=media-libs/libdvdread-4.2.0:0= diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest index 27df90c576d4..a40d76bc1b7f 100644 --- a/sys-apps/hwinfo/Manifest +++ b/sys-apps/hwinfo/Manifest @@ -1,3 +1,5 @@ DIST hwinfo-21.72-1.3.src.rpm 926285 BLAKE2B b8a38b2f04649e268a6d6fbebabd724a0c678e81ea9c09c3453ababa26e91ba5fe55c7feccf157ab81ab676e6610ba1700ef1691bdd06fbcbc1cdd86806282d2 SHA512 4e51ee4f8e03eee82317557aa39b5018cc2370b33bfdb280ecb8716687d951f8c34fa7598a1e0eff03025991eee654af488e3343d93167e4cf16380d047c2de3 +DIST hwinfo-21.74-1.1.src.rpm 967046 BLAKE2B 305db6eb3184de0e84d166f0e32988ea2a0ec65eceb322c8c451f33ab8656c38a21a74f416ff08442bcbc5fa91fb4fa8439d907c2c244fe62a2048be7f84b181 SHA512 1a681b51934fbed229b7daa96b5e4e0d8fc62d480927034d0c95ae8c89dc2ae43214c63cca273379162353aeb2bf81883e7c02006c4f45fd1deab0d74f8a2988 EBUILD hwinfo-21.72.ebuild 1377 BLAKE2B dd5ca41d5f58ef3149c13490b6ba9f1b0a3583cf6a3ea839e5af6c80f9990cd6fbf921847ce2a9468306e176108c93131a0d60aba9378cba01e007c49cbd26c7 SHA512 973c96a71d3701e726d1c121a4ce375e84a914478ce74616d7eea666ecf6f1c33434841d831528817f4bf33fb0ba29f51e96bb9b903d52ded6a343536b662e14 +EBUILD hwinfo-21.74.ebuild 1549 BLAKE2B a99c8e0c59f645fe5dd982913071326303305bc34299dd62ab36d6e126c3397da18e73d565bf6ccfa25fc9373b27d2f8c23b034b245a07190fa8907df8deb361 SHA512 65f5c677c51035ab83b35724f39872a0bdc0e4368e710f26000c48c892973f58ccdb1246201ffbbcf4a710d1c536f1cb248423c79e48b917678dd98b4225003c MISC metadata.xml 334 BLAKE2B 08e4d837af5734c290c474fe28c4082531eb9b07be2fddef29e16e4dda6aee904bc8674830842b1c1f9736a92a4ccf21992ffdb6f0f3b7e62be73f3d3e93c6d5 SHA512 94c2a056338c3e3e40737e45468d77e170341185017098fc8892cbac1a0993321a1ee8dd007c075430d999fce90508f1e3d4a4f71fda6bfeb6f7c15b199c2405 diff --git a/sys-apps/hwinfo/hwinfo-21.74.ebuild b/sys-apps/hwinfo/hwinfo-21.74.ebuild new file mode 100644 index 000000000000..b4051eb59a5d --- /dev/null +++ b/sys-apps/hwinfo/hwinfo-21.74.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib rpm toolchain-funcs + +DESCRIPTION="Hardware detection tool used in SuSE Linux" +HOMEPAGE="https://www.opensuse.org/" +#Using srpms from SUSE to get pregenerated changelog, otherwise we could use GH +#SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.rpm" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + amd64? ( dev-libs/libx86emu ) + x86? ( dev-libs/libx86emu )" +DEPEND="${RDEPEND} + sys-devel/flex + >=sys-kernel/linux-headers-2.6.17" + +MAKEOPTS="${MAKEOPTS} -j1" + +src_prepare() { + # Respect AR variable. + sed -i \ + -e 's:ar r:$(AR) r:' \ + src/{,isdn,ids,smp,hd}/Makefile || die + + # Respect LDFLAGS. + sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die + + # Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS. + sed -i \ + -e 's:make:$(MAKE):' \ + -e 's:-pipe -g::' \ + -e 's:LDFLAGS.*=:LDFLAGS +=:' \ + Makefile{,.common} || die + # Workaround from Arch, if using source tarballs from github + # echo 'touch changelog' > git2log + default +} + +src_compile() { + tc-export AR + emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}" +} + +src_install() { + emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install + keepdir /var/lib/hardware/udi + + dodoc changelog README* + docinto examples + dodoc doc/example*.c + doman doc/*.{1,8} +} diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest index 97aa830b66b0..6341dc049642 100644 --- a/sys-apps/ibm-powerpc-utils/Manifest +++ b/sys-apps/ibm-powerpc-utils/Manifest @@ -1,5 +1,6 @@ AUX ibm-powerpc-utils-1.3.5-docdir.patch 265 BLAKE2B 2ec9b24404a6e6c78a75a8a29a002eba6b30180883a3cc0ebd3610d202188ec6aabfd2830eacf42f9e8c57c961f6aa097a12bcc92d04fd85ade63e3ef083257f SHA512 69a6545e1e29778d4ea31c7bc90be678b8f78c1d897f6bfa9a2f8ed3b223d4b5894663ffb10dc409c334754152c1f28a0c0d7a1991c65186488116a1cd983aa8 +AUX ibm-powerpc-utils-1.3.8-musl.patch 2488 BLAKE2B 8ee9e9fba42a5ff06bed9372a4e9de1da1a63a4f8c585a6a942b4b4447a010807d85c47ce7fe3abaa9463386addd08aceb3286c4240b0500ddc8e0483fc4ee80 SHA512 6f28e6e2d5d5cf55e3a1bbedfe8ccb56b3a63f50fe6dbd18c665b1b8324b9c381fea2cdda8629ab8b8b19fb5bdf1e0fffe44d4e318aba5eb392fb858e8a685c8 DIST ibm-powerpc-utils-1.3.8.tar.gz 355931 BLAKE2B cb1756640962f55eead8556abb714f938a066d9c63e990ee6467ecdb032eac7058ce8715dc8b8d403e3c03efe98a7af0c7d560158258e7097300befbb04f8472 SHA512 7c9057131315d8fac6154c410562d9cd1807f76241bcc190566ece05b0ddd2ddbe1097749b7e644ccc9691641d40460a877368162e9b951fe790f53f638f635e -EBUILD ibm-powerpc-utils-1.3.8-r1.ebuild 724 BLAKE2B 1c0cb5e5e4120b04494ac741f73ed4f77cbbc1c49efa130cab673d74eb11259e66e7ff629003093c713394b4f044185a758f6fae9eb5e7b49c4741f3c46ab9a2 SHA512 d6416c359d4bd3b4f8a95a916682b7179f7d1b59e6608caacb8b6b3ab789ad75b8aa6ae87f8603d74fb7e645c51cd5c50e41584c086e256f6c6240380d495f83 -EBUILD ibm-powerpc-utils-99999.ebuild 641 BLAKE2B feb6ca74ef399c2092506c29bda423e11e499f635c30f07d03ec575a0e8651d9c781b48b579ff68dd9283ba95e04c91577c860bd45b4054fa3f84ba094984f7d SHA512 6a35509dc65fd43f3a5af9b2e7b4826740e847b52b2d5d5e231767496e1257b3f1e3e57972ae4262d9f9572148752369efc07f717cca24680a0f848bb0eb650b +EBUILD ibm-powerpc-utils-1.3.8-r1.ebuild 755 BLAKE2B 8b2f64a4590b6f1474ee9894945aa518d9f18a9c65fb5c209521e43df2181f89ade4f53d3283c8ce132af68bee8c4c2487d9c6698457a7bff552dfe8c81ba99b SHA512 48c5e3d40d875feb58be836e83bb553aced8b8f1e64c07d84d4b3c161d7f648e38bacbc335aa13c0a5b98d1ce69df1027c54e6b903e17584429a67d467dcc672 +EBUILD ibm-powerpc-utils-99999.ebuild 681 BLAKE2B cf4a5aa3259b5bd23f890f5466ce2e301b82a1644e657e8f7fd0992129013dcbec517c74470f393fb0e4401cce054796b89a24c1396a139af18ecc141c51361f SHA512 036baad817077a1c6100cac9198b6563caffe8aae003d00845164e4dd7bedc29b0e4ac46e81575831460de69121dab8a9575077b68673846236c7fe847396c2e MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3 diff --git a/sys-apps/ibm-powerpc-utils/files/ibm-powerpc-utils-1.3.8-musl.patch b/sys-apps/ibm-powerpc-utils/files/ibm-powerpc-utils-1.3.8-musl.patch new file mode 100644 index 000000000000..5357e5fdcef3 --- /dev/null +++ b/sys-apps/ibm-powerpc-utils/files/ibm-powerpc-utils-1.3.8-musl.patch @@ -0,0 +1,95 @@ +From ec0eb99a402ff9371965c2c8726bc400674215b7 Mon Sep 17 00:00:00 2001 +From: Fabian Groffen +Date: Fri, 21 May 2021 11:25:21 +0200 +Subject: [PATCH] add includes/defines for musl libc support + +- add some missing includes to get proper definitions for beXXtoh and + PATH_MAX +- guard backtrace() from execinfo.h usage for it is glibc only + +PR: https://github.com/ibm-power-utilities/powerpc-utils/pull/63 +Signed-off-by: Fabian Groffen +--- + src/common/cpu_info_helpers.c | 1 + + src/drmgr/common.c | 6 ++++++ + src/drmgr/dr.h | 1 + + src/rtas_dbg.c | 1 + + 4 files changed, 9 insertions(+) + +diff --git a/src/common/cpu_info_helpers.c b/src/common/cpu_info_helpers.c +index 3d08ff7..925f220 100644 +--- a/src/common/cpu_info_helpers.c ++++ b/src/common/cpu_info_helpers.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include "cpu_info_helpers.h" +diff --git a/src/drmgr/common.c b/src/drmgr/common.c +index 5e8135b..32cf805 100644 +--- a/src/drmgr/common.c ++++ b/src/drmgr/common.c +@@ -28,7 +28,9 @@ + #include + #include + #include ++#ifdef __GLIBC__ + #include ++#endif + #include + #include + #include +@@ -853,6 +855,7 @@ sighandler(int signo) + say(ERROR, "Received signal %d, attempting to cleanup and exit\n", + signo); + ++#ifdef __GLIBC__ + if (log_fd) { + void *callstack[128]; + int sz; +@@ -860,6 +863,7 @@ sighandler(int signo) + sz = backtrace(callstack, 128); + backtrace_symbols_fd(callstack, sz, log_fd); + } ++#endif + + dr_fini(); + exit(-1); +@@ -925,8 +929,10 @@ sig_setup(void) + if (sigaction(SIGBUS, &sigact, NULL)) + return -1; + ++#ifdef __GLIBC__ + /* dummy call to backtrace to get symbol loaded */ + backtrace(callstack, 128); ++#endif + return 0; + } + +diff --git a/src/drmgr/dr.h b/src/drmgr/dr.h +index f171bfe..b32d49a 100644 +--- a/src/drmgr/dr.h ++++ b/src/drmgr/dr.h +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include "rtas_calls.h" + #include "drpci.h" + +diff --git a/src/rtas_dbg.c b/src/rtas_dbg.c +index 526e78b..ebc7474 100644 +--- a/src/rtas_dbg.c ++++ b/src/rtas_dbg.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild index d828529d9685..01005efd85fb 100644 --- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild +++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,6 +22,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.3.5-docdir.patch + "${FILESDIR}"/${P}-musl.patch ) src_prepare() { diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild index b6e7ae3be805..d4d181b373a4 100644 --- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild +++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,6 +20,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.3.5-docdir.patch + "${FILESDIR}"/${P}-musl.patch # PR #63 ) src_prepare() { diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 0c79c3bcb895..671b30e5dca8 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -1,5 +1,4 @@ AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 -AUX iproute2-4.20.0-configure-nomagic.patch 5835 BLAKE2B e21e79a5f804b4f3ebd82334541dd6d9e931308cfa218dfd7743f5a807126d6bf52d63e9e84f7683be41b2249ea8aa13991ea3f4d486702d3d4d2c4e9a51b238 SHA512 a41b87a11d71120c3f3df9f9dbecc789df0355de517700749ea0b9bb4fb9ffeb94dd9218f9b2edc75ffc865e63a9a00af381816b36b0a929c0c9c7828c949660 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864 AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9 AUX iproute2-5.10.0-configure-nomagic.patch 6511 BLAKE2B f7e75bf8db95c6af4798fbedd936ac7ce1d470c9cf5d31809fda9df8475ce2dafbca2b6d80ab1d2ced544ed1a3310d1db2898a3288e24356d691d08f633b14bd SHA512 025f60975f7579dae9dc9cf0410fa8cef4ee96f954133af17e9c4f8a860fba4c33086845a568f46e68f2a4f4088f84e57c200fd4b4bc417e6f3c48d7cf9e7bcb @@ -9,10 +8,8 @@ AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1 DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 DIST iproute2-5.11.0.tar.xz 822044 BLAKE2B e52e2334a4f6271a23e9393a3b11fc7e8e070ecff178bda1cf87705a55b59018edc8c28751e4fc6a7d877c19e6da772765afbdc5944800f98bf176513595e5bb SHA512 f592728ec819fc34cba04b1c04275e783aed86084fe31948e1776e6e473c8c1416aaf8101c19b51ddb4044af1cd2157827c0f91546b33badb448466eae9a2fda DIST iproute2-5.12.0.tar.xz 835880 BLAKE2B 8e3e1b7188d7ab5014d06d7edaae2cb0c1dc65862999a2ca9f31902256d7f3d166de8a1c76e4e137acce2b445d72ea6850bfec3640d1919cb82351d45dd3e47e SHA512 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac -DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634 EBUILD iproute2-5.10.0-r1.ebuild 4764 BLAKE2B 4b9412a19f175d320ac4f1470f333d7f3ccec76f21a74bf8057a48bc59b2dd44eaa1f7d0466d9a791abaaf65ffc1e606e3722b4a82576e5abdee153534defa6c SHA512 455c325154f857be301998bbd0a693f1b3ae865f36e3e90dff9a23cf6e7d41a7c318bd4c4e7fca840571068f84337ef7bb5801ce4036ef1f430cbbab74528425 EBUILD iproute2-5.11.0.ebuild 4842 BLAKE2B c26d2d8f73d132acea6513632596a74c9da54fe994e1b408ef90e319042a25ca657942e9059e9d2b97851f7d25d9e2c83034145d36792eb408047d6f75cdb2f9 SHA512 281edb2a65ea6ed65661b82a6d4fa100ff44896336d3d8eb5d2c3511cdd0d0dee262599bfbe3531e5d03074782276488ccd6c52e203b4cbdab71f87f7e198ef5 EBUILD iproute2-5.12.0.ebuild 4867 BLAKE2B 8646b979a436352fd9ef16fda6d8fdfe90600ee3473f0c89ac1999baae5e72f6cd53b94cfa31cd24556c387b24afeb4b67e13c144c4ae3cb634cc8e0d79485c2 SHA512 f1b7a387a9982727b71d7740562114e8b4ebc1be47161b0612a7c556256d7af7f6f83130c9274f3d1d9127df0589f941a52df604c1d324b299ef3e913523e8f0 -EBUILD iproute2-5.7.0.ebuild 4488 BLAKE2B 0ee24f1fbe3cdb8830e216cf2a576338d44201666776272f3c51d4f71eb3899f3bfdc2d65c39bf2ce65c39ab0f9cff5c9edf093e01e898248ed1c7e7bda76333 SHA512 40a60eb833e58b6df996acc1e70f1de952dd17febf8ef38e77a4cf900979d2a32369a454f9fcd083b362967e38d41784cc2228fd7fc1c49c056a6645b4a41f7b EBUILD iproute2-9999.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58 MISC metadata.xml 813 BLAKE2B a34634416583a3d6a75a0d02e5e2c89b8e3dd0766a33e13555ee66515dda7bd10c711226701e00adb1b92fc6443d7793adc25e6b446a8ecb901afe268c7e978f SHA512 8fd774dd6bdde1265ace7e9b3f96f19a8afa782bbdbb5633b0e4024663e2877fd4db8e0aae48870c81fa470467ccaedad52c95b0fa9cd2b64829aa1a07e6f061 diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch deleted file mode 100644 index 94df85017dfe..000000000000 --- a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch +++ /dev/null @@ -1,208 +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 & 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 -Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler - ---- iproute2-4.20.0/bridge/Makefile -+++ iproute2-4.20.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.20.0/config.include -+++ iproute2-4.20.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) $(CPPFLAGS) -c -o $@ $< -+ -+# vim: ft=make: ---- iproute2-4.20.0/configure -+++ iproute2-4.20.0/configure -@@ -188,7 +188,7 @@ - if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; 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 -@@ -231,8 +231,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 -@@ -245,8 +245,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 -@@ -258,8 +258,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 -@@ -316,8 +316,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 -@@ -397,7 +397,3 @@ - - echo -n "libcap support: " - check_cap -- --echo >> $CONFIG --echo "%.o: %.c" >> $CONFIG --echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG ---- iproute2-4.20.0/devlink/Makefile -+++ iproute2-4.20.0/devlink/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - TARGETS := - ---- iproute2-4.20.0/genl/Makefile -+++ iproute2-4.20.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.20.0/ip/Makefile -+++ iproute2-4.20.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.20.0/lib/Makefile -+++ iproute2-4.20.0/lib/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - CFLAGS += -fPIC - ---- iproute2-4.20.0/misc/Makefile -+++ iproute2-4.20.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.20.0/netem/Makefile -+++ iproute2-4.20.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.20.0/rdma/Makefile -+++ iproute2-4.20.0/rdma/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - TARGETS := - ---- iproute2-4.20.0/tc/Makefile -+++ iproute2-4.20.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.20.0/tipc/Makefile -+++ iproute2-4.20.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-5.7.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild deleted file mode 100644 index bc327d2142f7..000000000000 --- a/sys-apps/iproute2/iproute2-5.7.0.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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 - dev-libs/libbsd - !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} - >=sys-kernel/linux-headers-3.16 -" -BDEPEND=" - app-arch/xz-utils - >=sys-devel/bison-2.4 - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 - "${FILESDIR}"/${PN}-5.1.0-portability.patch - "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 - ) - fi - - default - - # echo -n is not POSIX compliant - sed 's@echo -n@printf@' -i configure || die - - 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 - - # build against system headers - rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - if use minimal ; then - sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die - fi -} - -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 NETNS_RUN_DIR=/run/netns -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - 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 - keepdir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - elif [[ -d "${ED}"/var/lib/arpd ]]; then - rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die - fi -} diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest index 8a647749af81..1e475ccf5819 100644 --- a/sys-apps/irqbalance/Manifest +++ b/sys-apps/irqbalance/Manifest @@ -1,7 +1,5 @@ AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c -DIST irqbalance-1.7.0.tar.gz 54209 BLAKE2B 1213b21c7d3979c9ba7d2298c21f7f0b75217d251ecfa02660ea0602a032d62c9c9b0254bf158e07e0fdcf55b35f332f5a17f929c7393dfdb894ca952dad52b4 SHA512 2fa29c738275dda2fac38d78ca0ec4619826b72529e8eda7ad8ddcda5768bbf282e2260dddc16a8b46d4296289b25dc59684575ae1badca0c6c6ae30b1e9b5ea DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740 -EBUILD irqbalance-1.7.0.ebuild 1326 BLAKE2B b016fd1bd29bd101ba2f7d9fe779d7d2f89e2c6bab9ef24b9b6e8ee1cff5251d4d4bfe5e92e091beaaaf6d84a23ae3340710031a822bdb7a99639cde5a7621aa SHA512 27be7fc08b8a4f8a3d767b7caecdaded2e203bff3e427cc361ff7972e74c5e71aabfe4dbb5095506cd7f383f408dc0716d6f56c779939d682a82b5f2e4c80558 -EBUILD irqbalance-1.8.0.ebuild 1327 BLAKE2B 3fae55518878465994a20fc545f56d78caddb09c32d63c26362baad4ab87fd4eb93d5e46e6978c303f6a49ea8b104d167709f517278ec608a57965c21185f6eb SHA512 65b4994f1ac3f4fabc525b390769be1e38d4b4386ffd996be03dbb340e60ed89a4581762974669ef456822b0908740ee009fee679acca65f46ae4a5847fe5f25 +EBUILD irqbalance-1.8.0.ebuild 1326 BLAKE2B b016fd1bd29bd101ba2f7d9fe779d7d2f89e2c6bab9ef24b9b6e8ee1cff5251d4d4bfe5e92e091beaaaf6d84a23ae3340710031a822bdb7a99639cde5a7621aa SHA512 27be7fc08b8a4f8a3d767b7caecdaded2e203bff3e427cc361ff7972e74c5e71aabfe4dbb5095506cd7f383f408dc0716d6f56c779939d682a82b5f2e4c80558 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04 diff --git a/sys-apps/irqbalance/irqbalance-1.7.0.ebuild b/sys-apps/irqbalance/irqbalance-1.7.0.ebuild deleted file mode 100644 index f9d25c8b15c4..000000000000 --- a/sys-apps/irqbalance/irqbalance-1.7.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 arm arm64 ppc ~ppc64 x86" -IUSE="caps +numa selinux tui" - -DEPEND=" - dev-libs/glib:2 - caps? ( sys-libs/libcap-ng ) - numa? ( sys-process/numactl ) - tui? ( sys-libs/ncurses:0=[unicode] ) -" -BDEPEND=" - virtual/pkgconfig -" -RDEPEND="${DEPEND} - 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/irqbalance/irqbalance-1.8.0.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild index b69570811707..f9d25c8b15c4 100644 --- a/sys-apps/irqbalance/irqbalance-1.8.0.ebuild +++ b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild @@ -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 arm arm64 ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" IUSE="caps +numa selinux tui" DEPEND=" diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index a608a7b05270..90c12be2d8fc 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,9 +1,9 @@ AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94 -DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535 DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92 DIST less-586.tar.gz 351861 BLAKE2B fa3d4eadc740d751daf5303867c2ecf411663b64177e14544bdb30aa1b19c1414020b53e27a1a0666cc1922781a11c44ff1bac0adee4e784edf4ca82913596a4 SHA512 14579e1c682e0c30d614e85cdd969c007ecb613930376a46c0c5614e02c596ea0d0ab50211ed28095206ea70698fd1ccf6762888dfa149773d7b515cf3b2ca7c -EBUILD less-563-r1.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53 +DIST less-589.tar.gz 352390 BLAKE2B d91eaf0e4a3c14bb8a1c1b820965922c9e795cc8c6489c04dad79d14bc634db1e8e20aae9578ca5375d4d1f1fb861a510527ee9433437457d653453eabf5dce9 SHA512 c2a610c894e98853e73d83cf2c7e94ff75a868280b2ab7fa01676c35d35fdbba808f3630fa4954eca40f0823e654df4c287885499bb24f4d0b7b4558fb91977e EBUILD less-581.2.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53 EBUILD less-586.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3 +EBUILD less-589.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3 MISC metadata.xml 383 BLAKE2B 5f11eeb30186e0e73c0c06f244a6eef420b756f60a15fc992cab99deebd2b0d0056d4a12628e9a5ef9494838b1a81efa11567a99182976d7bbe3db048c058d8d SHA512 cf7a569bd5f70879f8c5d8a732213295d53a49c288143523723d6970a176e90fe678e2c2bd76eca630a31deee69a386c498884ffc4b24f8622cf8a60a80848b4 diff --git a/sys-apps/less/less-563-r1.ebuild b/sys-apps/less/less-563-r1.ebuild deleted file mode 100644 index 10671e00e64e..000000000000 --- a/sys-apps/less/less-563-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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-r1.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-589.ebuild b/sys-apps/less/less-589.ebuild new file mode 100644 index 000000000000..c91345dc9f3b --- /dev/null +++ b/sys-apps/less/less-589.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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-r1.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/lshw/Manifest b/sys-apps/lshw/Manifest index ec3e67006489..9a870ae72be0 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1,5 +1,5 @@ DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5 EBUILD lshw-02.19.2b.ebuild 2170 BLAKE2B 0ae10f86dde575d9014b86468c5339736d1ce8be473071157b2d0c2af0d1fba68899a089a9e1ceb63a859aeda5425bd773cd800e293d402bbde10a302cf219e3 SHA512 384a75036367cc1f23e44254af491cfaadc8968b40f52130a441fdf801e12bda1a37559280cd040f466345ce3950dbb322d8a82b4ed0b7c98987eeab0a548d74 -EBUILD lshw-02.19.2b_p20210121.ebuild 2262 BLAKE2B 9aa9d77566e0c36cf4107640bd809347e9533b5b49df27ee69e9703b4c6006ada9e1c802b6389a0ee4bbe81d91d513707c2a4323ef434de746fd6100ac2ff0ba SHA512 f6d6d2b280ffb0244c6fcdf762538deb096cd06f678b6fdd17dcf08c8cabc6e987117903b37ec78467432e1bb2061c8e05490babee21ff3c05cd1c606f146483 +EBUILD lshw-02.19.2b_p20210121.ebuild 2255 BLAKE2B d3a69c38801394d9f86a3dd83714a597bace62dab8bf5cab774cde51d9ce4e0afe27214fdf8ea80c27aadfb2c8cc45d8d0e422ae61df78c51870dd7934685920 SHA512 b88818fa704c19a7fb47ae0b5a97063b7ef51a8af4f3ebba14dcb4d4c79eae25ea81a03d14ab27f7ae9321d0c82e940b67e0b39c75d971c6b3c22db073cc2330 MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3 diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild index 09ae682dbd08..1a41f37f5bdf 100644 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild +++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="gtk sqlite static" REQUIRED_USE="static? ( !gtk !sqlite )" diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest index efaa2db56866..48dba270f972 100644 --- a/sys-apps/memtest86+/Manifest +++ b/sys-apps/memtest86+/Manifest @@ -12,6 +12,5 @@ AUX memtest86+-5.01-objcopy.patch 654 BLAKE2B 34295b2ebb0edbdf007652009de46fef56 AUX memtest86+-5.01-reboot-def.patch 326 BLAKE2B a17bcde8563a3f1a8e88c50e981b3d93439a19d0b1186c511826f9836be8efb5bcc2f0031c28887bf0c67ef9e8c9942eca641f923f87c458f070507645007f0a SHA512 2309da17ae7bfd32137b02c0533a9d4f30c95d70dea309a009219457f07f36e0b9192e1ac55485513a23d6364247476886a4720ffe83d33a2c493124a82797a1 AUX memtest86+-5.01-test-random-cflags.patch 679 BLAKE2B 62ccc56c3f127b3e3213d6bb9605094dd8ba2580d2047873583db8b7a3d48db225eb8b7013319903e92ba9c658569470fb6b3de4f4b7f6b3686efdd5f9c132eb SHA512 a000cf28d69396b0707519bb995f086457f8fa5283299164d969dbf02abea86b566016d71fac7e887c6089bc39c58be9e5c885cfb5f8e7eb815ea1741e097bb6 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7 -EBUILD memtest86+-5.01-r4.ebuild 2775 BLAKE2B c86df4b5113e11b954c1b14e1e1c655a0d989666cc51edb7925b5b3d33839ba79829e4cb0f5cab33df20211420f15f5bb2f4c7ca02748d7a77185ba6b8675fef SHA512 7bd64f7f420f0bdc7bb7a30640f1d6e521ec4b0c02120e51e1f04678a8402d9c94454b97bfe33e269a63dc312647046b0b1aca4b43cf20a2f72cd95900ede79b -EBUILD memtest86+-5.01-r5.ebuild 2845 BLAKE2B 9a62f987683ada3af2f0d26ea7de22daff3e02cfe21ee081f137d516edf3abd1cb24215729e89b761e29c0e67c64ca2732d4f4a348878cd60c23abaecb4b5f5f SHA512 8af53f7a64d66c36dc84e864ed0cad1824fec1a373619b0cf7bfe58d3ec5097a322c46e1d48e477204c9ac5c67b69b723df9c2b3e9bddcf0b460de5f4deec251 +EBUILD memtest86+-5.01-r5.ebuild 2843 BLAKE2B 6094eb3d890de7f7fd72012104c0b467746a313a5ad04c3546e1932556889b108edc8b6ed44442c0443b2305c335c3bbcd4f178c80564b0da9d7a5e11fc17d6f SHA512 dcea721c0ac1abfe2f4f1ccf0972284025d841caf84d7d439ae1b4d9dd891e46418ab08cd4b0807dab93a132cc29a4ee4cae6f72da7cc5dc356e8ef6d3e40859 MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild deleted file mode 100644 index d10fc874b008..000000000000 --- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit mount-boot epatch toolchain-funcs - -DESCRIPTION="Memory tester based on memtest86" -HOMEPAGE="http://www.memtest.org/" -SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="+boot floppy iso serial" - -BOOTDIR="/boot/memtest86plus" -QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest" -QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest" - -RDEPEND="floppy? ( sys-fs/mtools )" -DEPEND="iso? ( app-cdr/cdrtools )" - -pkg_pretend() { - use boot && mount-boot_pkg_pretend -} - -src_prepare() { - sed -i -e 's,0x10000,0x100000,' memtest.lds || die - epatch "${FILESDIR}/${P}-gcc-473.patch" \ - "${FILESDIR}/${P}-hardcoded_cc.patch" - epatch "${FILESDIR}"/${P}-no-scp.patch - epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312 - epatch "${FILESDIR}"/${P}-reboot-def.patch #548312 - epatch "${FILESDIR}"/${P}-no-clean.patch #557890 - epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638 - epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974 - - sed -i 's:genisoimage:mkisofs:' makeiso.sh || die - if use serial ; then - sed -i \ - -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ - config.h \ - || die "sed failed" - fi - default -} - -src_configure() { - tc-ld-disable-gold #580212 - tc-export AS CC LD -} - -src_compile() { - emake - if use iso ; then - ./makeiso.sh || die - fi -} - -src_test() { :; } - -src_install() { - if use boot; then - insinto "${BOOTDIR}" - doins memtest memtest.bin - fi - - insinto /usr/share/${PN} - use iso && newins mt*.iso memtest.iso - doins memtest memtest.bin - - exeinto /etc/grub.d - newexe "${FILESDIR}"/39_${PN}-r1 39_${PN} - - dodoc README README.build-process FAQ changelog - - if use floppy ; then - dobin "${FILESDIR}"/make-memtest86+-boot-floppy - doman "${FILESDIR}"/make-memtest86+-boot-floppy.1 - fi -} - -pkg_preinst() { - use boot && mount-boot_pkg_preinst -} - -pkg_postinst() { - if use boot; then - mount-boot_pkg_postinst - - elog "memtest86+ has been installed in ${BOOTDIR}/" - elog "You may wish to update your bootloader configs by adding these lines:" - elog " - For grub2 just run grub-mkconfig, a configuration file is installed" - elog " as /etc/grub.d/39_${PN}" - elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" - elog " > title=${PN}" - elog " > root (hd?,?)" - elog " > kernel ${BOOTDIR}/memtest.bin" - elog " - For lilo:" - elog " > image = ${BOOTDIR}/memtest.bin" - elog " > label = ${PN}" - elog "" - elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'." - fi -} - -pkg_prerm() { - use boot && mount-boot_pkg_prerm -} - -pkg_postrm() { - use boot && mount-boot_pkg_postrm -} diff --git a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild index 28e4fdcc4547..e47609b69d52 100644 --- a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild +++ b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" IUSE="+boot floppy iso serial" BOOTDIR="/boot/memtest86plus" diff --git a/sys-apps/memtest86-bin/Manifest b/sys-apps/memtest86-bin/Manifest index 5df7c8ff14d1..816e22675c75 100644 --- a/sys-apps/memtest86-bin/Manifest +++ b/sys-apps/memtest86-bin/Manifest @@ -1,4 +1,4 @@ AUX memtest86-bin-grub.d 467 BLAKE2B cf36f784b4032f615e5e3cd07d67125ea54c2d4fd9c7ce2f05a6a87fb4a2636491edabc77a0833039c6a8667d0cefffb20c3d4a755bc9571a363b3c6193a1831 SHA512 0f8063689c2a1dcc5d5aee2b7a7e7db4c195012ab6c641bbd66c3c495bec5252a5733664e900483580e78ee47a29a6e8e078127ef1c723ee6419e9accb4a7bc0 -DIST memtest86-bin-9.0_p2000.zip 8545915 BLAKE2B 104373d099fa64d5b69b07e59fc4d922dd49b90e21c678bb8c39e00b6dd9ca9cadf7757f771731f1ab4780156b1c9f3550c97c4957b7198cf99280193a32d9ff SHA512 12933eac68123c40c804995d1cbb5e6773031a9c23186443a0d7d2d68bc67b64fbdd6aed2fc139c91a3a98358bfa2562b79d1a7d38489686421ac5d59fb4dd07 -EBUILD memtest86-bin-9.0_p2000.ebuild 704 BLAKE2B 28f93fd07044d806183d01654af494bf8334525faacaa640f2986f0278c29d7da25852ffdbe25a944ce619d8e99a6dcb6d2e0d4028ef5fc40ff294adda674677 SHA512 4047b478351cc38843cfb111feebc182704cffdfd4823bfb01594ec184e6cb3ae1b1bdc6ca5f9f75ba1b1a381e3ecb82a443e74078b9a28ad5ac48e99247a3eb +DIST memtest86-bin-9.1.zip 8561760 BLAKE2B 89d72804d8d38b103f64a576b66fbc654ea81acdd04001922d4f6487ba0b0cde50d18a4446cedfdc540cc7c2315e5a1bca97f6c2c2691aea6b5fdd22df3402a5 SHA512 06fc070fc50d115e57309407569274fa4785383f377cb4e4246195f4af30fce531fcf1b866f3ce0a0a7c174902150c327e6f5158a4c59d708ca0ceeae12179d3 +EBUILD memtest86-bin-9.1.ebuild 704 BLAKE2B 28f93fd07044d806183d01654af494bf8334525faacaa640f2986f0278c29d7da25852ffdbe25a944ce619d8e99a6dcb6d2e0d4028ef5fc40ff294adda674677 SHA512 4047b478351cc38843cfb111feebc182704cffdfd4823bfb01594ec184e6cb3ae1b1bdc6ca5f9f75ba1b1a381e3ecb82a443e74078b9a28ad5ac48e99247a3eb MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784 diff --git a/sys-apps/memtest86-bin/memtest86-bin-9.0_p2000.ebuild b/sys-apps/memtest86-bin/memtest86-bin-9.0_p2000.ebuild deleted file mode 100644 index 97f87cab2411..000000000000 --- a/sys-apps/memtest86-bin/memtest86-bin-9.0_p2000.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit mount-boot - -DESCRIPTION="Stand alone memory testing software for x86 computers" -HOMEPAGE="http://www.memtest86.com/" -SRC_URI="https://www.memtest86.com/downloads/memtest86-usb.zip -> ${P}.zip" - -LICENSE="PassMark-EULA" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="" - -BDEPEND="app-arch/unzip - sys-fs/fatcat" - -S=${WORKDIR} - -src_unpack() { - default - fatcat memtest86-usb.img -O 1048576 -r /EFI/BOOT/BOOTX64.efi > ${PN}.efi || die -} - -src_install() { - insinto /boot - doins ${PN}.efi - - exeinto /etc/grub.d/ - newexe "${FILESDIR}"/${PN}-grub.d 39_memtest86-bin - - dodoc MemTest86_User_Guide_UEFI.pdf -} diff --git a/sys-apps/memtest86-bin/memtest86-bin-9.1.ebuild b/sys-apps/memtest86-bin/memtest86-bin-9.1.ebuild new file mode 100644 index 000000000000..97f87cab2411 --- /dev/null +++ b/sys-apps/memtest86-bin/memtest86-bin-9.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit mount-boot + +DESCRIPTION="Stand alone memory testing software for x86 computers" +HOMEPAGE="http://www.memtest86.com/" +SRC_URI="https://www.memtest86.com/downloads/memtest86-usb.zip -> ${P}.zip" + +LICENSE="PassMark-EULA" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="" + +BDEPEND="app-arch/unzip + sys-fs/fatcat" + +S=${WORKDIR} + +src_unpack() { + default + fatcat memtest86-usb.img -O 1048576 -r /EFI/BOOT/BOOTX64.efi > ${PN}.efi || die +} + +src_install() { + insinto /boot + doins ${PN}.efi + + exeinto /etc/grub.d/ + newexe "${FILESDIR}"/${PN}-grub.d 39_memtest86-bin + + dodoc MemTest86_User_Guide_UEFI.pdf +} diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest index 3788b2c89e35..7ee274a97942 100644 --- a/sys-apps/nawk/Manifest +++ b/sys-apps/nawk/Manifest @@ -1,4 +1,4 @@ AUX nawk-20180827-parallel-build.patch 913 BLAKE2B bc0df39ad9d8b0b723c0f66520ddbb8318ccae67c07b5cd5a5743ea1d6154d52da20d2f50eeb00ec45a9cb4bbb52b7244715c868daff77d1e93f89dead130c4c SHA512 aab5431373d7733c9ce8088cc1474f70e4fda352494092850625d34e288682d2d0cc9223d834241c9aecc2ce4411103945c87195336ea91cd4be7fd7b21fcdce DIST nawk-20180827.tar.gz 1824076 BLAKE2B 4cfd000842d75d9a713fe73a85eefab33c17f9ecaca4f7f663d1157da411fd9fcf2badbf5180b4a90910445332095fe457e7acf0643621ac8a68da1a246b5e5f SHA512 cd6561149be71e6311aaa69c86b90ee4b29a057e5c2595470ccc8a41c40c653ec31b4bd46d7f58896d012f5fb5952103a76aa463a69e5128cba43d80eedf0b9b EBUILD nawk-20180827.ebuild 1034 BLAKE2B 8c7e4267c1b2bcb598092cdd59c2ca4f4e3fcb7192f811343786f94e31ee01f6eeaab52ecb81a2a4cb820b6766f58e7858d126cc3d346cbfa17d67b745376517 SHA512 df7f0a9887e234e8e9ad1d12b610a1e67fb869fbd8ac296a2dadfebb320fba83c5764607ac35fa78d574d472047d00fb8c95f92d9554420ac61a8fd4b1b1431b -MISC metadata.xml 330 BLAKE2B 0f7e580c6988620e9e3cf452696c66e7ed5f383e878c898b0f90adf96dd847e6063a09bcccf85bf957c86d329617554e72413b4b7536319e37d8993287de3c5e SHA512 621c5fa8dc89857de39705622efcee6f0487e404de19424d0aaeec5b393a01176585139f98c2587d9169564c73585a339c86af21a41c2ab5ec084adee47d1ff3 +MISC metadata.xml 416 BLAKE2B c1bbd59f560e30ed84f8b7d733c7bfdf4c980d8df2c1f65f9763d5c1e0a27411e43083b7095b38c766b717fb085a874e28a03e9081c7c233881d01744c870a51 SHA512 cd89722b5a98606232d2630393ee5661bfe24d5a3a4d30b70b151ad4128f4503a206b961f085c033c4183b7a8f66c26ade9e2144cdb35eca8b535f1fe3da87e8 diff --git a/sys-apps/nawk/metadata.xml b/sys-apps/nawk/metadata.xml index b919229edbc5..1abea5122b6d 100644 --- a/sys-apps/nawk/metadata.xml +++ b/sys-apps/nawk/metadata.xml @@ -1,11 +1,14 @@ - - junghans@gentoo.org - - - base-system@gentoo.org - Gentoo Base System - + + junghans@gentoo.org + + + base-system@gentoo.org + Gentoo Base System + + + onetrueawk/awk + diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest index ed59c5aecd1f..b178fbd8e628 100644 --- a/sys-apps/opal-utils/Manifest +++ b/sys-apps/opal-utils/Manifest @@ -2,5 +2,7 @@ AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b89 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459 DIST opal-utils-6.7.tar.gz 5320182 BLAKE2B e2fa86a7d5d96afda8f8266875687fb3c2e61ca2932ea5585921b2e5cffe30cb3554d85d078448cda032cbc0438d188ea40b5aad6e7f4c923e77fa4e42e6f364 SHA512 1626d64554c608cd823dc27b58f35206cf6d011afde124746e06fd5f1e8c714c199d9f2b60417415daf01cfbc46208d08d49eef29538a515b539a551b8c5e5c3 +DIST opal-utils-6.8.tar.gz 5321377 BLAKE2B 3be812618dcbd3d877576e1dec0b6a74ad9091b59760bd8f1f67ba9a8efbce79cba4130464dcb6f2b8e61dedca3a1a60103f36d04fcd234b5a4c577c6e07635b SHA512 a799112c14abdcdb37e1a4c63e48e12bb7a67b6c90476d4e60597f06fd6050a58ffd25859cf6bb12c393522e4b4771ce3aa25a1277bac35855d599e9eb357814 EBUILD opal-utils-6.7.ebuild 2475 BLAKE2B de4715513ac5bf263634fd468ba762855ace15e63f678e6bc3b0a8faea353f12a76c1132fc85d29a33834fb1fbec4a2d6eada7299b3499fb82f6d7d4706f040d SHA512 9b22701b32998c75742714ecec9d6860463740ba4c0ff1252ac2b1b8c5b99f087304220302f2cc319c03d49ad459eb4ab3051547d852161e1e8df56b59f04aa1 +EBUILD opal-utils-6.8.ebuild 2480 BLAKE2B abbe19d2ff7cfb7701603efe72b2559931b469c1ef9d9348b7159390fe3e16b7bfc167ebf9783cdc5f027789bab10050bffd9dd0e57ca47c96401ec46cf01829 SHA512 3095b4aab7ee76985ec922517a2c1a6e36212997ef668668f992d4cf9f619a960ce0892446bdaf4e927a44c486a059b9b46134c0a86052e8b37445d0aec7ee31 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666 diff --git a/sys-apps/opal-utils/opal-utils-6.8.ebuild b/sys-apps/opal-utils/opal-utils-6.8.ebuild new file mode 100644 index 000000000000..ccb349721b3d --- /dev/null +++ b/sys-apps/opal-utils/opal-utils-6.8.ebuild @@ -0,0 +1,93 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit linux-info python-single-r1 systemd toolchain-funcs + +DESCRIPTION="OPAL firmware utilities" +HOMEPAGE="https://github.com/open-power/skiboot" +SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2+" +SLOT="0" +KEYWORDS="~ppc64" +IUSE="doc" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="" +RDEPEND="${DEPEND} ${PYTHON_DEPS}" + +BDEPEND="doc? ( $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}]') +)" + +CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS" +ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard" +ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon" +ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils" + +S="${WORKDIR}/skiboot-${PV}" + +PATCHES=( + "${FILESDIR}/flags.patch" +) + +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + +src_configure() { + tc-export CC LD + export OPAL_PRD_VERSION="${PV}" + export GARD_VERSION="${PV}" + export PFLASH_VERSION="${PV}" + export XSCOM_VERSION="${PV}" + export FFSPART_VERSION="${PV}" +} + +src_compile() { + emake V=1 -C external/opal-prd + emake V=1 -C external/gard + emake V=1 -C external/pflash + emake V=1 -C external/xscom-utils + emake V=1 -C external/ffspart + + use doc && emake V=1 -C doc html +} + +src_install() { + emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install + dosbin external/ffspart/ffspart + + python_domodule external/pci-scripts/ppc.py + python_doscript external/pci-scripts/phberr.py + + newinitd "${FILESDIR}"/opal-prd.initd opal-prd + newconfd "${FILESDIR}"/opal-prd.confd opal-prd + + systemd_dounit external/opal-prd/opal-prd.service + + if use doc; then + rm -r doc/_build/html/_sources || die + local HTML_DOCS=( doc/_build/html/. ) + fi + einstalldocs +} + +src_test() { + emake V=1 -C external/opal-prd test + emake V=1 -C external/gard check + # this test is fragile and fails because of filename path + rm external/pflash/test/tests/01-info || die + emake V=1 -C external/pflash check + emake V=1 -C external/ffspart check +} diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest index 833ccde0c0a9..31a70a880c5d 100644 --- a/sys-apps/osinfo-db/Manifest +++ b/sys-apps/osinfo-db/Manifest @@ -1,5 +1,3 @@ -DIST osinfo-db-20210312.tar.xz 113832 BLAKE2B 41deacfc739b00d76a50fef95476eb5ef134b30b3fd9c7d0847daf3e49163087c014db49de2bd50e079baa8e2ad1d5727010c97f53220a87579e220b7f7fb3b6 SHA512 f5644e37c9e1aebea2dcf5a63adec1fd7c0f98b7455c4dea8d8b51cba396a388f9d847d5dd5e0ef8426df8da228a9766a297852ff27cb72dacecd01fd9fbf19b DIST osinfo-db-20210426.tar.xz 118640 BLAKE2B 934e738ede6b261d59fcb30e3c12d64db86ece75977709cbd59b2e105297731e1bdb6687b0d4cda80972ba2a20cc445edeca289c49bc5d056668bee5066d1216 SHA512 b5c2ed444559dfd1903e16f6c29cfd55cd279a789db93e7b5a0dd450ee48a3bc07cf59ff057220b8ccf1097a04ca1be4cd77c10fea292570ac58893fd788c0fd -EBUILD osinfo-db-20210312.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d -EBUILD osinfo-db-20210426.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd +EBUILD osinfo-db-20210426.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/osinfo-db/osinfo-db-20210312.ebuild b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild deleted file mode 100644 index 109cfb6ee818..000000000000 --- a/sys-apps/osinfo-db/osinfo-db-20210312.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -BDEPEND="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/osinfo-db/osinfo-db-20210426.ebuild b/sys-apps/osinfo-db/osinfo-db-20210426.ebuild index b76468286d57..109cfb6ee818 100644 --- a/sys-apps/osinfo-db/osinfo-db-20210426.ebuild +++ b/sys-apps/osinfo-db/osinfo-db-20210426.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" BDEPEND="sys-apps/osinfo-db-tools" diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index f115ee0760bf..cd64588b53ef 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,14 +1,12 @@ -AUX pkgcore-0.10.13-metadata-xsd-2.patch 1202 BLAKE2B 8844f6819579ab54c8ea88f551de2d2671324e494b7321f5d69f7207415f481075742416add7055618b6baaea91588bb82796b764000216f6b051c988837a3bd SHA512 48adb353f4522d682f99c2cafcdd98b51c450579a313a93d3dcb00bcd4e9fc59f7cf6f0ce54377c912c3a4b6af10340a1b6690d845c489e6b77af52b295ac1ae AUX pkgcore-0.10.18-sighdlr-r1.patch 2832 BLAKE2B d0287d3279cacc63f2a81b0bf1e5d325de707e4d0ee2b44da27346bc8b81bfe325296ebd3e05d7af76fd9d21e0663186dfa0f5fad4f2355700f606857ca3ad94 SHA512 361449061fa9f1ad77607757dd1557abc52d5e07b682473524209094e2ce2ba3648fd0824f1775a213d10ca609914a50f51764c0ca39360c989cabb78de3a927 AUX pkgcore-0.10.18-sighdlr.patch 1660 BLAKE2B 4e66dff8988cccfcaae4246ae47c3d9bcb6edabd822d1e1d4224da261d5d7e8e33a9ce69e0f664cc6be536415a79f355ee06be9b10b4da0f6224d614769662fc SHA512 5d87c4a741a24e5e6322bf7034ecb1bdb10cf5a010063b861e710d06bb3b3637ee1b0a1587597721ddcf7274d465239b99c0cf05c6e9b81546059e96d6409013 -DIST pkgcore-0.11.2.tar.gz 641792 BLAKE2B 295cc8302badcae333939d69329331be5f76d965549c75140ce809d693cf688fe3d3152c44a9d738aa2d90ed1c9f4aad2cf3c9a9a3a52a067e69cf7dd6c87b96 SHA512 602e7ad03699b3b3f302d6d414a9587f1c7829be83898e055e8e1a46e2a805b535cb715bbbb4d43100f77b8b119e13e8b1e374f45be879b4c9dfe02340f225d6 -DIST pkgcore-0.11.5.tar.gz 637303 BLAKE2B bd7e609039253864bf02c9a6cb084b54971a37b7d18d8c8234dcea3a7f25f25ec6652f51fc451bd991727f147d1341ee8ab7ecbcb37b727966708c1248fef428 SHA512 59a31cc9166ae2b12ec2cb349a5e29ce06999c532f7007af2392773a1e6f91ae7d6fa91c123991368dfe5ebdd7edc4ccc2a23fbf008c22b7e251562c8deb8bf8 DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B c06f24006be697771dd3d7569e3a27310dca56c05047ac991c2db359838dddd5eec78c8d424e826b39968cc496be6e7eb366668bfa45082aac438b663015cb8a SHA512 e556d20100c0234d319ed2e15686a3bb9f388f1cdefd7188958c3c0b32d741dd531cbbe8d377b0736662f66b3241e633491a72a1ce84dd86790e9f543b3d0800 DIST pkgcore-0.11.8.tar.gz 631665 BLAKE2B 1e33ce394c1df9418d22fc8653fca4da1b4e27d53325167e3b7231fb8382f3c81daa7a93587ab2226116865546d4ca1ae1dd4265ccc2adc9cb9b27106d9c352b SHA512 42ed7c54db5fa48dffa5e3927afae32d1b4db92da41eff99c8eaa10232fdeae4e0f3f4d39b1e1b4e3881304523822a9a99575648809c554e3bdcf59d9eab485b -EBUILD pkgcore-0.11.2-r2.ebuild 1111 BLAKE2B 676d166638807895799de77fcf881962d60734dcb86eba10b726b1c2fb43629f7f2e86948a6f2a9770d5a4737413a6d6396212aafdc9e902bda064f8c64b046d SHA512 38fca7cc42e4e87a164d3f6912786fa0feb5bea777ac9028848b6bbf264de3af5f4a43cf1ae6d6c4eb77c66b8fd66336d8ac7ad27e61a1ee505469b817f54fc4 -EBUILD pkgcore-0.11.5-r3.ebuild 1228 BLAKE2B 76f7aa64db9f6c222c2fe3e81525d81788d941cbeb2abd28d92f3b95c475dcc7feccebc4e64d0f42fb7490f84f50cd87f17c46088a37f983e546327099a7df13 SHA512 035781e3dcd799fb44bdc8ce84688e4f3919ce49f8db8d7e0f56cce91784caf0f6a83adea07e0309e0523c32f0daa5856dcf300daf2ed95be4c6c6c09acb4aa0 +DIST pkgcore-0.12.0.tar.gz 621376 BLAKE2B d58390ad7251fc48465d744a0b0694210d1f1cf505b072c06dc9731819b327b1edfa60d0f89db113852c87109c6340c8c13c72ae2d89b517d5fca34b53632b6b SHA512 d066a2f2deb4f654b04f9e78d37bf88a97f67f0396f5867ffe3a18f8c0d6459d73721b66cad52a50581ee10420694a1fd195b28a013b3a97cb1ebf08bc59598b +DIST pkgcore-0.12.1.tar.gz 621918 BLAKE2B aa3bedaf4d58d8e604b19ce3e6f97242d29eadbbeab85b7de029d0230a5ea77e2ee96b128381964afe92a327674d64878f833d8c1ddc983c0fe1381b008e2d62 SHA512 a78f3ffd5610f14adb07e2adce07c8446012e742c777d08bbc7ac711bf194508d66a14d21aa56f5d0c9353bd10354fdd34bc6eb4b6017c03bff5d1b565a53575 EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106 -EBUILD pkgcore-0.11.8-r1.ebuild 1146 BLAKE2B 329fc5a8f7b4a514703746a4cfc9a0ce6401aad074cd3f46f0e0bf7202155245e716927b1c919f135844b6891b141655e64b83291f7945e263a3b21818dd2264 SHA512 c934d61f4d162f71ba1b8a946a8d2b6b31dc4e6e602e4532c1172a3f110d9ff74523fdb9f26b6b4424327bcba2d87691e12ed14d13f1353b3455766f8d6f02eb EBUILD pkgcore-0.11.8-r3.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2 +EBUILD pkgcore-0.12.0.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2 +EBUILD pkgcore-0.12.1.ebuild 1094 BLAKE2B 6ec36ecd65e23bd06903eebb6948bbbd1c663835d6d1663ade1b9918129b57324ae43b9b9d742c2d5ebc95ca789536b70b4296904fd8b60b64c1df71ecda84f3 SHA512 0ede3350b8b405e782b9a8371523af0de521bf10af6ac2dd4087d9b6729d23aa13a36a06e04253f63540a087d61cb5aee595f058674cce7bff18deea975ec6f6 EBUILD pkgcore-9999.ebuild 1081 BLAKE2B f59f5bab0d4b3f26c2dddcdb8bebe550aa89462cbb9c4c7aadee461b17679dcd3fa39e37208a8853532592a235d959838af6c17bd6c807381db110a8c35a5205 SHA512 b6fb191a3d84a189f45f1ed6c4ebf2bc02fd729688b10ad98b7bc5767ac0dd16e07f052d015e93a84e21a0e3ed1d6c82f8328a926e24b21ee3204863a6ce1d07 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5 diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch deleted file mode 100644 index 84aaf93f73db..000000000000 --- a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cc7be6516d25cfa27b25b5c0ced6b8a8514d46e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 14 Mar 2021 21:19:46 +0100 -Subject: [PATCH] data: Sync metadata.xsd for proxied="" attr - ---- - data/xml-schema/metadata.xsd | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd -index db243abb..d2e3d4ff 100644 ---- a/data/xml-schema/metadata.xsd -+++ b/data/xml-schema/metadata.xsd -@@ -127,6 +127,8 @@ - - -+ - - -@@ -138,6 +140,14 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ - - - > cnf/make.globals || die + fi + + if use native-extensions; then + printf "[build_ext]\nportage-ext-modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest index 4cd0e8ab98a7..303221eb4a58 100644 --- a/sys-apps/razercfg/Manifest +++ b/sys-apps/razercfg/Manifest @@ -1,5 +1,5 @@ AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1 DIST razercfg-0.42.tar.xz 103300 BLAKE2B 83f9432edf4deda78514dd1e2a65e04981d3646c543ebf3b74060f5d6ee5f9c3ddec5b0c544c11c9968c790172ae2bd4d4503adaf1428ca31337fdcd33d8545c SHA512 3856f4133b620fb639a46a5bb02fe8e6c47ae3928a04fe9d1bbef2792a44fdd4f5dff2efa43a1e43d75312025d3c65c626e331e723092e4e0b8d6622657fb197 -EBUILD razercfg-0.42.ebuild 2102 BLAKE2B be673b8f875378ff984e54500378d7d279779779f773f32883fcb584830dce3b92907e6dbc171604618c8b7a52f1b0bb26babc34c28ba3236a9a16811492a2f7 SHA512 5f605666f375fd55732c2c9be3df825d3e0cd1fb0a5420b751484c88b432c0d8d54eefcfb72840ea7f2210be4eb5efb17f09e653bd2aa73fc666c57e5998d8f2 +EBUILD razercfg-0.42.ebuild 2103 BLAKE2B 1b060ff1579c5417bbe5e8cd3d8012eb78031fa22ae889b98635b6cf0309e3917633d2e97049d6538da654d3e2738fc3e263b2f6a123c0a14b6b3874d9ade70a SHA512 f06348f9213cc2c4e0bde1b44537686a8d35200718416e1e02aca3b567126cfce9de73ce794d4daee0d2812ee39d50a669ab08afa121341f4380714cb3e5c6a7 MISC metadata.xml 993 BLAKE2B 31175b645ebae1a40a17a18be2ec443c612cafdc568ae8be03dd8101789987f3fc3157c53f8e0c117930bdddb7508e663690aa0b2ce31dae76ee2675a678b66d SHA512 3a4d211df0bff7e749003f6357edd902a2f434784381bdd923fa54055321fa257c9b4fb29cda2be94bd5bffed1b5ecad1d4a87e3b26a056ea7757c0acb25f9d7 diff --git a/sys-apps/razercfg/razercfg-0.42.ebuild b/sys-apps/razercfg/razercfg-0.42.ebuild index e44853ff4bc0..251955d1640b 100644 --- a/sys-apps/razercfg/razercfg-0.42.ebuild +++ b/sys-apps/razercfg/razercfg-0.42.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit cmake python-single-r1 systemd tmpfiles udev diff --git a/sys-apps/readahead-list/Manifest b/sys-apps/readahead-list/Manifest index ab2bc1320c45..9ea01d07827e 100644 --- a/sys-apps/readahead-list/Manifest +++ b/sys-apps/readahead-list/Manifest @@ -4,5 +4,5 @@ AUX init.d-readahead-list-early 516 BLAKE2B 61f56105177fa70318a0076ba327f9795023 AUX readahead-list-1.20060421.1016-gcc-4.3.patch 200 BLAKE2B ba4051a07214477f948af0e1c310b97e43cd7aaed9c1d79b3937da8ea42ad4b604bb69967a15da21dda219e82a5b71ccfa82c947f51f116f3a69ac2e1c67bc22 SHA512 eb292b74e4fdc167a7edaf9d0f3f8ebabd69eff14a18b860ecbe26241708875153dd43ba3bce41a94bd83892093cf8f41d3f7bc421fadaab8a88d9728cb67795 AUX readahead-list-1.20060421.1016-gcc6.patch 674 BLAKE2B 5749541d931ec45679c3c43fc2afb0b625fa53e54c86f4da413774d6e2cdf8f94f9819e0f802fe27d2ec6bff8dffe368ca72952769d1d6596ae0958030625ebb SHA512 3b070f6ffe5c396c2535e0fb7cbe8ba3ed87dcada1cacc39e9a607298c8a9fa4af37dd0942733b3a6d9bdbf55f6d1ad3916da7ac25bcce3188ce29c76711bdc8 DIST readahead-list-1.20060421.1016.tar.bz2 108337 BLAKE2B d806e5afd9ba5334522e90cae830496ba3316927a5b2f605834de4b6cd3cbf6a8fbf840e92069546bc526e65d0beac04bc8c6f6dbff5f2fdfc9f033b0f5a2682 SHA512 fa5644be139c37f9464823e20472a607d7ab754259c6545f83cc9679419bf643ee70aebd7aa4d496a8fb349048ba4836e2ac45ae727ade76156b5ad6e6889ec5 -EBUILD readahead-list-1.20060421.1016-r3.ebuild 1486 BLAKE2B 281c4cad9f8db8def29563b2ea026dd7066acd12ab87b0427299cc2c019ab01eaef67a17826eeea77ba902f6156739520a64bbba9fb50c542fd39439b61974e3 SHA512 eed7fa282df5e9cd375a68486bae9e8f6a65491f11caf47a6a37c41ffae3f398606ab81fd839f3eed5eef395a29b883638ccc5b5f83e02251082b9629dd23c39 +EBUILD readahead-list-1.20060421.1016-r3.ebuild 1459 BLAKE2B 302d0597843d3cbf525d7b55923f6cec864ef888724fb1d65908b0483f3a9ef24b95f247977c374c546ceb2100491c9c71fea53a9503091d51668cb2a7663acb SHA512 b2e8fffd52c93142bc3f7771600d3f034f011e99362fecc595ec4dfbc40a96f52eb0c5b2c13a67d0f6bddc0a77a8d3573e68d1d9fd70dcbe989a05881bf00638 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4 diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild index 2c963c97fec9..f75dd67ab1d3 100644 --- a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild +++ b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,10 +11,7 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="doc" -RDEPEND="" -DEPEND="${RDEPEND} - virtual/os-headers -" +DEPEND="virtual/os-headers" PATCHES=( "${FILESDIR}/${P}-gcc-4.3.patch" diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest index b0d85aa7b003..d21a18da2ca6 100644 --- a/sys-apps/sdparm/Manifest +++ b/sys-apps/sdparm/Manifest @@ -1,5 +1,3 @@ -DIST sdparm-1.11.tgz 473501 BLAKE2B 7c8b8a1c14b72de3c36cd701c6d870e0b671df2f17d17a63eb00cce41a80f3cbfbe9e3f2afca08f1a1a9be5a08fbb98a9ddb1ccdc117bceef508790407513754 SHA512 cb5d1dd351464fcc05005429bb8f452b05e6673b1dd8b699f762d005ab3e612b3b7d6ea400ffbd5e98e33e3e78da735d01705353b8a9b9567aac55a3f6b6d813 DIST sdparm-1.12.tgz 486592 BLAKE2B 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6 SHA512 00e2775c290c6db3a02780dd3eefa58ac40e1df79a7f19f80a9d497c019a9a4a9a16fb2726f48e7083d0104a8e74326e683c3f5f44c7d1f591a0f607e10493b1 -EBUILD sdparm-1.11-r1.ebuild 1013 BLAKE2B b6ad08363dc6b2bcb1313ec286a8c8f89d0d00a606413f5df8021cfe5523143050bc30a5be3d774de29c84adbbce3449e0dcbfbc0ee2c505a2e2e698ccba1d0e SHA512 09908f1ed86909834dc4e42d310b4e411d446a28dd8d1da74b65a1d6246121443cec3ee55be72e507b12ac723794c9b09b8a0f810da77c7ebd27661d71d975aa -EBUILD sdparm-1.12.ebuild 1019 BLAKE2B f260399daf449a20f2585ea61d6e8bb9f57ca5366b0c170e58d9b656a498ddc69af7e040379628cdb67f2eac3f0d84ef806196c7184ab4fdf35afb6ebe3a12b6 SHA512 01bb2a18c387fe7c8f1079ac3c937acc5101da5f943fec37926bd915d510182feffbc461321a16614fc94637ea3d993da7761d37a3c6cb75c4811c7a87c7568b +EBUILD sdparm-1.12.ebuild 1013 BLAKE2B b6ad08363dc6b2bcb1313ec286a8c8f89d0d00a606413f5df8021cfe5523143050bc30a5be3d774de29c84adbbce3449e0dcbfbc0ee2c505a2e2e698ccba1d0e SHA512 09908f1ed86909834dc4e42d310b4e411d446a28dd8d1da74b65a1d6246121443cec3ee55be72e507b12ac723794c9b09b8a0f810da77c7ebd27661d71d975aa MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/sdparm/sdparm-1.11-r1.ebuild b/sys-apps/sdparm/sdparm-1.11-r1.ebuild deleted file mode 100644 index 3a51faebd89d..000000000000 --- a/sys-apps/sdparm/sdparm-1.11-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm" -HOMEPAGE="http://sg.danny.cz/sg/sdparm.html" -SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -# Older releases contain a conflicting sas_disk_blink -RDEPEND=">=sys-apps/sg3_utils-1.45:0=" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog CREDITS README notes.txt ) - -src_configure() { - # sdparm ships with a local copy of this lib, but will use the system copy if it - # detects it (see the README file). Force the use of the system lib. #479578 - export ac_cv_lib_sgutils2_sg_ll_inquiry=yes - default -} - -src_install() { - default - - # These don't exist yet. Someone wanna copy hdparm's and make them work? :) - #newinitd ${FILESDIR}/sdparm-init-1 sdparm - #newconfd ${FILESDIR}/sdparm-conf.d-1 sdparm -} diff --git a/sys-apps/sdparm/sdparm-1.12.ebuild b/sys-apps/sdparm/sdparm-1.12.ebuild index 451f17f9b145..3a51faebd89d 100644 --- a/sys-apps/sdparm/sdparm-1.12.ebuild +++ b/sys-apps/sdparm/sdparm-1.12.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" # Older releases contain a conflicting sas_disk_blink diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest index eca8a40cf392..55d018d5c54f 100644 --- a/sys-apps/sg3_utils/Manifest +++ b/sys-apps/sg3_utils/Manifest @@ -2,6 +2,6 @@ AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642 AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf -EBUILD sg3_utils-1.42.ebuild 1034 BLAKE2B 10745a9e5cb59557406583f5eba0333f75f6357cd84fc68130fd98a486938905f48c609114403bb47c918f0439169df73bf478d120d625a86e04d2c789593c27 SHA512 bad6f00df0944a54bdb692ec7e16fb213eb35c93066c9dc23123ad6b683544ec037a9703cb229bb902396b9a962f7188212207121998c1ba7a6eda9a185ca1ca +EBUILD sg3_utils-1.42.ebuild 1047 BLAKE2B 29a471fa93e004cb38bd2e6ca9aed538d82c67b4a19e6870f14c17440bbda4bbebccaa2a6b2e2ea3973835d800d890d9d83c63659b1c2911be6a151e18c48c1d SHA512 df10bf8b262020f1b72c13e74ac5817a102ae4dc763f8f8fea6e3bdf51fabca1a8fe81a8fca77ea95ea3eedac8b94685b153f33adb37b87c6a3d6bd9169dd646 EBUILD sg3_utils-1.46-r1.ebuild 1066 BLAKE2B 4871a822cc621c43c04838380cc6d4afc1360ecc851414106141c3e676d29fb236b0a7e386af7c629386beeeb8e2dbd15d083fda0deb8464901c0d3ba1e1325c SHA512 fc2717f60f31087fed00be923c0fa7e04a66928093f1a93524de9629a48f1292bcaa4a43599473ac8eb0da86ac6195f7ff5619643f30042a61598f61bf3deeaf MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild index 7509872c7d20..358c4e36cde3 100644 --- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild +++ b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild @@ -3,7 +3,7 @@ EAPI=5 -inherit epatch multilib ltprune +inherit epatch multilib DESCRIPTION="Apps for querying the sg SCSI interface" HOMEPAGE="http://sg.danny.cz/sg/" @@ -40,5 +40,5 @@ src_install() { dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}" done - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest index 36e06876ddb5..bcc3f514e10d 100644 --- a/sys-apps/smartmontools/Manifest +++ b/sys-apps/smartmontools/Manifest @@ -1,9 +1,7 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8 -DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295 DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea -EBUILD smartmontools-7.1-r1.ebuild 4040 BLAKE2B 7f82711dacc792547dc076b261f9ad086978f636d7c6d62878f278f3e3107a5deef93f22f5bbd66fbadc44b548fdcd6839b86194ecf23f83b2e2466fbf4fa681 SHA512 5ded0a30a32eb2643eb48bf1f8d4764c84b35cc8c397ba4386d03f6cb16590dee1410d26ba8985ec4779862539f8596262e462c969bd0632748f18261818bb37 EBUILD smartmontools-7.2.ebuild 4105 BLAKE2B 04ab5f70448fe786a0e0bc49d265b5d19fb4a8b5f4c6fb447256c7591f6bf80bbc06b334c2342a20b84eec2f52e32c99f53f668e0c099ce07802436b6cf59028 SHA512 7aee5b7eb2a9a1a4ab51aeeee5c06db1504bdcbd7193bcffca792916b9b571b0f6372f16f6d832d8f2c426d614ae144e65659afb9e7970bc3f162d20b5d743b5 EBUILD smartmontools-9999.ebuild 4113 BLAKE2B 7e01726db047e2390c037cf75cd5a44da3f8749e0e39d2d6863d75fdf8acf9c5461a0df41898476a723d6e5774221335ab65c746d2e3d843311716d7819144e8 SHA512 a803668aba5cabb2653f29093bdcedab45dec38124baef8c39c5ac355199d3bba0779e3e76d73209cdfac721810bc12b414a07086c7b0f5749088b380b805fcb MISC metadata.xml 628 BLAKE2B a619effbf00a8b83df53ae6b7e191ed97af2e996ba3f025328021b67b49a167c3eae0be016b1fe106bef263a8b29e5add385f067efaef18ea07da451ede84ebc SHA512 ae5c3076410f080d87db55935a6254768ed07faf5bafed2ed9bb9d469b263b6bd8d418a1e50d1030aa6873f0c82014887ef7f2df8e032b6487f782f72a1ea54e diff --git a/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild deleted file mode 100644 index 823bf3d00684..000000000000 --- a/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools flag-o-matic systemd -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools" - ESVN_PROJECT="smartmontools" - inherit subversion -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -fi - -DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" -HOMEPAGE="https://www.smartmontools.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps +daemon selinux static systemd update-drivedb" - -DEPEND=" - caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) - ) - selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} - daemon? ( virtual/mailx ) - selinux? ( sec-policy/selinux-smartmon ) - systemd? ( sys-apps/systemd ) - update-drivedb? ( - app-crypt/gnupg - || ( - net-misc/curl - net-misc/wget - www-client/lynx - dev-vcs/subversion - ) - ) -" - -REQUIRED_USE="( caps? ( daemon ) )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - # The build installs /etc/init.d/smartd, but we clobber it - # in our src_install, so no need to manually delete it. - myeconfargs=( - --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 - --with-initscriptdir="${EPREFIX}/etc/init.d" - #--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}" - $(use_with caps libcap-ng) - $(use_with selinux) - $(use_with systemd libsystemd) - $(use_with update-drivedb gnupg) - $(use_with update-drivedb update-smart-drivedb) - $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local db_path="/var/db/${PN}" - - if use daemon; then - default - - newinitd "${FILESDIR}"/smartd-r1.rc smartd - newconfd "${FILESDIR}"/smartd.confd smartd - else - dosbin smartctl - doman smartctl.8 - - local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO ) - einstalldocs - fi - - if use update-drivedb ; then - if ! use daemon; then - dosbin "${S}"/update-smart-drivedb - fi - - exeinto /etc/cron.monthly - doexe "${FILESDIR}/${PN}-update-drivedb" - fi - - if use daemon || use update-drivedb; then - keepdir "${db_path}" - - # Install a copy of the initial drivedb.h to /usr/share/${PN} - # so that we can access that file later in pkg_postinst - # even when dealing with binary packages (bug #575292) - insinto /usr/share/${PN} - doins "${S}"/drivedb.h - fi - - # Make sure we never install drivedb.h into the db location - # of the acutal image so we don't record hashes because user - # can modify that file - rm -f "${ED%/}${db_path}/drivedb.h" || die - - # Bug #622072 - find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die -} - -pkg_postinst() { - if use daemon || use update-drivedb; then - local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h" - local db_path="${EROOT}var/db/${PN}" - - if [[ ! -f "${db_path}/drivedb.h" ]] ; then - # No initial database found - cp "${initial_db_file}" "${db_path}" || die - einfo "Default drive database which was shipped with this release of ${PN}" - einfo "has been installed to '${db_path}'." - else - ewarn "WARNING: There's already a drive database in '${db_path}'!" - ewarn "Because we cannot determine if this database is untouched" - ewarn "or was modified by the user you have to manually update the" - ewarn "drive database:" - ewarn "" - ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this" - ewarn " release which can be found in '${initial_db_file}', i.e." - ewarn "" - ewarn " cp \"${initial_db_file}\" \"${db_path}\"" - ewarn "" - ewarn "b) Run the following command as root:" - ewarn "" - ewarn " /usr/sbin/update-smart-drivedb" - - if ! use update-drivedb ; then - ewarn "" - ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}" - ewarn "with USE='update-drivedb'." - fi - fi - fi -} diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest index 2ad3c58c60ef..437e2715b9c1 100644 --- a/sys-apps/systemd-tmpfiles/Manifest +++ b/sys-apps/systemd-tmpfiles/Manifest @@ -3,6 +3,9 @@ AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f +DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7 +DIST systemd-tmpfiles-248.3-musl.tar.xz 22904 BLAKE2B a277ce86577644cecbca5dbfde34aec494e3e14075ab4f7fcbb02f9307d714a93ca63f38e346a1e98391ca9c55860c7e90789cd5edb9b196cf638d54bfe1153b SHA512 d3db6a90bed6b6c1a9f6bce138137554742d1bc60da142fbadbd49b64677a562e47d8140b9c413857106e053d740476744b7f7e05af9dd4a1329058c78cef940 EBUILD systemd-tmpfiles-246.ebuild 4706 BLAKE2B 9cdf5cea7dc7e3984c81f2b706b078e5b3a0354d70e387b7df5df413ebf1c5fd6b60ba56b3cf202ca07b4c2e62733e522cfcfe23012216c0c092be5e1c6e7707 SHA512 6fd016811da2db42a7c7a418cc5c5807c84ac1b5b8a8f538c3810d1225d4a9de03a3c435b5f3b9dba7a7730a147b7efba8ca25a0d6e83818de877254e20eedea +EBUILD systemd-tmpfiles-248.3.ebuild 5458 BLAKE2B c72526bd3f6d1cacb5a6365e357cba731c99ce0123b946e9219f46c4dfcc87f840fa61d7f82b5c927d5a84b04448b4fcf7d5b392e0aa95e8fdd03203fd747480 SHA512 4871258fb38aba79ce92d44af7fc27b1d0b8371b29032b10c3dacc17378cf01c99e09d15ecbde4c6127befb68ac9e56af27e66d76cc3c225a3b309aff7ca3c4c MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9 diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild new file mode 100644 index 000000000000..1e8065ab5c17 --- /dev/null +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild @@ -0,0 +1,238 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable +else + MY_PN=systemd +fi + +MINKV="3.11" +PYTHON_COMPAT=( python3_{8..10} ) +inherit flag-o-matic meson python-any-r1 + +DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz + elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/${P}-musl.tar.xz )" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="selinux test" +RESTRICT="!test? ( test )" + +DEPEND=" + sys-apps/acl:0= + >=sys-apps/util-linux-2.30:0= + >=sys-kernel/linux-headers-${MINKV} + sys-libs/libcap:0= + selinux? ( sys-libs/libselinux:0= ) +" +RDEPEND="${DEPEND} + !sys-apps/opentmpfiles + !sys-apps/systemd +" + +BDEPEND=" + ${PYTHON_DEPS} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + dev-util/gperf + >=dev-util/meson-0.46 + >=dev-util/intltool-0.50 + >=sys-apps/coreutils-8.16 + sys-devel/m4 + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + # musl patchset from: + # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches + if use elibc_musl; then + einfo "applying musl patches and workarounds" + eapply "${WORKDIR}/${P}-musl" + + # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch + append-cflags '-D__UAPI_DEF_ETHHDR=0' + + # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’, + # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’} + # not a nice workaround, but it comes from debug messages and we don't really use this component. + append-cflags '-Wno-error=format' + fi + + default + + # https://bugs.gentoo.org/767403 + python_fix_shebang src/test/*.py + python_fix_shebang test/*.py + python_fix_shebang tools/*.py +} + +src_configure() { + # disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries" + # and optionally selinux feature can be enabled to make tmpfiles secontext-aware + local systemd_disable_options=( + adm-group + analyze + apparmor + audit + backlight + binfmt + blkid + bzip2 + coredump + dbus + efi + elfutils + environment-d + fdisk + gcrypt + glib + gshadow + gnutls + hibernate + hostnamed + hwdb + idn + ima + initrd + firstboot + kernel-install + kmod + ldconfig + libcryptsetup + libcurl + libfido2 + libidn + libidn2 + libiptc + link-networkd-shared + link-systemctl-shared + link-timesyncd-shared + link-udev-shared + localed + logind + lz4 + machined + microhttpd + networkd + nscd + nss-myhostname + nss-resolve + nss-systemd + oomd + openssl + p11kit + pam + pcre2 + polkit + portabled + pstore + pwquality + randomseed + resolve + rfkill + seccomp + smack + sysext + sysusers + timedated + timesyncd + tpm + qrencode + quotacheck + userdb + utmp + vconsole + wheel-group + xdg-autostart + xkbcommon + xz + zlib + zstd + ) + + # prepend -D and append =false, e.g. zstd becomes -Dzstd=false + systemd_disable_options=( ${systemd_disable_options[@]/#/-D} ) + systemd_disable_options=( ${systemd_disable_options[@]/%/=false} ) + + local emesonargs=( + -Dacl=true + -Dtmpfiles=true + -Dstandalone-binaries=true # this and below option does the magic + -Dstatic-libsystemd=true + -Dsysvinit-path='' + ${systemd_disable_options[@]} + $(meson_use selinux) + ) + meson_src_configure +} + +src_compile() { + # tmpfiles and sysusers can be built as standalone and link systemd-shared in statically. + # https://github.com/systemd/systemd/pull/16061 original implementation + # we just need to pass -Dstandalone-binaries=true and + # use .standalone target below. + # check meson.build for if have_standalone_binaries condition per target. + local mytargets=( + systemd-tmpfiles.standalone + man/tmpfiles.d.5 + man/systemd-tmpfiles.8 + ) + meson_src_compile "${mytargets[@]}" +} + +src_install() { + # lean and mean installation, single binary and man-pages + pushd "${BUILD_DIR}" > /dev/null || die + into / + newbin systemd-tmpfiles.standalone systemd-tmpfiles + + doman man/{systemd-tmpfiles.8,tmpfiles.d.5} + + popd > /dev/null || die + + # service files adapter from opentmpfiles + newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev + newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup + + # same content, but install as different file + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup +} + +src_test() { + # 'meson test' will compile full systemd, but we can still outsmart it + "${EPYTHON}" test/test-systemd-tmpfiles.py \ + "${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed" +} + +# stolen from opentmpfiles ebuild +add_service() { + local initd=$1 + local runlevel=$2 + + elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" + mkdir -p "${EROOT}/etc/runlevels/${runlevel}" + ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" +} + +pkg_postinst() { + if [[ -z $REPLACING_VERSIONS ]]; then + add_service stmpfiles-dev sysinit + add_service stmpfiles-setup boot + fi +} diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 0d5da968d7f4..09bcc1a3335f 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,15 +1,9 @@ AUX bootlogd.initd 259 BLAKE2B 78c1a1fe8583685656edb85e29f8dbed40bdd7272590bbdaccb52fe6e54cce0a077a28501c7c87bec55f046172545d940c52345551cd3c01cff0895d12b32a15 SHA512 05a3c2542ceaff85c02c5c30a52be8f1bb95741fffef306777ad1b248b527cdd921f009571e1f43d7a6ede0cc61cf490a1dbbbfe0a50b234c258ad7688a37ad9 AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaaa834be2049411148ec18b591283d85f42b0c3c1e41f442ba95c5f5b4cd9e87b39a83d51e SHA512 aaf46f9c74ae58027e59f32e5e929ff6529206d07fdf4e3f17962ccbc46c68d34e4e2839019708a763dead93b83ca8f457379491830ab43d6407247fd7ac2a77 -AUX inittab-2.95 1978 BLAKE2B b6fb1e0c6eaa68fb5d451d8065d1b1b5a53b15339f46a03f1c1ae410d03b40d102fe27e377750c1059377a4c741b30641c7f5e0f6f38c9d36180c43e25cac0ed SHA512 cae9909916b23c1bb6573b4b9bfc14ffb9d0b98e7c1546851713269528443b29417656c420f95810619fb0ae67f309bbe51804238825e938f53b75a0c4d76b81 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0 -AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf2d8129e71c9564fc0b60e5adb3f2dda998dbdea7a3ee9fbfd3f7bc29ec977f8d47de4581d77abd6e1cdb6feeab9633946251e SHA512 682e6afd6443ffef2cbac9898eca42546b0614a82b2a0c370015cf5373229c00170a22adabf54d10a0f85da7b19de39334b05ef69874fa4003a9c74b7e416974 AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa45220a1bf79da86207ffa1393c311cb4c4a2ad9b8b7bf81cc4ae2ccb2acb19b66fd575935d8a0b0a2a9b3899c0088c9f SHA512 ef33da0d5673180275c8120c6904a4214cf1308827a626d8d6a2aab67d7d25b5407f9efcaf6a7a4a09a8c409899242943f6a95881cc8c8898b780224f991f2f7 -DIST sysvinit-2.97.tar.xz 126848 BLAKE2B dd2612de531a89f1fdbfaeb8b5975aeba9541a6b570587a881bdb11406991c1a9b254d1802725298eb13362d625d3859b520ee964782a0fe43d3f038a28b49e6 SHA512 89950080a120b62bdd297f3a59898dd11e10c7438cf18774bad16c65ce5fb2e190726e601c6f263def32cff59867c0984edcd99d527eb80297901085afbb2e90 -DIST sysvinit-2.98.tar.xz 127028 BLAKE2B 302219cd0753dee20772d78ad073e279f430ededab93feaecd166d9be9f91f0f5e97fcfe3e5893d9db963ba638e66e1f6670a94f6e2328fbfdb92325563a129c SHA512 37bc3279b58ce3d808abb78eb6aa8c18a55f991343cc66316ad5b8c2fbb8dce95b83dd995cdab1df8c82a5ab155d0ad65bc3cee3860e4ba4ba4f8c2ac865c3f7 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd -EBUILD sysvinit-2.97.ebuild 3956 BLAKE2B 063ff416ecd75142e9f4700983768b1b242cc47cdb471c0fb754d0b752b1d8bb851c96f369998acfff042d9273f3cc9eda247565219db9201f937c88a3606fbe SHA512 ae8d9e453ee5fd0305e27a9ad47331044ce97d48e0ed061b811eb0db469a0e0e4b23c48d9d0177f4d804dba36068f88379af2cffe8e2de77f1e91dbf30928fe3 -EBUILD sysvinit-2.98-r1.ebuild 3964 BLAKE2B b9aba3c6723cdd18119eff7a6e4fe926070340d2f4f6d4513a549632f8d9e17513e6eabae101dfd399843f489884f4370c406836148baab931f93dd9277a5f0c SHA512 de496ac43e87209fa3a2163f7a4588cc61831a542bad9382f303048d3e3d922fd8cedaea4fb16ac37f1bc8ea83fa33ec0c79d16a3acf45af75e4aacb2c810b97 EBUILD sysvinit-2.99.ebuild 3959 BLAKE2B 336dab1fcea056bb9c3dfcee0b59ba42b032aa18b4645f2bea76a64c0a45dbf314a71b0c1236f6ae941dda2f26f57ab0b18c1e1c5fd43363f32878029b37bd05 SHA512 5a4ccb62aa7dc2faee89b11acd4061a6678bda65999e516349a86d50774967d6554bb94912e83b5ca6d87eebf60036abb5deef39fac471629f9542550e553d3d MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f diff --git a/sys-apps/sysvinit/files/inittab-2.95 b/sys-apps/sysvinit/files/inittab-2.95 deleted file mode 100644 index 03f226a8c3bf..000000000000 --- a/sys-apps/sysvinit/files/inittab-2.95 +++ /dev/null @@ -1,61 +0,0 @@ -# -# /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.sh -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/files/sysvinit-2.95_beta-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch deleted file mode 100644 index f24e1029ca58..000000000000 --- a/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch +++ /dev/null @@ -1,87 +0,0 @@ -other inits have moved to not requiring the -h flag when used with -H/-P. -modify sysvinit to be the same since it really doesn't matter. - -https://bugs.gentoo.org/449354 - -patch by Doug Goldstein - ---- - man/shutdown.8 | 11 ++++------- - src/shutdown.c | 12 ++++-------- - 2 files changed, 8 insertions(+), 15 deletions(-) - ---- sysvinit-2.95/man/shutdown.8 -+++ sysvinit-2.95/man/shutdown.8 -@@ -66,22 +66,19 @@ - .\"}}} - .\"{{{ -h - .IP \fB\-h\fP --Halt or power off after shutdown. Usually used with the -P or -H flags, --depending on whether we want to poweroff or simply stop the operating system. -+Equivalent to -P, unless -H is specified. - .\"}}} - .\"{{{ -P - .IP \fB\-P\fP --Modifier to the -h flag. Halt action is to turn off the power. --Must be used with the -h flag. -+Halt action is to turn off the power. - .\"}}} - .\"{{{ -H - .IP \fB\-H\fP --Modifier to the -h flag. Halt action is to halt or drop into boot --monitor on systems that support it. Must be used with the -h flag. -+Action is to halt or drop into boot monitor on systems that support it. - Halting is often used to run through the shutdown process and leave - output on the screen for debugging purposes. Or when the user wants the OS to - stop, but leave the power on. To power off at the end of the shutdown sequence --use the -P modifier instead. -+use the -P option instead. - .\"}}} - .\"{{{ -f - .IP \fB\-f\fP ---- sysvinit-2.95/src/shutdown.c -+++ sysvinit-2.95/src/shutdown.c -@@ -144,9 +144,7 @@ - "\t\t -r: reboot after shutdown.\n" - "\t\t -h: halt after shutdown.\n" - "\t\t -P: halt action is to turn off power.\n" -- "\t\t can only be used along with -h flag.\n" - "\t\t -H: halt action is to just halt.\n" -- "\t\t can only be used along with -h flag.\n" - "\t\t -f: do a 'fast' reboot (skip fsck).\n" - "\t\t -F: Force fsck on reboot.\n" - "\t\t -n: do not go through \"init\" but go down real fast.\n" -@@ -556,9 +554,11 @@ - switch(c) { - case 'H': - halttype = "HALT"; -+ down_level[0] = '0'; - break; - case 'P': - halttype = "POWEROFF"; -+ down_level[0] = '0'; - break; - case 'a': /* Access control. */ - useacl = 1; -@@ -574,6 +574,8 @@ - break; - case 'h': /* Halt after shutdown */ - down_level[0] = '0'; -+ if (!halttype) -+ halttype = "POWEROFF"; - break; - case 'f': /* Don't perform fsck after next boot */ - fastboot = 1; -@@ -613,12 +615,6 @@ - } - } - -- if (NULL != halttype && down_level[0] != '0') { -- fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n"); -- usage(); -- exit(1); -- } -- - /* Do we need to use the shutdown.allow file ? */ - if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) { - diff --git a/sys-apps/sysvinit/sysvinit-2.97.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild deleted file mode 100644 index 6476fe8b57e6..000000000000 --- a/sys-apps/sysvinit/sysvinit-2.97.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -[[ "${PV}" == *beta* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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 - - # logsave is already in e2fsprogs - sed -i -r \ - -e '/^(USR)?S?BIN/s:\::g' \ - -e '/^MAN8/s:\::g' \ - src/Makefile || die - - # Mung inittab for specific architectures - cd "${WORKDIR}" || die - cp "${FILESDIR}"/inittab-2.95 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 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 - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd - into / - dosbin "${FILESDIR}"/halt.sh - - keepdir /etc/inittab.d - - find "${ED}" -type d -empty -delete || 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 [[ -z ${ROOT} ]] ; then - if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then - ln -s /dev/initctl /run/initctl \ - || ewarn "Failed to set /run/initctl symlink!" - 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." - - # Required for new bootlogd service - if [[ ! -e "${EROOT}/var/log/boot" ]] ; then - touch "${EROOT}/var/log/boot" - fi -} diff --git a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild deleted file mode 100644 index 72ee3268859b..000000000000 --- a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -[[ "${PV}" == *beta* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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 - - # logsave is already in e2fsprogs - sed -i -r \ - -e '/^(USR)?S?BIN/s:\::g' \ - -e '/^MAN8/s:\::g' \ - src/Makefile || die - - # Mung inittab for specific architectures - cd "${WORKDIR}" || die - cp "${FILESDIR}"/inittab-2.98-r1 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 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 - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd - into / - dosbin "${FILESDIR}"/halt.sh - - keepdir /etc/inittab.d - - # dead symlink - find "${ED}" -xtype l -delete || die - - find "${ED}" -type d -empty -delete || 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 [[ -z ${ROOT} ]] ; then - if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then - ln -s /dev/initctl /run/initctl \ - || ewarn "Failed to set /run/initctl symlink!" - 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." - - # Required for new bootlogd service - if [[ ! -e "${EROOT}/var/log/boot" ]] ; then - touch "${EROOT}/var/log/boot" - fi -} diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest index 325ac41370f3..3c4476a289de 100644 --- a/sys-apps/usbredir/Manifest +++ b/sys-apps/usbredir/Manifest @@ -1,6 +1,4 @@ -DIST usbredir-0.8.0.tar.bz2 331349 BLAKE2B 0190b4ab35cd554c13b65d30756b7b018e7ce82c72e7dddbaf05b8a704bd8a25724c4ac4759e1b86dfadb64ad7ade75c05365ab9ae3152f8fa60e909bc5e183b SHA512 976274adf08f8691b0961f5238021e988a4347873d0c67576038f44cbdaf25c2bb325d8cede0a507933b719f9715b1508ccd1d8f52fccd36f13a7640553dc108 DIST usbredir-0.9.0.tar.bz2 72498 BLAKE2B 857b83795ac082d412b2872a4ca06b1602d556698f3217379698e8b1f54edd09b012600069045ff0f7583703253853998b900f34d861a538047783510b3fb2e9 SHA512 5df62fb6e49161be974776c86f026a58322ccf1c1964447958707408492c02175100ead9dc4a7e77bb7a9112a33b91461d64761425e7aee7d44c71ff6913588a -EBUILD usbredir-0.8.0.ebuild 923 BLAKE2B 580602ef4cf7f46fe0ab508c1c3a53262e0f2eeb7bb9e72dcfa53e48756daff7775c19f7e402bc6f536f8cf05ca75995b954c1f0f5d6b0423e4320fbf57e3cac SHA512 718d4916a441bf6a2a2d83988666e5217a1c310069444096011a02f63c3e0bd596045bcad908f216d2ae2471d4991d0f8122a608a9119c548584677c441d437a -EBUILD usbredir-0.9.0.ebuild 997 BLAKE2B c33a126d7aa4bffe010730c63f63385aa1859ac3098e5219641cee9681556354fcad1b19a5ebaa055d2a4f1bd08bda847ef3502998a211c4985abff8eb2394af SHA512 11c1373bf9ebf3df076688b65026552dfe9e0c4596b39b5aec0ae0a7b718628768c82eb8fed6b8cfecb16b88f74682e808d45d7ff301aba6756ebd37e7b81a42 +EBUILD usbredir-0.9.0.ebuild 991 BLAKE2B 576b457e9ca54b6aad846b1441179a67eb957a151b13874bfc9d7bd3a428ce1f6d1712d15f7d51f79d97d28fc135ab50ba9e7802e48298d073d1b3341951eb89 SHA512 5d6741e1816c4f039bff165ef027324315d91ada054ce745b4f6c6c74c4972f8e0ac82ebb164a5a5d05a9a606b7d6a970fbfc617c3b27ce2daeaa339ae224399 EBUILD usbredir-9999.ebuild 850 BLAKE2B b01f925aea22d8f2e288a5e4fd8a093409f7370d2b6399add5df799de1af24694dde48dc971579c108917860773bf715e419a806e7e3e5db7684d694182e4f06 SHA512 47a51143cd9587b0aa280792375fd8329b547d434245ee4cde3187f06750521c1d1e9cd2d2e3e56c3c1229fc9ee9a4ef15f45720b55f668332c04f3691eab25d MISC metadata.xml 381 BLAKE2B 63160ad268e74a23031e19d54e171504f751e2337e6dc059215942052518e09e945796ec6522828eee63fc872be396f9f47f85a8b1ad970904f764e7e5a222a7 SHA512 a4363c96453be6c53dff19c47739440d00f03b7994a2c993f9be0608f2a1b7a4ac8e9178a4784a74dd51b97cd0de37cf0aad209041f2b03c65864b2798f9684a diff --git a/sys-apps/usbredir/usbredir-0.8.0.ebuild b/sys-apps/usbredir/usbredir-0.8.0.ebuild deleted file mode 100644 index 66e49f807dfa..000000000000 --- a/sys-apps/usbredir/usbredir-0.8.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -MY_PV=${PV/_p*/} - -DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)" -HOMEPAGE="https://www.spice-space.org/usbredir.html" -SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" -IUSE="static-libs" - -RDEPEND="virtual/libusb:1" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${MY_PV}" - -DOCS="ChangeLog README* TODO *.txt" - -src_configure() { - # https://bugs.freedesktop.org/show_bug.cgi?id=54643 - append-cflags -Wno-error - - econf $(use_enable static-libs static) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - - # noinst_PROGRAMS - dobin usbredirtestclient/.libs/usbredirtestclient -} diff --git a/sys-apps/usbredir/usbredir-0.9.0.ebuild b/sys-apps/usbredir/usbredir-0.9.0.ebuild index 73cd0c9866b9..4cc485b74032 100644 --- a/sys-apps/usbredir/usbredir-0.9.0.ebuild +++ b/sys-apps/usbredir/usbredir-0.9.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/spice/${PN}/-/archive/${P}/${PN}-${P}.ta LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" IUSE="static-libs" RDEPEND="virtual/libusb:1" diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 20bb6546acf6..e14263468099 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,11 +1,8 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd -AUX util-linux-2.35.1-cleanup-pidfd-include.patch 1117 BLAKE2B a207824f36b2167f721b4420b5de47462cdc3f12187316ee0ba37bebd1561aee0c591a522cb9cf7f24986322e1954f1fab1e6fe1751dfebc116aec12f70cc81e SHA512 315b5aabad68d3363f1a06034c22347d755ead4b974fd7879ce41b29953b41be510705a4806577710bb8e9d32a8034002f6868fea287a214640c80324754ea00 -DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b DIST util-linux-2.37-rc2-manpages.tar.xz 160480 BLAKE2B 9d9ad7a74fe8bdd523fa5075c1031c43596c16e7db6bc04e3c8cf0447200ec9c24db9b973a1e47b3aada4ae48f3b82d16105fdc8f98373c1d6cc6aa82bcac454 SHA512 2dd6050dec6732231087cf83c6db6593ed47cc986be9e6b28d57cb3fa03eb31992fd0cb92bd6f0ab971dc33e633c3b27bf7f9d53dee20f011d5461a9af68e23c DIST util-linux-2.37-rc2.tar.xz 5437912 BLAKE2B 8fb6183537bc3a6d2831d2f91c7222518dd844e080b86e1f927f8418f7c075e3ae816d2bac2d8d493bf297f30f26a0deaaa0d37e1437f7caf625f92370606970 SHA512 9a7f301604c2ae914b8c33f17a22563ec0128e45d7687bf11142d190bb1f51adeff7f392efc27b87ac088c615097ccc270a886a5c912e363f4748b3ed6f5a6ef -EBUILD util-linux-2.35.2.ebuild 9014 BLAKE2B 549633172e6d1dfc1f1c993c2d095ddcae525a40964705263c0694ba4ce91ba1817b9b99d1a34d9bc2f08b3cc8075cd45a5eaea5db2ac3f7f9846e9585399f6b SHA512 19c24c1d5f60a3948614fc588df718de8208e08bd386a6d780921355ce906d41e32b62cf5bc669e032557958bd02357c75491a03abb8d0b0aa4c9c828d284d53 EBUILD util-linux-2.36.2.ebuild 8942 BLAKE2B e26af16681c038a8d2818bfef7565b106711639e0fee55868a056496180648c6ae390e66595af22c1ac4c444052355ccd1a46ef359624b56ee1f8b3205ac2584 SHA512 4f9165ea6a2397b0b9df2971a8547d03005a3e1333673245b4d9397f2b78632cbab23bc12ccd4392ad6b90f1971fca764240730fd315eb22bfcb495937e5dc44 EBUILD util-linux-2.37_rc2.ebuild 9754 BLAKE2B 3a0bd9c913eb52b123ab4e4cae17d5003948758a08615448f8450c0833844b0d2aa867f6c040850fa1f31dc91b6ba39f6ba87c47df1eab2f882380cb7be28ff3 SHA512 445c8b441aa14763ca3296c73ae6ad6896df54a4e6ffe6feeb754fb22574dc18ec3f7af1df66ec61612f38b501dcf7f7411e6a0a75a7afba8c1170152dc8498f EBUILD util-linux-9999.ebuild 9754 BLAKE2B 3a0bd9c913eb52b123ab4e4cae17d5003948758a08615448f8450c0833844b0d2aa867f6c040850fa1f31dc91b6ba39f6ba87c47df1eab2f882380cb7be28ff3 SHA512 445c8b441aa14763ca3296c73ae6ad6896df54a4e6ffe6feeb754fb22574dc18ec3f7af1df66ec61612f38b501dcf7f7411e6a0a75a7afba8c1170152dc8498f diff --git a/sys-apps/util-linux/files/util-linux-2.35.1-cleanup-pidfd-include.patch b/sys-apps/util-linux/files/util-linux-2.35.1-cleanup-pidfd-include.patch deleted file mode 100644 index 85e4d705735c..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.35.1-cleanup-pidfd-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Tue, 10 Mar 2020 11:43:16 +0100 -Subject: [PATCH] include: cleanup pidfd inckudes - -Signed-off-by: Karel Zak ---- - include/pidfd-utils.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h -index 0baedd2c9..4a6c3a604 100644 ---- a/include/pidfd-utils.h -+++ b/include/pidfd-utils.h -@@ -3,10 +3,10 @@ - - #if defined(__linux__) - # include --# if defined(SYS_pidfd_send_signal) -+# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) - # include - --# ifndef HAVE_PIDFD_OPEN -+# ifndef HAVE_PIDFD_SEND_SIGNAL - static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - unsigned int flags) - { -@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - } - # endif - --# ifndef HAVE_PIDFD_SEND_SIGNAL -+# ifndef HAVE_PIDFD_OPEN - static inline int pidfd_open(pid_t pid, unsigned int flags) - { - return syscall(SYS_pidfd_open, pid, flags); diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild deleted file mode 100644 index 1df44660f8fa..000000000000 --- a/sys-apps/util-linux/util-linux-2.35.2.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ - 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - SRC_URI="https://www.kernel.org/pub/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 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +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=" - virtual/libcrypt:= - audit? ( >=sys-process/audit-2.6:= ) - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib:= ) - cryptsetup? ( sys-fs/cryptsetup ) - hardlink? ( dev-libs/libpcre2:= ) - ncurses? ( - >=sys-libs/ncurses-5.2-r2:0=[unicode?] - magic? ( sys-apps/file:0= ) - ) - nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) - pam? ( sys-libs/pam ) - ppc? ( sys-libs/librtas ) - ppc64? ( sys-libs/librtas ) - 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:= )" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) -" -DEPEND=" - ${RDEPEND} - virtual/os-headers -" -RDEPEND+=" - hardlink? ( !app-arch/hardlink ) - logger? ( !>=app-admin/sysklogd-2.0[logger] ) - kill? ( - !sys-apps/coreutils[kill] - !sys-process/procps[kill] - ) - su? ( - !=sys-apps/shadow-4.7-r2[su] - ) - !net-wireless/rfkill - ! "${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=( - "${commonargs[@]}" - --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 - - # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 - export NCURSES6_CONFIG=false NCURSES5_CONFIG=false - export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false - - # configure args shared by python and non-python builds - local commonargs=( - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - ) - - local myeconfargs=( - "${commonargs[@]}" - --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 magic libmagic)" '--without-libmagic') - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(multilib_native_use_with audit) - $(tc-has-tls || echo --disable-tls) - $(use_enable nls) - $(use_enable unicode widechar) - $(use_enable static-libs static) - $(use_with ncurses tinfo) - $(use_with selinux) - ) - # 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 - --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 hardlink) - $(use_enable kill) - $(use_enable logger) - $(use_enable ncurses pg) - $(use_enable su) - $(use_enable tty-helpers mesg) - $(use_enable tty-helpers wall) - $(use_enable tty-helpers write) - $(use_with cryptsetup) - ) - 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() { - if multilib_is_native_abi && use python; then - python_foreach_impl python_install - fi - - # This needs to be called AFTER python_install call (#689190) - 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 -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die - - # 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 -} -- cgit v1.2.3