7 files changed, 12 insertions, 206 deletions
diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 8667391d22d3..eb5134ed60c9 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/gradm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.52 2005/05/10 08:11:26 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.53 2005/05/15 22:40:25 solar Exp $
+
+  15 May 2005; <solar@gentoo.org> -files/gradm-2.0.1-install.patch,
+  -gradm-2.1.0.ebuild, -gradm-2.1.3.200503070918.ebuild,
+  -gradm-2.1.4.200503221017.ebuild, gradm-2.1.5.200504081812.ebuild:
+  - stable x86 - use toolchain-funcs vs gcc eclass - cleaned out older versions
 
   10 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
   gradm-2.1.3.200503070918.ebuild:
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 40e6661f8e30..b79ba617d990 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,25 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6a863234df9194498d45e96031138d7a gradm-2.1.0.ebuild 1313
-MD5 6097bfbd295747286a1ef42e79b8dcb9 gradm-2.1.5.200504081812.ebuild 1454
-MD5 e99f85f4c9436f7ee3bacee562e4c6a0 gradm-2.1.3.200503070918.ebuild 1455
-MD5 390a2b5440213e974eaf3cbcaaa635e4 ChangeLog 8027
-MD5 38199bb46efd226ce5356ad21dd9f8d1 gradm-2.1.4.200503221017.ebuild 1454
+MD5 f673e500f7246280d0d484f7bb724b56 gradm-2.1.5.200504081812.ebuild 1471
+MD5 822071dbacce4d6f5c472a5460512bb7 ChangeLog 8302
 MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221
 MD5 f2401396b01c577f727c2da3b694c779 files/grsecurity.rc 1810
 MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325
-MD5 1535781388eb902dfef66f6240f53137 files/digest-gradm-2.1.0 75
-MD5 264e377e7c3221570d3730444e84d792 files/gradm2-cvs-20Jun2004.diff 8251
 MD5 c2618fc7963e008681dfd08db6886058 files/gradm_parse.c-1.9.x.patch 524
 MD5 4f610b1a69bb13a22080460f47de34a1 files/digest-gradm-2.1.5.200504081812 75
-MD5 34fada9bd168b331d4597c7c3fa26f0c files/digest-gradm-2.1.4.200503221017 75
-MD5 c016f75a48190153dcb63f9cba78abef files/gradm-2.0.1-install.patch 488
-MD5 4c8486b82be650c8f5cb6a5e08192941 files/digest-gradm-2.1.3.200503070918 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCgGzEViELBEf1JB0RAofuAJ4kmJ7+PTfGR6VPvVpFUJOvzEkjtwCdGccG
-+Ym/xB/XEAPq0Tfx2KX/p24=
-=Gt4X
------END PGP SIGNATURE-----
diff --git a/sys-apps/gradm/files/gradm-2.0.1-install.patch b/sys-apps/gradm/files/gradm-2.0.1-install.patch
deleted file mode 100644
index 48dfaebf6dcd..000000000000
--- a/sys-apps/gradm/files/gradm-2.0.1-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2004-08-11 15:41:06.000000000 -0400
-+++ Makefile	2004-08-11 15:41:27.000000000 -0400
-@@ -103,7 +103,7 @@
- 	$(STRIP) $(DESTDIR)/sbin/grlearn
- 	mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR)
- 	@if [ ! -f $(DESTDIR)$(GRSEC_DIR)/policy ] ; then \
--		if [ ! -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
-+		if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
- 			mv $(DESTDIR)$(GRSEC_DIR)/acl $(DESTDIR)$(GRSEC_DIR)/policy ; \
- 		else \
- 			$(INSTALL) -m 0600 policy $(DESTDIR)$(GRSEC_DIR) ; \
diff --git a/sys-apps/gradm/gradm-2.1.0.ebuild b/sys-apps/gradm/gradm-2.1.0.ebuild
deleted file mode 100644
index ab685f2cd360..000000000000
--- a/sys-apps/gradm/gradm-2.1.0.ebuild
+++ /dev/null
@@ -1,54 +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/gradm/gradm-2.1.0.ebuild,v 1.4 2005/02/25 19:02:35 solar Exp $
-
-inherit flag-o-matic gcc eutils
-
-MAINTAINER="solar@gentoo.org"
-DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://www.grsecurity.net/gradm-${PV}-200501071935.tar.gz"
-#SRC_URI="mirror://gentoo/gradm-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc arm amd64"
-IUSE=""
-RDEPEND=""
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-}
-
-src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-	return 0
-}
-
-src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
-	fperms 711 /sbin/gradm
-	return 0
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/grsec ] ; then
-		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 ${ROOT}/dev/
-		mknod -m 0622 ${ROOT}/dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
-	fi
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
-}
diff --git a/sys-apps/gradm/gradm-2.1.3.200503070918.ebuild b/sys-apps/gradm/gradm-2.1.3.200503070918.ebuild
deleted file mode 100644
index 9d237fba6a3b..000000000000
--- a/sys-apps/gradm/gradm-2.1.3.200503070918.ebuild
+++ /dev/null
@@ -1,58 +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/gradm/gradm-2.1.3.200503070918.ebuild,v 1.5 2005/05/10 08:11:26 ferdy Exp $
-
-inherit flag-o-matic gcc eutils
-
-myPV=${PV:0:5}-${PV:6}
-
-MAINTAINER="solar@gentoo.org"
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
-#SRC_URI="mirror://gentoo/gradm-${myPV}.tar.gz"
-#RESTRICT=primaryuri
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc arm amd64 ~ppc64 ia64 mips ~alpha"
-IUSE=""
-RDEPEND=""
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#epatch ${FILESDIR}/gradm-2.1.2-non-interactive.patch
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-}
-
-src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-	return 0
-}
-
-src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
-	fperms 711 /sbin/gradm
-	return 0
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/grsec ] ; then
-		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 ${ROOT}/dev/
-		mknod -m 0622 ${ROOT}/dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
-	fi
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
-}
diff --git a/sys-apps/gradm/gradm-2.1.4.200503221017.ebuild b/sys-apps/gradm/gradm-2.1.4.200503221017.ebuild
deleted file mode 100644
index 587730940bde..000000000000
--- a/sys-apps/gradm/gradm-2.1.4.200503221017.ebuild
+++ /dev/null
@@ -1,58 +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/gradm/gradm-2.1.4.200503221017.ebuild,v 1.1 2005/03/24 15:21:31 solar Exp $
-
-inherit flag-o-matic gcc eutils
-
-myPV=${PV:0:5}-${PV:6}
-
-MAINTAINER="solar@gentoo.org"
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
-#SRC_URI="mirror://gentoo/gradm-${myPV}.tar.gz"
-#RESTRICT=primaryuri
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64 ~ppc64 ~ia64 ~mips"
-IUSE=""
-RDEPEND=""
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#epatch ${FILESDIR}/gradm-2.1.2-non-interactive.patch
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-}
-
-src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-	return 0
-}
-
-src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
-	fperms 711 /sbin/gradm
-	return 0
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/grsec ] ; then
-		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 ${ROOT}/dev/
-		mknod -m 0622 ${ROOT}/dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
-	fi
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
-}
diff --git a/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild b/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
index 9bafcbae4ec4..c1e63ea3f81c 100644
--- a/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
+++ b/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild,v 1.1 2005/04/12 17:56:11 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild,v 1.2 2005/05/15 22:40:25 solar Exp $
 
-inherit flag-o-matic gcc eutils
+inherit flag-o-matic toolchain-funcs eutils
 
 myPV=${PV:0:5}-${PV:6}
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
 #RESTRICT=primaryuri
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64 ~ppc64 ~ia64 ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~arm ~amd64 ~ppc64 ~ia64 ~mips ~alpha"
 IUSE=""
 RDEPEND=""
 DEPEND="virtual/libc
@@ -37,7 +37,7 @@ src_unpack() {
 
 src_compile() {
 	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
+	emake CC="$(tc-getCC)" || die "compile problem"
 	return 0
 }