Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 6 insertions, 141 deletions

diff --git a/app-admin/paxtest/ChangeLog b/app-admin/paxtest/ChangeLog
index 9adf4182fee8..f19d647cdc72 100644
--- a/app-admin/paxtest/ChangeLog
+++ b/app-admin/paxtest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/paxtest
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.45 2014/12/12 18:15:44 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.46 2015/04/12 19:16:25 mrueg Exp $
+
+  12 Apr 2015; Manuel Rüger <mrueg@gentoo.org>
+  -files/paxtest-0.9.9-Makefile.patch, -paxtest-0.9.9-r2.ebuild:
+  Remove old.
 
   12 Dec 2014; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix gpg signature
diff --git a/app-admin/paxtest/files/paxtest-0.9.9-Makefile.patch b/app-admin/paxtest/files/paxtest-0.9.9-Makefile.patch
deleted file mode 100644
index 07ba933c9449..000000000000
--- a/app-admin/paxtest/files/paxtest-0.9.9-Makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur paxtest-0.9.9.orig/Makefile paxtest-0.9.9/Makefile
---- paxtest-0.9.9.orig/Makefile	2010-02-22 18:47:19.000000000 -0500
-+++ paxtest-0.9.9/Makefile	2010-08-09 07:50:53.000000000 -0400
-@@ -52,11 +52,13 @@
- endif
- 
- # for some reason the .c files need it, else GNU_STACK=RWE
--OPT_FLAGS  := -O2 $(ASFLAGS)
-+# Gentoo's CFLAGS should be honored
-+OPT_FLAGS  := $(CFLAGS) $(ASFLAGS)
- PTHREAD := -lpthread
- # define stripping of binaries/libs here, or set these on make's commandline,
- # else you'll loose the chpax flags!
--LDFLAGS :=
--SHLDFLAGS :=
-+# Gentoo's LDFLAGS should be honored
-+LDFLAGS := $(LDFLAGS)
-+SHLDFLAGS := $(LDFLAGS)
- ifndef RUNDIR
- RUNDIR := .
-@@ -136,7 +138,7 @@
- 
- $(EXEC_TESTS) $(MPROT_TESTS): body.o
- 	$(CC) $(CFLAGS) -o $@.o -c $@.c
--	$(CC) $(LDFLAGS) $(PTHREAD) -o $@ $< $@.o
-+	$(CC) $(LDFLAGS) -o $@ $< $@.o $(PTHREAD)
- 	
- $(RAND_TESTS): randbody.o
- 	$(CC) $(CFLAGS) -o $@.o -c $@.c
-@@ -185,7 +187,7 @@
- 	
- $(MPROTSH_TESTS): body.o shlibtest.so
- 	$(CC) $(CFLAGS) -o $@.o -c $@.c
--	$(CC) $(LDFLAGS) $(DL) $(PTHREAD) -o $@ $@.o $^
-+	$(CC) $(LDFLAGS) -o $@ $@.o $^ $(DL) $(PTHREAD)
- 
- # used for RANDEXEC'd binaries
- retbody.o: body.c
-@@ -194,12 +196,12 @@
- # build as ET_EXEC (recommended by PaX Team, not really a requirement)
- $(RET_TESTS): retbody.o
- 	$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c
--	$(CC) $(LDFLAGS) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o
-+	$(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD)
- 
- # build as ET_EXEC (not in Adamantix's Makefile)
- $(RETX_TESTS): retbody.o
- 	$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c
--	$(CC) $(LDFLAGS) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o
-+	$(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD)
- 	-$(PAXBIN) -C $@
- 	$(PAXBIN) -SPXM $@
- 	
-@@ -212,4 +214,4 @@
- 	$(CC) $(SHLDFLAGS) -shared -o $@ $<
- 
- $(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o
--	$(CC) $(LDFLAGS) $(PTHREAD) -o $@ body.o $@.o $(SHLIBS) $(DL)
-+	$(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) $(DL) $(PTHREAD)
diff --git a/app-admin/paxtest/paxtest-0.9.9-r2.ebuild b/app-admin/paxtest/paxtest-0.9.9-r2.ebuild
deleted file mode 100644
index 4ba37c347418..000000000000
--- a/app-admin/paxtest/paxtest-0.9.9-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.9-r2.ebuild,v 1.1 2011/04/23 13:54:18 blueness Exp $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="PaX regression test suite"
-HOMEPAGE="http://pax.grsecurity.net"
-SRC_URI="http://grsecurity.net/~spender/${P}.tgz -> ${PF}.tgz"
-
-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}/${P}-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
-}