From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- sys-process/Manifest.gz | Bin 9344 -> 9325 bytes sys-process/criu/Manifest | 2 +- sys-process/criu/criu-3.15.ebuild | 4 +- sys-process/evisum/Manifest | 4 +- sys-process/evisum/evisum-0.5.11.ebuild | 17 ------ sys-process/evisum/evisum-0.5.13.ebuild | 2 +- sys-process/glances/Manifest | 2 + sys-process/glances/glances-3.1.7.ebuild | 87 +++++++++++++++++++++++++++++++ sys-process/tini/Manifest | 4 +- sys-process/tini/tini-0.18.0.ebuild | 59 --------------------- sys-process/tini/tini-0.19.0-r1.ebuild | 66 +++++++++++++++++++++++ sys-process/tini/tini-0.19.0.ebuild | 59 --------------------- sys-process/tiptop/Manifest | 2 +- sys-process/tiptop/metadata.xml | 5 +- 14 files changed, 163 insertions(+), 150 deletions(-) delete mode 100644 sys-process/evisum/evisum-0.5.11.ebuild create mode 100644 sys-process/glances/glances-3.1.7.ebuild delete mode 100644 sys-process/tini/tini-0.18.0.ebuild create mode 100644 sys-process/tini/tini-0.19.0-r1.ebuild delete mode 100644 sys-process/tini/tini-0.19.0.ebuild (limited to 'sys-process') diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz index cfb4c53d4dd4..c4582f15ebb5 100644 Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest index 28b1edd5132a..f279378ac93e 100644 --- a/sys-process/criu/Manifest +++ b/sys-process/criu/Manifest @@ -4,5 +4,5 @@ AUX criu-3.12-automagic-libbsd.patch 457 BLAKE2B bd16c9e84ba67d0968371844c7b8121 DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6 DIST criu-3.15.tar.bz2 913904 BLAKE2B 2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159 SHA512 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc EBUILD criu-3.14-r2.ebuild 3202 BLAKE2B f95ff85b90cb00cf6bb2a7a6d17dc1c1a3614d202da7283cb6a862d1184acce02c7799abfdee11a67d1eed4938f0424da408b4ae7788a2311fb5e0b20ca2256a SHA512 d1f8f721abf6211cdb75fbda7b009aa96f8a0cca5a6e99d0633c4d8dd6398bff357fbfc679ba0b2836f20feb16470fc55c2abc937f5951bfd68d134d80c7494a -EBUILD criu-3.15.ebuild 3166 BLAKE2B f243f6027f6872bd0b596a6b898f07435f140735ab98afbc635a47e9f1349eec0871bb7dd9dc8ffcaf8cf6ebb2d1af989f534074e6c17694ab2dc68dbbeb89a7 SHA512 306b0bff0cee1595d6e49103e9fccfa3b66240e0a994907266e0d032d4fc273534deb6d2aeae8bd00d9cf4bb67ca28b2563f73965f8a521127e64a43c590a260 +EBUILD criu-3.15.ebuild 3165 BLAKE2B ce736eecb2da8559d25b3eb6650faf927abed62634a5128d3834a84dc653137b15f21dde2d01e4b5353e577f3bcd13631dd41e42f91aa38c93068ec8391f86db SHA512 812990fbaec554b2ab88a24709d6722eb45331255ed7c62f86b4bc2bd2ec360506491cb59d129ec15c605fad3296ec9614834e50dde2cfe2982ac84638f1c6a9 MISC metadata.xml 489 BLAKE2B b147e18ffae358f6ea0c3ca2cc8addaa039d77fc845092758a258943852daa0bc674f9f2a5a94ba7094d2e6c65a179271304e2b0b4a01f1cff6d4ac20696dce8 SHA512 aebc8636c880916beff94bb80e4a9fda5eef6ef935c9e0305bbcab038e26e69a5947640e05d74978a034ca5b36d5096e177d9485c036314eaada010f16f144d4 diff --git a/sys-process/criu/criu-3.15.ebuild b/sys-process/criu/criu-3.15.ebuild index bf1a3adc34c9..b9e42cf4fa53 100644 --- a/sys-process/criu/criu-3.15.ebuild +++ b/sys-process/criu/criu-3.15.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 @@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64" IUSE="doc selinux setproctitle static-libs" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest index 6d68801611d5..433af741b272 100644 --- a/sys-process/evisum/Manifest +++ b/sys-process/evisum/Manifest @@ -1,5 +1,3 @@ -DIST evisum-0.5.11.tar.xz 4363660 BLAKE2B 229acde8f8559bb6570236a511bf7685c5f47c33d39ae967fac693510bc1e164ddf1318a7c491f3bfc563f3ee51e541896480161e1e0e9e47742be0f9fa33a28 SHA512 d6d7c7d17ad231a68650e27718d578b698d48db0bbb796758fc6202b6928f02d1fe171570ebb46d527873d11cad221c568eabc2cdcdb3ebeca210c92f19d82ea DIST evisum-0.5.13.tar.xz 2056416 BLAKE2B 06347190bdf0831b9902ec683ec8bfaabf1c27e498e050e4eb2d51a1a73be62e987c3518c0196e76a717a95c7d7dfa451adc85d5f79dafa613960c08e35602c9 SHA512 7f0af18a9e7c1af6dcf74e2b975b16885aecd829af51af66332e9af5634a3c948158c606caafa1823a04af0191fe7f2b1f13e06af6c16c6b2f2f45832d0706b8 -EBUILD evisum-0.5.11.ebuild 433 BLAKE2B 9c197ea2f644647eaab47a78f54a10c2d4cc2b5012fb468c79780d2b1ffaee80d6592b97fdf29a86976edec01ecd3a004cb9f2d40ed8e23d1c09a76111ee0349 SHA512 b75523e2eca5b20e2261512acda9b23bda9f433a27669e198225755a93c92914076854b4349d63e575946eb853be71ac6df1736b12337f56bf74cde07fdc711b -EBUILD evisum-0.5.13.ebuild 467 BLAKE2B d659224c8b8fb8ba0a8f6dc32a135f6337ff70e5b91802c40dc7b5304c0a88249d03397be48e9cef471b7d06d3a9117a5b7670eed31e0ac60e29ddb39b7e4906 SHA512 0bb77fa5d5f22cc3670764cb52dad7339f7dd81d952b8b2dd1798d372e6ceea48e7000cc546e95ead467530ddcd282801d699064e52545f33610aa38aab99894 +EBUILD evisum-0.5.13.ebuild 465 BLAKE2B 6d82e5dee8e52a9572596b09a4be2e7a1a75c08dcdebe2888de37234898e9835d3676b50bb4ea0fd47c6e7b13cc26d8c1cb13d693cd029c3e173d77cf5ef5836 SHA512 b211f184a3861bbfed001fbc0b686df6af849de29a21065f5c334873d17e8ef43f773a1276a5d7a171d0d94b0116ace75321ed419b148ace31e0e325a958dcfa MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e diff --git a/sys-process/evisum/evisum-0.5.11.ebuild b/sys-process/evisum/evisum-0.5.11.ebuild deleted file mode 100644 index 4a7b1c25a1ec..000000000000 --- a/sys-process/evisum/evisum-0.5.11.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson xdg - -DESCRIPTION="System and process monitor written with EFL" -HOMEPAGE="https://www.enlightenment.org/" -SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz" - -LICENSE="GPL-2 ISC" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND="dev-libs/efl" -RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )" diff --git a/sys-process/evisum/evisum-0.5.13.ebuild b/sys-process/evisum/evisum-0.5.13.ebuild index 8377e0944e6f..a83ca9c22961 100644 --- a/sys-process/evisum/evisum-0.5.13.ebuild +++ b/sys-process/evisum/evisum-0.5.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz" LICENSE="GPL-2 ISC" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND="dev-libs/efl" RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )" diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest index 88b6f58cbd09..14372844e872 100644 --- a/sys-process/glances/Manifest +++ b/sys-process/glances/Manifest @@ -1,4 +1,6 @@ AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d198fcf9abffd15ad60f1c7c43f1e9a3103ebb5f2f743c83cc9d09cdf610c4e5d5caea89523f9ed37f3a4801e774 SHA512 02b06b01f8e3782da632677aa84b9131cb33dae3270677a1a4b0af3c139d100fa54c90c412d1e608e08859facb31e04768927e4862cfc4d9cfcbd061020a5dac DIST glances-3.1.6.2.tar.gz 6775046 BLAKE2B 3f65acbb69f8fc4323cbfbd30e79a0d30a9e38e9ff52ea0dc2286213daa66929e6abfccec34e94704fb87f6931f2a17fb30205c14da91f36b37617431bf58363 SHA512 2c62a82ebbc0d562d65f6e1ab39bac14a4b13d13e5fcbb1e98c119d6ea375387ef33b78cd911804504e3fdaa94260de27c211ed1132aae61f10fef8ff8a80fec +DIST glances-3.1.7.tar.gz 6804822 BLAKE2B 7ae78e126da0aa0bfd604836fc66761224a0eedac119b5e74e27e133a27912deff0c2323dfa0b76c49bd542d995a1f60cf688df1792e69d0401d1192dcff14f6 SHA512 b6ebf3b8d0bc60cf77c30fa8dc24c9ad851eab8415e6ae7f50454d96e7bb14866197599d9e5ea9623375f4dca0ca86f017957f2e6a1a9c8b761c6b499b6db82a EBUILD glances-3.1.6.2.ebuild 2687 BLAKE2B ca3ed19299ceba3335e62ada116093489a26367bfd6167a0128e17ce0b0356745cde6bd16c4ed763597f28bf00df12b74ad864a0cbb7124ac087ef540f0f635d SHA512 053e8cebcd8b57b5f17ea13f9245eaa4b3d7c97280ace37b1c58a75e74f9f8ed7099504d86350e4a5303b26159bc9b324abccab800b940c85807f85d4a4bd3f2 +EBUILD glances-3.1.7.ebuild 2692 BLAKE2B e2536844a80c71b611d001b4e9ad2251ca44c395973a4a5ac8adcbffee240142de0347853246831e47c29c85052f97603d7f26fc4d105f37b90755c7cbdefdad SHA512 848df2006873620e12a3422b08d84f8104a66770297ee7f13aa89b63fb76fbc983998b0f440e2ed18cb544a751188bf061017b4edb1511fac5bba682c457809d MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73 diff --git a/sys-process/glances/glances-3.1.7.ebuild b/sys-process/glances/glances-3.1.7.ebuild new file mode 100644 index 000000000000..6978c8ab74ca --- /dev/null +++ b/sys-process/glances/glances-3.1.7.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7,8,9} ) +PYTHON_REQ_USE="ncurses" +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 linux-info optfeature + +DESCRIPTION="CLI curses based monitoring tool" +HOMEPAGE="https://github.com/nicolargo/glances" +SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="dev-python/future[${PYTHON_USEDEP}] + >=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]" + +# PYTHON_USEDEP omitted on purpose +BDEPEND="doc? ( dev-python/sphinx_rtd_theme )" + +CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS" + +PATCHES=( + "${FILESDIR}/disable-update-check.patch" +) + +distutils_enable_tests setup.py +distutils_enable_sphinx docs --no-autodoc + +pkg_setup() { + linux-info_pkg_setup +} + +python_prepare_all() { + # Remove duplicate entries of a prebuilt doc build and + # ensure install of the file glances.conf in /etc/${PN} + sed \ + -e '/share\/doc\/glances/d' \ + -e "s/'CONTRIBUTING.md',//" \ + -e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \ + -i setup.py || die + sed -i "s/, 'irq']/]/" unitest.py || die + distutils-r1_python_prepare_all +} + +python_install_all() { + # add an intended file from original data set from setup.py to DOCS + local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf ) + distutils-r1_python_install_all +} + +pkg_postinst() { + #optfeature "Action script feature" dev-python/pystache + optfeature "Autodiscover mode" dev-python/zeroconf + optfeature "Cloud support" dev-python/requests + optfeature "Quicklook CPU info" dev-python/py-cpuinfo + optfeature "Docker monitoring support" dev-python/docker-py + #optfeature "Export module" \ + # unpackaged/bernhard \ + # unpackaged/cassandra-driver \ + # unpackaged/potsdb \ + # dev-python/couchdb-python \ + # dev-python/elasticsearch-py \ + # dev-python/influxdb \ + # dev-python/kafka-python \ + # dev-python/pika \ + # dev-python/paho-mqtt \ + # dev-python/prometheus_client \ + # dev-python/pyzmq \ + # dev-python/statsd + #optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3 + optfeature "SVG graph support" dev-python/pygal + optfeature "IP plugin" dev-python/netifaces + optfeature "RAID monitoring" dev-python/pymdstat + #optfeature "SMART support" unpackaged/pySMART.smartx + optfeature "RAID support" dev-python/pymdstat + optfeature "SNMP support" dev-python/pysnmp + #optfeature "sparklines plugin" unpackaged/sparklines + optfeature "Web server mode" dev-python/bottle dev-python/requests + optfeature "WIFI plugin" net-wireless/python-wifi +} diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest index 566a6d082538..57af54f01a87 100644 --- a/sys-process/tini/Manifest +++ b/sys-process/tini/Manifest @@ -1,5 +1,3 @@ -DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1 DIST tini-0.19.0.tar.gz 32369 BLAKE2B 5d86f6299b92152063974e6ecd347e1a2ba90f0188f2a702ddb6c814fc1c9723062481fe560caa89e9f74883017ee833566adf1eb1f11fe625671eced47f3296 SHA512 1fa85b56e2c6085ea474f251928e7a40510d92aeef60b3c145b0496969c1b5df86835d143cb91ef5b4bf4da63fa8a56947cc39a4276e4b72faa57276d432b292 -EBUILD tini-0.18.0.ebuild 1426 BLAKE2B 016e2475b6297cf6bf1cc2d6ff24f4a27fe456d41c6bdb8f76eda0e976ecb556e0b598d5c39225aa1f54e6e3533b3ebd182e9914ad9ca0164cbc2debd3e63472 SHA512 2bba6d17d43b7276d2372f20d2a975e6cb8749d572a4dc22f69975bb2930557fac35cf7d218377d638b1a63a3d8b7f89bdbe5123f0a13537b91a52b9a38cefbf -EBUILD tini-0.19.0.ebuild 1397 BLAKE2B 9497829168bbc95af1cbf6f9e1a587702388e2111de73b6d161b32a970e356578ccb14f6993e5dba27a01838f8b07a58c846887288ad1a72cd7e1e95887c5d41 SHA512 34f19202bdfdc5b031785845988b652c6c03508eef4d5be4eb5f93644066d4439c8e01dde421ffa8710f922c2cded00f8c303d2e5667969f5c7d005023047a11 +EBUILD tini-0.19.0-r1.ebuild 1628 BLAKE2B bc6b59ecfd8a47645666d1a5ec5c81c983862bf1de483db88e025fd999821d6756ae871519c26f7492d983b3969681efab2f24e73e9cc60a5ef90ab9302e65c1 SHA512 9c414f7de0bbf666a9880bdec0b402dc036d25e52d4ea9c45bcafed3d0e92911cdd50735d244089cd4d61b3e3c29a50a0fb814dd81fa529322933ec2d6bc4346 MISC metadata.xml 558 BLAKE2B 7fd719d731c968125776805299e964567907ca7cae8a94c717218fdf8caa73d6f333a8bb22c36e0bec273f48504a55f91081e09474abc90440b50bcd760f53aa SHA512 dfbadc5994b3c7b4d8a27fd207c9f1836a21633218dee0252f938448f3c14f3c41d1f35c0604aecbc9f14117b27cd995451800c61dd41875be3becffb53d33f3 diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild deleted file mode 100644 index d892a5882f55..000000000000 --- a/sys-process/tini/tini-0.18.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils flag-o-matic - -GIT_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662 -DESCRIPTION="A tiny but valid init for containers" -HOMEPAGE="https://github.com/krallin/tini" -SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" -IUSE="+args +static" - -src_prepare() { - cmake-utils_src_prepare - - local sed_args=( - # Do not strip binary - -e 's/-Wl,-s")$/")/' - - # Remove -Werror and -pedantic-errors in order to allow macro - # redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not - # trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2) - # in CMakeLists.txt (bug 626438). - -e "s/ -Werror / /" - -e "s/ -pedantic-errors / /" - ) - - sed -i "${sed_args[@]}" \ - -e "s/git.*status --porcelain.*/true/" \ - -e "s/git.*log -n 1.*/true/" \ - -e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \ - CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=() - use args || mycmakeargs+=(-DMINIMAL=ON) - - cmake-utils_src_configure -} - -src_compile() { - append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37 - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - if use static; then - mv "${ED}"/usr/bin/{${PN}-static,${PN}} || die - else - rm "${ED}"/usr/bin/${PN}-static || die - fi -} diff --git a/sys-process/tini/tini-0.19.0-r1.ebuild b/sys-process/tini/tini-0.19.0-r1.ebuild new file mode 100644 index 000000000000..fe80f91738db --- /dev/null +++ b/sys-process/tini/tini-0.19.0-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +# guard against forgetfulness, https://bugs.gentoo.org/795936 +GIT_COMMIT_0190="de40ad007797e0dcd8b7126f27bb87401d224240" +GIT_COMMIT="GIT_COMMIT_${PV//./}" +GIT_COMMIT="${!GIT_COMMIT}" + +DESCRIPTION="A tiny but valid init for containers" +HOMEPAGE="https://github.com/krallin/tini" +SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" +IUSE="+args +static" + +src_prepare() { + + [[ -z ${GIT_COMMIT} ]] && die "forgetful maintainer! please define GIT_COMMIT_${PV//./} on bump" + + cmake_src_prepare + + local sed_args=( + # Do not strip binary + -e 's/-Wl,-s")$/")/' + + # Remove -Werror and -pedantic-errors in order to allow macro + # redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not + # trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2) + # in CMakeLists.txt (bug 626438). + -e "s/ -Werror / /" + -e "s/ -pedantic-errors / /" + ) + + sed -i "${sed_args[@]}" \ + -e "s/git.*status --porcelain.*/true/" \ + -e "s/git.*log -n 1.*/true/" \ + -e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \ + CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=() + use args || mycmakeargs+=(-DMINIMAL=ON) + + cmake_src_configure +} + +src_compile() { + append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37 + cmake_src_compile +} + +src_install() { + cmake_src_install + if use static; then + mv "${ED}"/usr/bin/{${PN}-static,${PN}} || die + else + rm "${ED}"/usr/bin/${PN}-static || die + fi +} diff --git a/sys-process/tini/tini-0.19.0.ebuild b/sys-process/tini/tini-0.19.0.ebuild deleted file mode 100644 index 9dad0ff99226..000000000000 --- a/sys-process/tini/tini-0.19.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -GIT_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662 -DESCRIPTION="A tiny but valid init for containers" -HOMEPAGE="https://github.com/krallin/tini" -SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" -IUSE="+args +static" - -src_prepare() { - cmake_src_prepare - - local sed_args=( - # Do not strip binary - -e 's/-Wl,-s")$/")/' - - # Remove -Werror and -pedantic-errors in order to allow macro - # redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not - # trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2) - # in CMakeLists.txt (bug 626438). - -e "s/ -Werror / /" - -e "s/ -pedantic-errors / /" - ) - - sed -i "${sed_args[@]}" \ - -e "s/git.*status --porcelain.*/true/" \ - -e "s/git.*log -n 1.*/true/" \ - -e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \ - CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=() - use args || mycmakeargs+=(-DMINIMAL=ON) - - cmake_src_configure -} - -src_compile() { - append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37 - cmake_src_compile -} - -src_install() { - cmake_src_install - if use static; then - mv "${ED}"/usr/bin/{${PN}-static,${PN}} || die - else - rm "${ED}"/usr/bin/${PN}-static || die - fi -} diff --git a/sys-process/tiptop/Manifest b/sys-process/tiptop/Manifest index 1408402894e7..f8b707af4d40 100644 --- a/sys-process/tiptop/Manifest +++ b/sys-process/tiptop/Manifest @@ -1,4 +1,4 @@ AUX tiptop-2.3.1-tinfo.patch 428 BLAKE2B d055899343b616e8c487be4285c86659f4912cd817c58639c206af365981440c3c6daefebc086409bcbdf294b5db60d477a9994be29eda89245c10d4e0916dfa SHA512 c22e2129deb1f41531ac515a4ded03f8d2afd9c12eb6fbb132758c239d3107443b80ac1f8318dd273ec701afd7ef247e914d7fa3fcd5e908ef5951ae31d953c2 DIST tiptop-2.3.1.tar.gz 100993 BLAKE2B fd05d9d59fda2e81c194dedabb7d9d94220e790a8118048ebc3edd84706471a8892a918e02ebc7436c3c75e7a98c5c3ab98e11d614ced304ac81fdf8ce1951ed SHA512 73d275bc3957583524c872b401cf4fa773de7b4e7b7177f1787851f43e7c4aeefd953eb50b2dbce3babfc7a1c46707370ba4ad06998260177994b2eafb91395b EBUILD tiptop-2.3.1.ebuild 515 BLAKE2B bd5e691132e7408e8b9b77fb16128d8e9e9e2cbd645a7fb32f584202acdfdc24bac161f80b4cbccfd8ca1a9dbf05598c818b068acba45e9c6c51cf853021368f SHA512 35afa6523ab82b4c20f68596035fd199c883f5edb2442c828ca9be6dc1040afa782ab3dcf9857a302f64e82e48a24706f1cc2978c120eee686a84c6d6ab71e25 -MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1 +MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 diff --git a/sys-process/tiptop/metadata.xml b/sys-process/tiptop/metadata.xml index f3de5f693ed8..1b2becffa26c 100644 --- a/sys-process/tiptop/metadata.xml +++ b/sys-process/tiptop/metadata.xml @@ -1,8 +1,5 @@ - - patrick@gentoo.org - Patrick Lauer - + -- cgit v1.2.3