[gentoo-commits] repo/gentoo:master commit in: app-admin/paxtest/, app-admin/paxtest/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/paxtest/, app-admin/paxtest/files/

[Anthony G. Basile]

commit:     2cfe92ed72533d1ada082ef8d3541b491c87af72
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Apr 20 16:28:22 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 21 11:15:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cfe92ed

app-admin/paxtest: epatch->PATCHES=()

Also dropped unneeded eutils and multilib eclasses.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch |  5 ++---
 app-admin/paxtest/paxtest-0.9.15-r1.ebuild            | 13 ++++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
index 1f8a99a689b..4dd4831eb45 100644
--- a/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
+++ b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
@@ -1,6 +1,5 @@
-diff -Naur paxtest-0.9.13.orig/Makefile paxtest-0.9.13/Makefile
---- paxtest-0.9.13.orig/Makefile	2014-12-09 19:53:48.000000000 -0500
-+++ paxtest-0.9.13/Makefile	2014-12-12 13:07:55.715099100 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -52,12 +52,14 @@
  endif
  

diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
index ed402aa9eaf..4fe8a445c27 100644
--- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="PaX regression test suite"
 HOMEPAGE="https://pax.grsecurity.net"
@@ -21,12 +21,15 @@ DEPEND="${RDEPEND}
 # EI_PAX flags are not strip safe.
 RESTRICT="strip"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+)
+
 src_prepare() {
 	mv Makefile.psm Makefile
-	epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+	default
 	sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
 	sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
-	eapply_user
 }
 
 src_compile() {