From 7076fa1abfb1ad28304e00d5166e00e998edc7c3 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 11 Nov 2015 15:38:10 -0500
Subject: sys-process/procps: Move non-essential binaries back to /usr/bin

Per the base-system lead, this is where they belong.

Bug: https://bugs.gentoo.org/565304

Package-Manager: portage-2.2.23_p26
---
 sys-process/procps/procps-3.3.11-r2.ebuild | 68 -----------------------------
 sys-process/procps/procps-3.3.11-r3.ebuild | 69 ++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 68 deletions(-)
 delete mode 100644 sys-process/procps/procps-3.3.11-r2.ebuild
 create mode 100644 sys-process/procps/procps-3.3.11-r3.ebuild

diff --git a/sys-process/procps/procps-3.3.11-r2.ebuild b/sys-process/procps/procps-3.3.11-r2.ebuild
deleted file mode 100644
index fa9d6fc5112b..000000000000
--- a/sys-process/procps/procps-3.3.11-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-#FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
-#SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz
-https://gitlab.com/procps-ng/procps/commit/b2f49b105d23c833d733bf7dfb99cb98e4cae383.patch -> ${PN}-3.3.11-remove_Unix98_output_limits.patch"
-
-LICENSE="GPL-2"
-SLOT="0/5" # libprocps.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode"
-
-RDEPEND="!<sys-apps/sysvinit-2.88-r6
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209 )"
-DEPEND="${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-	systemd? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-#src_unpack() {
-#	unpack ${A}
-#	mv ${WORKDIR}/${PN}-v${PV}-* ${WORKDIR}/${P} || die
-#}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
-	epatch "${DISTDIR}"/${P}-remove_Unix98_output_limits.patch # 555200
-}
-
-src_configure() {
-	econf \
-		--bindir="${EPREFIX}"/bin \
-		--sbindir="${EPREFIX}"/sbin \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_enable modern-top) \
-		$(use_with ncurses) \
-		$(use_enable nls) \
-		$(use_enable selinux libselinux) \
-		$(use_enable static-libs static) \
-		$(use_with systemd) \
-		$(use_enable unicode watch8bit)
-}
-
-src_test() {
-	emake check </dev/null #461302
-}
-
-src_install() {
-	default
-	#dodoc sysctl.conf
-
-	gen_usr_ldscript -a procps
-	prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.11-r3.ebuild b/sys-process/procps/procps-3.3.11-r3.ebuild
new file mode 100644
index 000000000000..5b6a3ac59437
--- /dev/null
+++ b/sys-process/procps/procps-3.3.11-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="standard informational utilities and process-handling tools"
+# http://packages.debian.org/sid/procps
+HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps"
+# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
+#FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
+#SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
+SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz
+https://gitlab.com/procps-ng/procps/commit/b2f49b105d23c833d733bf7dfb99cb98e4cae383.patch -> ${PN}-3.3.11-remove_Unix98_output_limits.patch"
+
+LICENSE="GPL-2"
+SLOT="0/5" # libprocps.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode"
+
+RDEPEND="!<sys-apps/sysvinit-2.88-r6
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209 )"
+DEPEND="${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )"
+
+S="${WORKDIR}/${PN}-ng-${PV}"
+
+#src_unpack() {
+#	unpack ${A}
+#	mv ${WORKDIR}/${PN}-v${PV}-* ${WORKDIR}/${P} || die
+#}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
+	epatch "${DISTDIR}"/${P}-remove_Unix98_output_limits.patch # 555200
+}
+
+src_configure() {
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		$(use_enable modern-top) \
+		$(use_with ncurses) \
+		$(use_enable nls) \
+		$(use_enable selinux libselinux) \
+		$(use_enable static-libs static) \
+		$(use_with systemd) \
+		$(use_enable unicode watch8bit)
+}
+
+src_test() {
+	emake check </dev/null #461302
+}
+
+src_install() {
+	default
+	#dodoc sysctl.conf
+
+	dodir /bin
+	mv "${ED}"/usr/bin/{ps,kill} "${ED}"/bin || die
+
+	gen_usr_ldscript -a procps
+	prune_libtool_files
+}
-- 
cgit v1.2.3-65-gdbad