[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/, sys-process/atop/files/

[David Seifert]

commit:     c7e064ff8f5a8149a6a4567cf00c573cca957f71
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 22:10:39 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 13 22:10:39 2021 +0000
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 <soap <AT> 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..00000000000
--- 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_CHECK="~BSD_PROCESS_ACCT"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC PKG_CONFIG
-	sed -i 's: root : :' atop.cronsysv || die #191926
-	# prefixify
-	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
-}
-
-src_install() {
-	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
-	systemd_dounit "${FILESDIR}"/atopacct.service
-	dodoc atop.cronsysv AUTHOR README
-}

diff --git a/sys-process/atop/atop-2.4.0.ebuild b/sys-process/atop/atop-2.4.0.ebuild
deleted file mode 100644
index 8af7b18c2d7..00000000000
--- a/sys-process/atop/atop-2.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-
-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.4.0-build.patch
-
-	# taken from upstream.
-)
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~BSD_PROCESS_ACCT"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC PKG_CONFIG
-	sed -i 's: root : :' atop.cronsysv || die #191926
-	# prefixify
-	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
-}
-
-src_install() {
-	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
-	systemd_dounit "${FILESDIR}"/atopacct.service
-	dodoc atop.cronsysv AUTHOR README
-}

diff --git a/sys-process/atop/atop-2.5.0-r1.ebuild b/sys-process/atop/atop-2.5.0-r1.ebuild
deleted file mode 100644
index dde668f9ea5..00000000000
--- a/sys-process/atop/atop-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.0-build.patch
-	"${FILESDIR}"/${PN}-2.5.0-install_fix.patch
-
-	# taken from upstream.
-)
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~BSD_PROCESS_ACCT"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC PKG_CONFIG
-	sed -i 's: root : :' atop.cronsysv || die #191926
-	# prefixify
-	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
-}
-
-src_install() {
-	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
-	systemd_dounit "${FILESDIR}"/atopacct.service
-
-	dodoc atop.cronsysv AUTHOR README
-
-	exeinto /usr/share/${PN}
-	doexe ${PN}.daily
-
-	insinto /etc/default
-	newins ${PN}{.default,}
-
-	keepdir /var/log/${PN}
-}

diff --git a/sys-process/atop/files/atop-2.2-build.patch b/sys-process/atop/files/atop-2.2-build.patch
deleted file mode 100644
index 70840a25330..00000000000
--- a/sys-process/atop/files/atop-2.2-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- atop-2.2-3/Makefile
-+++ atop-2.2-3/Makefile
-@@ -19,7 +19,7 @@
- PMPATH2  = /usr/lib64/pm-utils/sleep.d
- PMPATHD  = /usr/lib/systemd/system-sleep
- 
--CFLAGS  += -O2 -I. -Wall  	 # -DHTTPSTATS
-+CFLAGS  += -I. -Wall  	 # -DHTTPSTATS
- OBJMOD0  = version.o
- OBJMOD1  = various.o  deviate.o   procdbase.o
- OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o
-@@ -32,13 +32,13 @@
- all: 		atop atopsar atopacctd
- 
- atop:		atop.o    $(ALLMODS) Makefile
--		$(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
-+		$(CC) $(CFLAGS) $(LDFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt
- 
- atopsar:	atop
- 		ln -sf atop atopsar
- 
- atopacctd:	atopacctd.o netlink.o
--		$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
-+		$(CC) $(CFLAGS) $(LDFLAGS) atopacctd.o netlink.o -o atopacctd
- 
- netlink.o:	netlink.c
- 		$(CC) -I. -Wall -c netlink.c

diff --git a/sys-process/atop/files/atop-2.2-sysmacros.patch b/sys-process/atop/files/atop-2.2-sysmacros.patch
deleted file mode 100644
index 87fd069c8fd..00000000000
--- a/sys-process/atop/files/atop-2.2-sysmacros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/580372
-
-include sys/sysmacros.h for major/minor prototypes
-
---- a/photosyst.c
-+++ b/photosyst.c
-@@ -164,6 +164,7 @@
- #include <signal.h>
- #include <string.h>
- #include <dirent.h>
-+#include <sys/sysmacros.h>
- 
- #include <sys/socket.h>
- #include <netinet/in.h>

diff --git a/sys-process/atop/files/atop-2.4.0-build.patch b/sys-process/atop/files/atop-2.4.0-build.patch
deleted file mode 100644
index 73fd4169129..00000000000
--- a/sys-process/atop/files/atop-2.4.0-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- atop-2.4.0/Makefile
-+++ atop-2.4.0/Makefile
-@@ -33,16 +33,16 @@
- 
- atop:		atop.o    $(ALLMODS) Makefile
- 		$(CC) -c version.c
--		$(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
-+		$(CC) $(CFLAGS) $(LDFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt
- 
- atopsar:	atop
- 		ln -sf atop atopsar
- 
- atopacctd:	atopacctd.o netlink.o
--		$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
-+		$(CC) $(CFLAGS) $(LDFLAGS) atopacctd.o netlink.o -o atopacctd
- 
- atopconvert:	atopconvert.o
--		$(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
-+		$(CC) $(CFLAGS) $(LDFLAGS) atopconvert.o -o atopconvert -lz
- 
- netlink.o:	netlink.c
- 		$(CC) -I. -Wall -c netlink.c

diff --git a/sys-process/atop/files/atop-2.5.0-install_fix.patch b/sys-process/atop/files/atop-2.5.0-install_fix.patch
deleted file mode 100644
index b46e88c76f3..00000000000
--- a/sys-process/atop/files/atop-2.5.0-install_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 485a453d2ae5700874a57dffc297030254b5ae7c Mon Sep 17 00:00:00 2001
-From: BlackEagle <ike.devolder@×××××.com>
-Date: Mon, 4 Nov 2019 09:00:54 +0100
-Subject: [PATCH] DEFPATH not created so touch fails
-
-```
-touch               /build/atop/pkg/atop/etc/default/atop
-touch: cannot touch '/build/atop/pkg/atop/etc/default/atop': No such file or directory
-```
-
-Add DEFPATH mkdir in genericinstall to make sure the folder
-`$(DESTDIR)/etc/default` exits
-
-Signed-off-by: BlackEagle <ike.devolder@×××××.com>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 929b0d7..a662fd6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -140,6 +140,8 @@ sysvinstall:	genericinstall
- genericinstall:	atop atopacctd atopconvert
- 		if [ ! -d $(DESTDIR)$(LOGPATH) ]; 		\
- 		then	mkdir -p $(DESTDIR)$(LOGPATH); fi
-+		if [ ! -d $(DESTDIR)$(DEFPATH) ]; 		\
-+		then	mkdir -p $(DESTDIR)$(DEFPATH); fi
- 		if [ ! -d $(DESTDIR)$(BINPATH) ]; 		\
- 		then	mkdir -p $(DESTDIR)$(BINPATH); fi
- 		if [ ! -d $(DESTDIR)$(SBINPATH) ]; 		\