commit:     eaa5f387810f96802d4f83e80575b404d04eb9d8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 15:07:14 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 15:07:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa5f387

app-admin/paxtest: remove get_libdir in global scope, bug #593384

Package-Manager: portage-2.2.28

 app-admin/paxtest/Manifest                 |  1 -
 app-admin/paxtest/paxtest-0.9.14.ebuild    | 80 ------------------------------
 app-admin/paxtest/paxtest-0.9.15-r1.ebuild | 42 ++++++++++++++++
 app-admin/paxtest/paxtest-0.9.15.ebuild    | 80 ------------------------------
 4 files changed, 42 insertions(+), 161 deletions(-)

diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 2a54169..c53804f 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,2 +1 @@
-DIST paxtest-0.9.14.tar.gz 34286 SHA256 
7dead81fcdc8db2f88e3da1027e6d7c93596f2e6e4dac25ec9b54c41fa808048 SHA512 
6e2d642e1dfe7e3381ed520956d2f5b19ad8c8e569c4ddcf43a2772a76ed67701bb18fe55d7fe2b82ff50644f92470622243ac974083d87448f560f6d48d8727
 WHIRLPOOL 
bef2998611b0487590364648b8f5d4ddc470b212c2a8b0282f4220b1da8033f23299298b51dc932c35f37099f7076a99220726b30d91472ca266042f16c4ed02
 DIST paxtest-0.9.15.tar.gz 37929 SHA256 
d553848431fd8c2ab6c8361b62e5cedfed1cc1d60088241f4a33d2af15dd667f SHA512 
e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487
 WHIRLPOOL 
db58265b8140209bb253f05de912bcd4017c06bd99e6b8247f052b93081f98b88b04030b4539993a9f180969722e9d4958f929bd8a0395a027ff4e7a25b48f26

diff --git a/app-admin/paxtest/paxtest-0.9.14.ebuild 
b/app-admin/paxtest/paxtest-0.9.14.ebuild
deleted file mode 100644
index 10fbe28..00000000
--- a/app-admin/paxtest/paxtest-0.9.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="PaX regression test suite"
-HOMEPAGE="http://pax.grsecurity.net";
-SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       sys-apps/paxctl"
-
-# EI_PAX flags are not strip safe.
-RESTRICT="strip"
-
-QA_EXECSTACK="usr/bin/${PN}
-       usr/$(get_libdir)/${PN}/getamap
-       usr/$(get_libdir)/${PN}/shlibtest2.so
-       usr/$(get_libdir)/${PN}/execheap
-       usr/$(get_libdir)/${PN}/mprotstack
-       usr/$(get_libdir)/${PN}/mprotdata
-       usr/$(get_libdir)/${PN}/mprotheap
-       usr/$(get_libdir)/${PN}/randshlib
-       usr/$(get_libdir)/${PN}/randmain1
-       usr/$(get_libdir)/${PN}/getshlib
-       usr/$(get_libdir)/${PN}/randheap2
-       usr/$(get_libdir)/${PN}/rettofunc2x
-       usr/$(get_libdir)/${PN}/shlibdata
-       usr/$(get_libdir)/${PN}/shlibbss
-       usr/$(get_libdir)/${PN}/getmain1
-       usr/$(get_libdir)/${PN}/execdata
-       usr/$(get_libdir)/${PN}/execstack
-       usr/$(get_libdir)/${PN}/rettofunc2
-       usr/$(get_libdir)/${PN}/mprotshdata
-       usr/$(get_libdir)/${PN}/getstack1
-       usr/$(get_libdir)/${PN}/randamap
-       usr/$(get_libdir)/${PN}/rettofunc1x
-       usr/$(get_libdir)/${PN}/getheap2
-       usr/$(get_libdir)/${PN}/getheap1
-       usr/$(get_libdir)/${PN}/randheap1
-       usr/$(get_libdir)/${PN}/getstack2
-       usr/$(get_libdir)/${PN}/getmain2
-       usr/$(get_libdir)/${PN}/rettofunc1
-       usr/$(get_libdir)/${PN}/randstack2
-       usr/$(get_libdir)/${PN}/mprotshbss
-       usr/$(get_libdir)/${PN}/randstack1
-       usr/$(get_libdir)/${PN}/mprotanon
-       usr/$(get_libdir)/${PN}/randmain2
-       usr/$(get_libdir)/${PN}/writetext
-       usr/$(get_libdir)/${PN}/mprotbss
-       usr/$(get_libdir)/${PN}/anonmap
-       usr/$(get_libdir)/${PN}/execbss
-       usr/$(get_libdir)/${PN}/shlibtest.so"
-
-src_prepare() {
-       mv Makefile.psm Makefile
-       epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
-       sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
-       sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
-}
-
-src_compile() {
-       emake RUNDIR=/usr/$(get_libdir)/paxtest || die
-}
-
-src_install() {
-       emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest 
install || die
-
-       newman debian/manpage.1.ex paxtest.1 || die
-       dodoc ChangeLog README || die
-}

diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild 
b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
new file mode 100644
index 00000000..fba18a2
--- /dev/null
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="PaX regression test suite"
+HOMEPAGE="http://pax.grsecurity.net";
+SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+       sys-apps/paxctl"
+
+# EI_PAX flags are not strip safe.
+RESTRICT="strip"
+
+src_prepare() {
+       mv Makefile.psm Makefile
+       epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+       sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
+       sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
+       eapply_user
+}
+
+src_compile() {
+       emake RUNDIR=/usr/$(get_libdir)/paxtest || die
+}
+
+src_install() {
+       emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest 
install || die
+
+       newman debian/manpage.1.ex paxtest.1 || die
+       dodoc ChangeLog README || die
+}

diff --git a/app-admin/paxtest/paxtest-0.9.15.ebuild 
b/app-admin/paxtest/paxtest-0.9.15.ebuild
deleted file mode 100644
index 473de0f..00000000
--- a/app-admin/paxtest/paxtest-0.9.15.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="PaX regression test suite"
-HOMEPAGE="http://pax.grsecurity.net";
-SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       sys-apps/paxctl"
-
-# EI_PAX flags are not strip safe.
-RESTRICT="strip"
-
-QA_EXECSTACK="usr/bin/${PN}
-       usr/$(get_libdir)/${PN}/getamap
-       usr/$(get_libdir)/${PN}/shlibtest2.so
-       usr/$(get_libdir)/${PN}/execheap
-       usr/$(get_libdir)/${PN}/mprotstack
-       usr/$(get_libdir)/${PN}/mprotdata
-       usr/$(get_libdir)/${PN}/mprotheap
-       usr/$(get_libdir)/${PN}/randshlib
-       usr/$(get_libdir)/${PN}/randmain1
-       usr/$(get_libdir)/${PN}/getshlib
-       usr/$(get_libdir)/${PN}/randheap2
-       usr/$(get_libdir)/${PN}/rettofunc2x
-       usr/$(get_libdir)/${PN}/shlibdata
-       usr/$(get_libdir)/${PN}/shlibbss
-       usr/$(get_libdir)/${PN}/getmain1
-       usr/$(get_libdir)/${PN}/execdata
-       usr/$(get_libdir)/${PN}/execstack
-       usr/$(get_libdir)/${PN}/rettofunc2
-       usr/$(get_libdir)/${PN}/mprotshdata
-       usr/$(get_libdir)/${PN}/getstack1
-       usr/$(get_libdir)/${PN}/randamap
-       usr/$(get_libdir)/${PN}/rettofunc1x
-       usr/$(get_libdir)/${PN}/getheap2
-       usr/$(get_libdir)/${PN}/getheap1
-       usr/$(get_libdir)/${PN}/randheap1
-       usr/$(get_libdir)/${PN}/getstack2
-       usr/$(get_libdir)/${PN}/getmain2
-       usr/$(get_libdir)/${PN}/rettofunc1
-       usr/$(get_libdir)/${PN}/randstack2
-       usr/$(get_libdir)/${PN}/mprotshbss
-       usr/$(get_libdir)/${PN}/randstack1
-       usr/$(get_libdir)/${PN}/mprotanon
-       usr/$(get_libdir)/${PN}/randmain2
-       usr/$(get_libdir)/${PN}/writetext
-       usr/$(get_libdir)/${PN}/mprotbss
-       usr/$(get_libdir)/${PN}/anonmap
-       usr/$(get_libdir)/${PN}/execbss
-       usr/$(get_libdir)/${PN}/shlibtest.so"
-
-src_prepare() {
-       mv Makefile.psm Makefile
-       epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
-       sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
-       sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
-}
-
-src_compile() {
-       emake RUNDIR=/usr/$(get_libdir)/paxtest || die
-}
-
-src_install() {
-       emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest 
install || die
-
-       newman debian/manpage.1.ex paxtest.1 || die
-       dodoc ChangeLog README || die
-}

Reply via email to