[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/, sys-process/atop/files/
commit: 64c0eea4331717f129cfb1f4d333b56e9c24de4b Author: Sam James gentoo org> AuthorDate: Sun Aug 11 21:12:13 2024 + Commit: Sam James gentoo org> CommitDate: Sun Aug 11 21:14:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c0eea4 sys-process/atop: add 2.11.0 Closes: https://bugs.gentoo.org/931632 Signed-off-by: Sam James gentoo.org> sys-process/atop/Manifest | 2 + sys-process/atop/atop-2.11.0.ebuild| 117 + sys-process/atop/files/atop-2.11.0-build.patch | 35 ++ .../atop/files/atop-2.11.0-respect-opt.patch | 11 ++ 4 files changed, 165 insertions(+) diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index abd98674fa7a..5df7b243b145 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -1,3 +1,5 @@ DIST atop-2.10.0.tar.gz 296569 BLAKE2B 8c6e56978cb32e4e80c7344f631d6fd3dd034ff785e6b2db1b80556aaea30a0feeb413704128150ba0d7b1b4eaeb6cb5699a1b2661060ac53c10f7025997418e SHA512 22e39799aa7c090c68d8ac2f02646fb9586122bdb83de9d90bc3119bd290c557faa0489cdc8640fc4fd1f1155c231b1d70dae1b22dc6102ba0327fdd4b5f7029 +DIST atop-2.11.0.tar.gz 322301 BLAKE2B 0084f1c02e835abd69c4810c0ef020d40bd8738064f8b9ae3cb1f24c460507571b87ddf47f12a0b2eefa86f9d0dcce02be8829e157dcc289deaac6d9cd3c7cda SHA512 5cf176e83232a54b69628b165172ed43f7bdfb62c7744ee781da8a262f3e4d70a829dc175320b5042a794a8d31318672477ba870feaaf3e9aa85fd4d6f485356 DIST atop-2.9.0.tar.gz 282412 BLAKE2B 8531eee3bffabfb3cacdb6bea4c4a1b7ea56da878154a86edd80fb20ddffc5f56248d06c679bd8933c203a0174e97515cfce633a2387bf465399d4203ca857c2 SHA512 f055466c076491a54fc45a482209fd3de60013e7b76af46b65dffe82d220fbd96eb11d5f199aa27e2f7a8754fe3c6509c44bf0dbd6e3099d8f5710944e01cb38 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61fe6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68 +DIST netatop-3.2.2.tar.gz 23977 BLAKE2B cf360071e56593251df4249d2c7ec8a1c823c71a4d96e5b7f5d02ab0dc8388eb22d34c4120924c5a5ecc9b4d610a14785e5002bc3b888aa4c66d8c73454a0900 SHA512 59ff6daf56f73578cfc7b48085747d3f2917589203196396dde6036c33da0dbce4b67b58c141545a785beb31ebeb35936d96bb6ff3b6071e95315a32e20d6093 diff --git a/sys-process/atop/atop-2.11.0.ebuild b/sys-process/atop/atop-2.11.0.ebuild new file mode 100644 index ..547074271ffe --- /dev/null +++ b/sys-process/atop/atop-2.11.0.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Check on bumps of atop +# https://www.atoptool.nl/downloadnetatop.php +NETATOP_VER=3.2.2 + +# Controls 'netatop' kernel module +MODULES_OPTIONAL_IUSE="modules" +NETATOP_P=netatop-${NETATOP_VER} +NETATOP_S="${WORKDIR}"/${NETATOP_P} + +inherit linux-mod-r1 systemd toolchain-funcs + +DESCRIPTION="Resource-specific view of processes" +HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"; +SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )" + +# Module is GPL-2 as well +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + dev-libs/glib + sys-libs/ncurses:= + sys-libs/zlib + >=sys-process/acct-6.6.4-r1 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.0-build.patch + "${FILESDIR}"/${PN}-2.11.0-respect-opt.patch +) + +pkg_pretend() { + if use kernel_linux ; then + CONFIG_CHECK="~BSD_PROCESS_ACCT" + check_extra_config + fi +} + +src_prepare() { + default + + if use modules ; then + cd "${WORKDIR}"/${NETATOP_P} || die + + sed \ + -e "s#\`uname -r\`#${KV_FULL}#g" \ + -e "s#\$(shell uname -r)#${KV_FULL}#g" \ + -i Makefile || die + + grep -rq "uname -r" && die "found uname calls" + + cd "${S}" || die + fi + + tc-export CC PKG_CONFIG + + # bug #191926 + sed -i 's: root : :' atop.cronsysv || die + + # Prefixify + sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die +} + +src_compile() { + default + + local modlist=( "netatop=:../${NETATOP_P}::netatop.ko" ) + linux-mod-r1_src_compile + + if use modules ; then + # Don't let the Makefile try to build the module for us + emake -C "${NETATOP_S}" netatopd + fi +} + +src_install() { + linux-mod-r1_src_install + + if use modules ; then + dosbin "${NETATOP_S}"/netatopd + doma
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/, sys-process/atop/files/
commit: 15e061e8643f68741540b6020777898f9df2d7cb Author: Sam James gentoo org> AuthorDate: Mon Dec 20 02:30:30 2021 + Commit: Sam James gentoo org> CommitDate: Mon Dec 20 04:08:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e061e8 sys-process/atop: add 2.7.0 Closes: https://bugs.gentoo.org/612248 Closes: https://bugs.gentoo.org/736406 Closes: https://bugs.gentoo.org/777903 Closes: https://bugs.gentoo.org/829356 Signed-off-by: Sam James gentoo.org> sys-process/atop/Manifest | 2 + sys-process/atop/atop-2.7.0.ebuild | 111 + .../atop/files/atop-2.7.0-netatop-makefile.patch | 42 sys-process/atop/files/atop.service-r1 | 11 ++ sys-process/atop/files/netatop.rc | 17 sys-process/atop/metadata.xml | 11 +- 6 files changed, 190 insertions(+), 4 deletions(-) diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index 3dabab96bcbd..7b90e6f3cbd5 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -1 +1,3 @@ DIST atop-2.6.0.tar.gz 242323 BLAKE2B 8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24 SHA512 46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58 +DIST atop-2.7.0.tar.gz 248294 BLAKE2B 94587d1ea07fcbbc8b267b96d0e7aa89b04cef9b39ccae0057bfb6163b15b8fdf3ddc9edb377bf40f48f60b4dd29feaf64201b1fd8c396dfb34c610772bc629c SHA512 2b3a1fbbd01728228df9ab1b6a99458fa0f962cc945b198a79298152ff115f6131fdb86fc806fc647a28d86e6e1a56375ca9d4dc530e082a122cf6ffba3dac7b +DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61fe6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68 diff --git a/sys-process/atop/atop-2.7.0.ebuild b/sys-process/atop/atop-2.7.0.ebuild new file mode 100644 index ..100ab24274da --- /dev/null +++ b/sys-process/atop/atop-2.7.0.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Check on bumps of atop +# https://www.atoptool.nl/downloadnetatop.php +NETATOP_VER=3.1 + +# Controls 'netatop' kernel module +MODULES_OPTIONAL_USE="modules" +NETATOP_P=net${PN}-${NETATOP_VER} +NETATOP_S="${WORKDIR}"/${NETATOP_P} + +inherit linux-info linux-mod systemd toolchain-funcs + +DESCRIPTION="Resource-specific view of processes" +HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"; +SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )" + +# Module is GPL-2 as well +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="sys-libs/ncurses:0= + >=sys-process/acct-6.6.4-r1 + modules? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.0-build.patch +) + +pkg_pretend() { + if use kernel_linux ; then + CONFIG_CHECK="~BSD_PROCESS_ACCT" + check_extra_config + fi +} + +src_prepare() { + default + + ( + cd "${WORKDIR}"/${NETATOP_P} || die + eapply -p1 "${FILESDIR}"/${PN}-2.7.0-netatop-makefile.patch + ) + + tc-export CC PKG_CONFIG + + # bug #191926 + sed -i 's: root : :' atop.cronsysv || die + + # prefixify + sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die +} + +src_configure() { + default + + BUILD_TARGETS="netatop.ko" + MODULE_NAMES="netatop(:${NETATOP_S}/module)" +} + +src_compile() { + default + + linux-mod_src_compile +} + +src_install() { + linux-mod_src_install + + if use modules ; then + # netatop's Makefile tries to build the kernel module for us + # so let's just replicate parts of it here. + emake -C "${NETATOP_S}"/daemon all + + dosbin "${NETATOP_S}"/daemon/netatopd + doman "${NETATOP_S}"/man/* + + systemd_dounit "${NETATOP_S}"/netatop.service + + # TODO: openrc init script + #install -T -m 0755 netatop.init /etc/init.d/netatop + fi + + emake DESTDIR="${D}" genericinstall + + # useless -${PV} copies ? + rm "${ED}"/usr/bin/atop*-${PV} || die + + newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN} + newinitd "${FILESDIR}"/atopacct.rc atopacct + + systemd_dounit "${FILESDIR}"/${PN}.service-r1 + systemd_dounit "${FILESDIR}"/atopacct.service + + dodoc atop.cr
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/, sys-process/atop/files/
commit: c7e064ff8f5a8149a6a4567cf00c573cca957f71 Author: David Seifert gentoo org> AuthorDate: Thu May 13 22:10:39 2021 + Commit: David Seifert gentoo org> CommitDate: Thu May 13 22:10:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e064ff sys-process/atop: Remove old 2.3.0-r1, 2.4.0, 2.5.0-r1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> sys-process/atop/Manifest | 6 -- sys-process/atop/atop-2.3.0-r1.ebuild | 64 --- sys-process/atop/atop-2.4.0.ebuild | 56 - sys-process/atop/atop-2.5.0-r1.ebuild | 71 -- sys-process/atop/files/atop-2.2-build.patch| 27 sys-process/atop/files/atop-2.2-sysmacros.patch| 14 - sys-process/atop/files/atop-2.4.0-build.patch | 22 --- .../atop/files/atop-2.5.0-install_fix.patch| 31 -- 8 files changed, 291 deletions(-) diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index 12f173f52a4..3dabab96bcb 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -1,7 +1 @@ -DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B ac663d50c4474d28bbc1c6b70a2f439ccf7f6e0d8c759e6240736fc44bea788fc76eea18769422bf391079945515a12615bae3139ca758d03b4687653a1d5cd1 SHA512 9b84adf3e740eca5e42199bb3e9e65e08ffb07f60e7c02d04b73cfe4b63a4f563991a797def5826ba10a32c78d2363ebe9b4e41d12cf9e7118e3eb82d259c31b -DIST atop-2.3.0-version_c.patch 1537 BLAKE2B eda9f0aa427e39ef12aa1584e6277de00577dff81a85085b8b12478a7631cb1739196a91feb684c2b9bdc0bd879493d1bb3a5dca8062da650cda78ae7744e934 SHA512 48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373 -DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542 SHA512 79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d -DIST atop-2.3.0.tar.gz 190560 BLAKE2B 4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621 -DIST atop-2.4.0.tar.gz 230066 BLAKE2B 75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957 SHA512 8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d -DIST atop-2.5.0.tar.gz 233835 BLAKE2B e40ae26cb1f8ddecbf6ea8f8f83d09bf9d62003a54e0679d5eefdf7c6fdaaff1940ba5f097fc1fc181ddb6aedcb8e1482feeb451cce5905b98c929c786db147d SHA512 8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489 DIST atop-2.6.0.tar.gz 242323 BLAKE2B 8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24 SHA512 46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58 diff --git a/sys-process/atop/atop-2.3.0-r1.ebuild b/sys-process/atop/atop-2.3.0-r1.ebuild deleted file mode 100644 index e18dd9782b7..000 --- a/sys-process/atop/atop-2.3.0-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info systemd toolchain-funcs - -DESCRIPTION="Resource-specific view of processes" -HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"; -SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -# Tarballs lacks version.{c,h} files -SRC_URI+=" https://github.com/Atoptool/atop/commit/42e86fcc42ce60f8c92f3c7d5f3a6ccde47c0b33.patch -> ${PN}-2.3.0-version_h.patch" -SRC_URI+=" https://github.com/Atoptool/atop/commit/a8d850d06efc8d70a19f55ec93fe83df51e99077.patch -> ${PN}-2.3.0-version_c.patch" -SRC_URI+=" https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd672631b6033c36c1.patch -> ${PN}-2.3.0-netatop_h.patch" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - sys-libs/ncurses:0= - >=sys-process/acct-6.6.4-r1 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2-build.patch - "${FILESDIR}"/${PN}-2.2-sysmacros.patch #580372 - - # taken from upstream. - "${DISTDIR}"/${P}-version_{h,c}.patch - "${DISTDIR}"/${P}-netatop_h.patch -) - -pkg_pretend() { - if use kernel_linux ; then - CONFIG_CHE
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/, sys-process/atop/files/
commit: 5f4cc9042d99ad8a432343ee8e7f20ddfde397a8 Author: Lars Wendler gentoo org> AuthorDate: Wed Aug 2 12:56:21 2017 + Commit: Lars Wendler gentoo org> CommitDate: Wed Aug 2 12:56:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4cc904 sys-process/atop: Removed old. Package-Manager: Portage-2.3.6, Repoman-2.3.3 sys-process/atop/Manifest | 2 -- sys-process/atop/atop-2.0.2.ebuild| 47 --- sys-process/atop/atop-2.1.ebuild | 47 --- sys-process/atop/files/atop-2.0.2-build.patch | 20 sys-process/atop/files/atop-2.1-build.patch | 36 5 files changed, 152 deletions(-) diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index 6503a777da6..32d3e9cd8a2 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -1,6 +1,4 @@ DIST atop-1.27-3.tar.gz 159521 SHA256 bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce3558844f96d41b0bba563f SHA512 59100b61ff14ff49d8daf815abdbf5e9f905767fe8532b0043f3a63acc4d37975201879a93634f6e77edd307e8b6e7d0bf1a3caff1a3cdce8240e92e46023003 WHIRLPOOL 51ceae010e8cd9172d55ab970fcfe90db1ac6d831db14ece17598dba8395c2f8a7e840513e4d07f5f7ad12e28cfc956a8d04619d4e73d7009a6c5a52a62be7d2 -DIST atop-2.0.2.tar.gz 166887 SHA256 a620dbe0de7c7ee004949b201bed27559a8dd6cbdee651c7a3e15fc584723409 SHA512 c02b1c2ebf5c49fb0ad17bbcf0b86af8e5623c8d0b6ba8b1096d9b592cbb358e011933142cdebc90f619221785e859aaa009a338f3682d8bfa4340a50b308471 WHIRLPOOL 1f650210c7f0d79545ad268d5482f950d080aaff51a6045fa710ffc4c359f786cf27ebf88a1dfca87a402b63f8ea9dc7d0542e1949096744a30ca3620708e575 -DIST atop-2.1-1.tar.gz 181301 SHA256 39a2d4febc338dd4147904b1496d1aa9513da0d22ad0602b66023452bdc7989f SHA512 89b33c9a299213faa42c8ee4393c9588c0dbe7940f8709a617d51d6202525a7e7385299242c8c032d573dea9fa631e705d8edfb4685414d35169b773e1290613 WHIRLPOOL 9f02afd797d25a28e873c25f6f03a2607628d60a7ef493b034a63707bc4b5fcd7d4d2d2f2c18b69312f19c5104639176e4816ebfd7282d53dd819786e45280d5 DIST atop-2.2-3.tar.gz 194168 SHA256 c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d SHA512 34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915 WHIRLPOOL 2798ebaf5affc9d929a0b5663c1caa6d64a52e00d20f496373f34e48c592fe168c8c20c9df3c309a3057f9eb7baa3409f2cbfbedf110adb9fef51d0774d8d3e2 DIST atop-2.3.0-netatop_h.patch 3279 SHA256 e7d39b71c3eb6b94e358358267caca063a6e1c9e00dacdeaab1cfc9ca3ceff2e SHA512 9b84adf3e740eca5e42199bb3e9e65e08ffb07f60e7c02d04b73cfe4b63a4f563991a797def5826ba10a32c78d2363ebe9b4e41d12cf9e7118e3eb82d259c31b WHIRLPOOL 8246ba30bb4268b7b3df25d8d8727c145d6aa8889f93ef0b0a3e07a63122eb25c31552e970ac92c3a3c3bf12b1b57e9d698cd50aa07ff8f8f5d8851131866e18 DIST atop-2.3.0-version_c.patch 1537 SHA256 ea8620eee1557ddd932edcca0d696be4549d7b7b2c9417ff263d822155cb8d0a SHA512 48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373 WHIRLPOOL 3c8bbbce2a7fc947a7f4eddfe7160d35a5d765d3f0a4680098d157d7c4030881cde6fe236ef321a17294db1a21e0a8c5b992b030b8514ef921eaaccb5a3c115d diff --git a/sys-process/atop/atop-2.0.2.ebuild b/sys-process/atop/atop-2.0.2.ebuild deleted file mode 100644 index 4fd24bced18..000 --- a/sys-process/atop/atop-2.0.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils toolchain-funcs - -MY_PV=${PV//_p/-} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Resource-specific view of processes" -HOMEPAGE="http://www.atoptool.nl/"; -SRC_URI="http://www.atoptool.nl/download/${MY_P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - sys-libs/ncurses - sys-process/acct -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.2-build.patch - tc-export CC PKG_CONFIG - cp "${FILESDIR}"/atop.rc atop.init - chmod a+rx atop.init - sed -i 's: root : :' atop.cron #191926 - # prefixify - sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile -} - -src_install() { - default - # useless -${PV} copies ? - rm -f "${ED}"/usr/bin/atop*-${PV} - dodoc "${ED}"/etc/cron.d/* - rm -r "${ED}"/etc/cron.d || die -} diff --git a/sys-process/atop/atop-2.1.ebuild b/sys-process/atop/atop-2.1.ebuild deleted file mode 100644 index 431bb5da804..000 --- a/sys-process/atop/atop-2.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils toolchain-funcs - -MY_PV=${PV//_p/-} -MY_P=${PN}-${MY_PV} - -DESCRIPTI
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/, sys-process/atop/files/
commit: dd07e099f643312f25241cdf3bf982b103cb9545 Author: Mike Frysinger gentoo org> AuthorDate: Tue Apr 19 22:33:35 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Apr 19 22:33:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd07e099 sys-process/atop: fix build w/newer glibc #580372 sys-process/atop/atop-2.2.ebuild| 1 + sys-process/atop/files/atop-2.2-sysmacros.patch | 14 ++ 2 files changed, 15 insertions(+) diff --git a/sys-process/atop/atop-2.2.ebuild b/sys-process/atop/atop-2.2.ebuild index 7283c20..7b4ccf2 100644 --- a/sys-process/atop/atop-2.2.ebuild +++ b/sys-process/atop/atop-2.2.ebuild @@ -31,6 +31,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch "${FILESDIR}"/${PN}-2.2-build.patch + epatch "${FILESDIR}"/${PN}-2.2-sysmacros.patch #580372 tc-export CC PKG_CONFIG sed -i 's: root : :' atop.cronsysv || die #191926 # prefixify diff --git a/sys-process/atop/files/atop-2.2-sysmacros.patch b/sys-process/atop/files/atop-2.2-sysmacros.patch new file mode 100644 index 000..87fd069 --- /dev/null +++ b/sys-process/atop/files/atop-2.2-sysmacros.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/580372 + +include sys/sysmacros.h for major/minor prototypes + +--- a/photosyst.c b/photosyst.c +@@ -164,6 +164,7 @@ + #include + #include + #include ++#include + + #include + #include