From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06869138334 for ; Tue, 14 Aug 2018 13:04:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70797E07FE; Tue, 14 Aug 2018 13:04:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38951E07FE for ; Tue, 14 Aug 2018 13:04:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2762335CC0 for ; Tue, 14 Aug 2018 13:04:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B32E3AB for ; Tue, 14 Aug 2018 13:03:59 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1534251805.a239528ac551de73e621079dc90ff8a79fcbfd1b.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/psmisc/, sys-process/psmisc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/psmisc/Manifest sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch sys-process/psmisc/files/psmisc-22.21-sysmacros.patch sys-process/psmisc/psmisc-22.21-r3.ebuild sys-process/psmisc/psmisc-23.1.ebuild X-VCS-Directories: sys-process/psmisc/files/ sys-process/psmisc/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a239528ac551de73e621079dc90ff8a79fcbfd1b X-VCS-Branch: master Date: Tue, 14 Aug 2018 13:03:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fb1a3111-8954-4828-9b0f-8e3287e942f0 X-Archives-Hash: 2c21280c823c665bea4fbf367c243a1e commit: a239528ac551de73e621079dc90ff8a79fcbfd1b Author: Lars Wendler gentoo org> AuthorDate: Tue Aug 14 13:03:25 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Aug 14 13:03:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a239528a sys-process/psmisc: Removed old. Package-Manager: Portage-2.3.46, Repoman-2.3.10 sys-process/psmisc/Manifest | 1 - .../psmisc/files/psmisc-22.21-fuser_typo_fix.patch | 44 ---------------- .../psmisc/files/psmisc-22.21-sysmacros.patch | 26 ---------- sys-process/psmisc/psmisc-22.21-r3.ebuild | 60 ---------------------- sys-process/psmisc/psmisc-23.1.ebuild | 53 ------------------- 5 files changed, 184 deletions(-) diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest index bfd07c5e614..3e422d1ce55 100644 --- a/sys-process/psmisc/Manifest +++ b/sys-process/psmisc/Manifest @@ -1,3 +1,2 @@ -DIST psmisc-22.21.tar.gz 457702 BLAKE2B 7e81b695546c3dca6e1ade47bd1cd736ad434eb964608ead3e7d5a3b97f6d3d6c927e8e13ee525e716b66067e5a1573c4f0b8434540b9c66aac6e6b8f15bcfde SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95 DIST psmisc-23.2.tar.xz 298784 BLAKE2B 61d1ad385f176cbe3ca0edcdd41ed026ab52aca4190c31551392cf83d0bf293de22899b13238d7ebeb1627013a2dc734ca91ad7a0a313c9d92b7af662728bf21 SHA512 114dc4d9a4d66374ee75cd6c845230c24540aa1d7562253c6fd5695552698afcf3e2ad2d7e9675addc63201f7e6d9e697287c72a638705194155bec508211dc3 diff --git a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch deleted file mode 100644 index 5c5fd990f9c..00000000000 --- a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 -From: Brad Jorsch -Date: Fri, 28 Feb 2014 21:55:02 +1100 -Subject: [PATCH] Typo in fuser makes -M on all the time - -Brad found that fuser had the -M option on all the time. -A simple but significant typo caused this, thanks the the patch. - -Bug-Debian: http://bugs.debian.org/740275 - -Signed-off-by: Craig Small ---- - ChangeLog | 4 ++++ - src/fuser.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index fd1cccf..e5f784c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+Changes in 22.22 -+================ -+ * Fixed typo in fuser which has -M on Debian #740275 -+ - Changes in 22.21 - ================ - * Missing comma in fuser(1) added Debian #702391 -diff --git a/src/fuser.c b/src/fuser.c -index b485f65..389b302 100644 ---- a/src/fuser.c -+++ b/src/fuser.c -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) - usage(_("No process specification given")); - - /* Check if -M flag was used and if so check mounts */ -- if (opts * OPT_ISMOUNTPOINT) { -+ if (opts & OPT_ISMOUNTPOINT) { - check_mountpoints(&mounts, &names_head, &names_tail); - } - --- -2.2.2 - diff --git a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch deleted file mode 100644 index 440c5e62e7e..00000000000 --- a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 367886e1c49238d1a02721f849564d77a163465b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 7 Mar 2016 14:52:22 -0500 -Subject: [PATCH] fuser: include sysmacros.h for makedev - -BSD/Linux define makedev in the sysmacros.h header. Include it directly -instead of relying on types.h pulling it in for us. ---- - src/fuser.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/fuser.c b/src/fuser.c -index da94d22..380046f 100644 ---- a/src/fuser.c -+++ b/src/fuser.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.6.2 - diff --git a/sys-process/psmisc/psmisc-22.21-r3.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild deleted file mode 100644 index 1414df7d9b4..00000000000 --- a/sys-process/psmisc/psmisc-22.21-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="A set of tools that use the proc filesystem" -HOMEPAGE="http://psmisc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="ipv6 nls selinux X" - -RDEPEND=">=sys-libs/ncurses-5.7-r7:0= - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - nls? ( sys-devel/gettext )" - -DOCS="AUTHORS ChangeLog NEWS README" - -PATCHES=( - "${FILESDIR}/${P}-fuser_typo_fix.patch" - "${FILESDIR}/${P}-sysmacros.patch" -) - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_configure() { - econf \ - $(use_enable selinux) \ - --disable-harden-flags \ - $(use_enable ipv6) \ - $(use_enable nls) -} - -src_compile() { - # peekfd is a fragile crap hack #330631 - nonfatal emake -C src peekfd || touch src/peekfd{.o,} - emake -} - -src_install() { - default - - use X || rm -f "${ED}"/usr/bin/pstree.x11 - - [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd - [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1 - - # fuser is needed by init.d scripts; use * wildcard for #458250 - dodir /bin - mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die -} diff --git a/sys-process/psmisc/psmisc-23.1.ebuild b/sys-process/psmisc/psmisc-23.1.ebuild deleted file mode 100644 index e25d09501c9..00000000000 --- a/sys-process/psmisc/psmisc-23.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="A set of tools that use the proc filesystem" -HOMEPAGE="http://psmisc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="ipv6 nls selinux X" - -RDEPEND=">=sys-libs/ncurses-5.7-r7:0= - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_configure() { - local myeconfargs=( - $(use_enable selinux) - --disable-harden-flags - $(use_enable ipv6) - $(use_enable nls) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # peekfd is a fragile crap hack #330631 - nonfatal emake -C src peekfd || touch src/peekfd{.o,} - emake -} - -src_install() { - default - - use X || rm -f "${ED}"/usr/bin/pstree.x11 - - [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd - [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1 - - # fuser is needed by init.d scripts; use * wildcard for #458250 - dodir /bin - mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die -}