5 files changed, 15 insertions, 57 deletions
diff --git a/sys-apps/chpax/ChangeLog b/sys-apps/chpax/ChangeLog
index 376caaec4dfc..96827e472d16 100644
--- a/sys-apps/chpax/ChangeLog
+++ b/sys-apps/chpax/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/chpax
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.32 2005/03/16 01:01:43 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.33 2005/04/22 20:01:55 solar Exp $
+
+  22 Apr 2005; <solar@gentoo.org> -chpax-0.6.1.ebuild, chpax-0.7.ebuild:
+  - removed old ebuild from the tree. SRC_URI no longer fetchable
 
   15 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> chpax-0.7.ebuild:
   Stable on ppc64
diff --git a/sys-apps/chpax/Manifest b/sys-apps/chpax/Manifest
index 5a522c44828f..10c45bdbf42c 100644
--- a/sys-apps/chpax/Manifest
+++ b/sys-apps/chpax/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5bdab6003f13a92062bc2a25b98c2064 ChangeLog 4192
-MD5 08a6c77df35ce5c427b972b07adb264d chpax-0.6.1.ebuild 1118
+MD5 238bcef1216623b2e83d6e27508d6484 chpax-0.7.ebuild 1052
+MD5 533a52b0372a4095519b2ec5fc54ce16 ChangeLog 4330
 MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221
-MD5 93c3e222ce0385a859a21ed8e6edc3ad chpax-0.7.ebuild 1073
-MD5 1ae95ccec87f81057389495cbc6bb641 files/digest-chpax-0.6.1 62
 MD5 add5e23e35065b6f32d1221f41b4b986 files/digest-chpax-0.7 59
 MD5 a76f6e6491b16c254c9aeecbec775478 files/pax-conf.d 2743
 MD5 f30daa23cf11e88be6678388f2561f8a files/pax-init.d 2536
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCN4VljNUs7Bp9UGQRAojqAJ4w/Dfs6V+F3qfwxrLs33/YGXXKZACdEnZ1
-ywx3xLIwSrHlYgtAq9K+3Hs=
-=yM2J
+iQCVAwUBQmlYG54WFLgrx1GWAQLXMwP9EsXvQMEvEwEk0K8zmZcoWhgp+k2VqRMv
+Mtsg7W9SyNx1l6hOn0RnLU2YTnbRbmYfEqzO5lR37AWbKCIuzfIpkFzXEVIzkN+A
+Abb1xTmuyBMVeqpp33U87FioLMhFxwma7I2/b+vJo6hBkjoXwWQX5bcvtr3LAQr9
+vsbtCVAfwxE=
+=RU3L
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/chpax/chpax-0.6.1.ebuild b/sys-apps/chpax/chpax-0.6.1.ebuild
deleted file mode 100644
index c84fec9ea138..000000000000
--- a/sys-apps/chpax/chpax-0.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.6.1.ebuild,v 1.14 2005/03/14 23:16:32 solar Exp $
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Manages various PaX related flags for ELF32, ELF64, and a.out binaries."
-HOMEPAGE="http://pax.grsecurity.net/"
-SRC_URI="mirror://chpax-${PV}.tar.bz2
-	http://dev.gentoo.org/~solar/pax/chpax/chpax-${PV}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha ~arm hppa amd64 ia64"
-IUSE=""
-
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND} >=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s|-Wall|${CFLAGS}|" Makefile
-}
-
-src_compile() {
-	# use static && append-ldflags -static	; # breaks with current ssp.
-	emake CC="$(tc-getCC)" TARGET="chpax ${LDFLAGS:0}" || die "Parallel Make Failed"
-}
-
-src_install() {
-	into /
-	dosbin chpax || die
-	fperms 711 /sbin/chpax
-
-	dodoc Changelog README
-	doman chpax.1
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pax-conf.d chpax
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pax-init.d chpax
-}
diff --git a/sys-apps/chpax/chpax-0.7.ebuild b/sys-apps/chpax/chpax-0.7.ebuild
index 9df2c300fdff..4a49f8161c3f 100644
--- a/sys-apps/chpax/chpax-0.7.ebuild
+++ b/sys-apps/chpax/chpax-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.7.ebuild,v 1.10 2005/03/16 01:01:43 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.7.ebuild,v 1.11 2005/04/22 20:01:55 solar Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -10,12 +10,11 @@ SRC_URI="http://pax.grsecurity.net/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/chpax/files/digest-chpax-0.6.1 b/sys-apps/chpax/files/digest-chpax-0.6.1
deleted file mode 100644
index 54e3b9f918db..000000000000
--- a/sys-apps/chpax/files/digest-chpax-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e7bd28fdcd9d8a30bd592ac2397ac9ef chpax-0.6.1.tar.bz2 5081