From 33aeb614161bfa9d32f1e5d659c26fc8f6106f22 Mon Sep 17 00:00:00 2001 From: Ned Ludd Date: Thu, 28 Oct 2004 20:31:27 +0000 Subject: fixed CC usage to use new toolchain-funcs.eclass. bug 69286 --- sys-apps/chpax/ChangeLog | 6 +++++- sys-apps/chpax/Manifest | 10 ++++----- sys-apps/chpax/chpax-0.5.ebuild | 40 ----------------------------------- sys-apps/chpax/chpax-0.6.1.ebuild | 10 ++++----- sys-apps/chpax/chpax-0.7.ebuild | 10 ++++----- sys-apps/chpax/files/digest-chpax-0.5 | 1 - 6 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 sys-apps/chpax/chpax-0.5.ebuild delete mode 100644 sys-apps/chpax/files/digest-chpax-0.5 (limited to 'sys-apps/chpax') diff --git a/sys-apps/chpax/ChangeLog b/sys-apps/chpax/ChangeLog index f8428fc53db8..12f605cf134f 100644 --- a/sys-apps/chpax/ChangeLog +++ b/sys-apps/chpax/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/chpax # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.29 2004/10/13 13:56:24 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.30 2004/10/28 20:31:27 solar Exp $ + + 28 Oct 2004; -chpax-0.5.ebuild, chpax-0.6.1.ebuild, + chpax-0.7.ebuild: + fixed CC usage to use new toolchain-funcs.eclass. bug 69286 13 Oct 2004; Guy Martin chpax-0.7.ebuild: Stable on hppa. diff --git a/sys-apps/chpax/Manifest b/sys-apps/chpax/Manifest index cb768ee37ea4..0161849cb854 100644 --- a/sys-apps/chpax/Manifest +++ b/sys-apps/chpax/Manifest @@ -1,10 +1,8 @@ +MD5 7bde40e6c46eca23b33f830ce4fc392e chpax-0.6.1.ebuild 1121 +MD5 f45c7ec75632077f59b7063159755898 chpax-0.7.ebuild 1074 MD5 c8d0d2fc73ea3c47e0d5fc83187053b4 ChangeLog 3879 -MD5 e5d1d71f964cd590fbf1e02a2a76714a chpax-0.5.ebuild 942 MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221 -MD5 500e97cad2617303e752918cc5915e33 chpax-0.6.1.ebuild 1090 -MD5 f03cbc0c09fb16f4615ba29870d91e8b chpax-0.7.ebuild 1043 -MD5 d95ac8cbc92ddd4a9e401455d79571f7 files/digest-chpax-0.5 59 +MD5 add5e23e35065b6f32d1221f41b4b986 files/digest-chpax-0.7 59 +MD5 1ae95ccec87f81057389495cbc6bb641 files/digest-chpax-0.6.1 62 MD5 a76f6e6491b16c254c9aeecbec775478 files/pax-conf.d 2743 MD5 f30daa23cf11e88be6678388f2561f8a files/pax-init.d 2536 -MD5 1ae95ccec87f81057389495cbc6bb641 files/digest-chpax-0.6.1 62 -MD5 add5e23e35065b6f32d1221f41b4b986 files/digest-chpax-0.7 59 diff --git a/sys-apps/chpax/chpax-0.5.ebuild b/sys-apps/chpax/chpax-0.5.ebuild deleted file mode 100644 index 79853dc39fcc..000000000000 --- a/sys-apps/chpax/chpax-0.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.5.ebuild,v 1.9 2004/06/28 16:01:35 vapier Exp $ - -# S=${WORKDIR}/chpax -DESCRIPTION="Manages various PaX related flags for ELF32, ELF64, and a.out binaries." -HOMEPAGE="http://pageexec.virtualave.net/" -SRC_URI="http://pageexec.virtualave.net/chpax-${PV}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="x86 ppc sparc ~hppa ~amd64 ia64" -IUSE="" - -DEPEND="virtual/libc" - -src_unpack() { - unpack ${A} - cd ${S} - mv Makefile{,.orig} - sed -e "s|-Wall|${CFLAGS} -Wall|" Makefile.orig > Makefile -} - -src_compile() { - emake CC="${CC}" || die "Parallel Make Failed" -} - -src_install() { - into / - dosbin chpax - 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.6.1.ebuild b/sys-apps/chpax/chpax-0.6.1.ebuild index 204a7077642b..1ee3187c8916 100644 --- a/sys-apps/chpax/chpax-0.6.1.ebuild +++ b/sys-apps/chpax/chpax-0.6.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 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.12 2004/06/30 14:37:12 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.6.1.ebuild,v 1.13 2004/10/28 20:31:27 solar Exp $ -inherit flag-o-matic gcc +inherit flag-o-matic toolchain-funcs DESCRIPTION="Manages various PaX related flags for ELF32, ELF64, and a.out binaries." HOMEPAGE="http://pax.grsecurity.net/" @@ -14,8 +14,8 @@ SLOT="0" KEYWORDS="x86 ppc sparc ~mips alpha ~arm hppa amd64 ia64" IUSE="" -DEPEND="virtual/libc - >=sys-apps/sed-4" +RDEPEND="virtual/libc" +DEPEND="${RDEPEND} >=sys-apps/sed-4" src_unpack() { unpack ${A} @@ -25,7 +25,7 @@ src_unpack() { src_compile() { # use static && append-ldflags -static ; # breaks with current ssp. - emake CC="$(gcc-getCC)" TARGET="chpax ${LDFLAGS:0}" || die "Parallel Make Failed" + emake CC="$(tc-getCC)" TARGET="chpax ${LDFLAGS:0}" || die "Parallel Make Failed" } src_install() { diff --git a/sys-apps/chpax/chpax-0.7.ebuild b/sys-apps/chpax/chpax-0.7.ebuild index cdc0e4d997e1..bb99981ee7a7 100644 --- a/sys-apps/chpax/chpax-0.7.ebuild +++ b/sys-apps/chpax/chpax-0.7.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 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.6 2004/10/13 13:56:24 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.7.ebuild,v 1.7 2004/10/28 20:31:27 solar Exp $ -inherit flag-o-matic gcc +inherit flag-o-matic toolchain-funcs DESCRIPTION="Manages various PaX related flags for ELF32, ELF64, and a.out binaries." HOMEPAGE="http://pax.grsecurity.net/" @@ -13,8 +13,8 @@ SLOT="0" KEYWORDS="x86 ppc ~ppc64 sparc ~mips ~alpha ~arm hppa amd64 ~ia64" IUSE="" -DEPEND="virtual/libc - >=sys-apps/sed-4" +RDEPEND="virtual/libc" +DEPEND="${RDEPEND} >=sys-apps/sed-4" src_unpack() { unpack ${A} @@ -24,7 +24,7 @@ src_unpack() { src_compile() { # use static && append-ldflags -static ; # breaks with current ssp. - emake CC="$(gcc-getCC)" TARGET="chpax ${LDFLAGS:0}" || die "Parallel Make Failed" + emake CC="$(tc-getCC)" TARGET="chpax ${LDFLAGS:0}" || die "Parallel Make Failed" } src_install() { diff --git a/sys-apps/chpax/files/digest-chpax-0.5 b/sys-apps/chpax/files/digest-chpax-0.5 deleted file mode 100644 index 8d22765c253e..000000000000 --- a/sys-apps/chpax/files/digest-chpax-0.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 aeb0c1aae2c087df369a4c30e0f1adbd chpax-0.5.tar.gz 5030 -- cgit v1.2.3-65-gdbad