Changed the chpax dependency to a || dependency with paxctl. Modified to use non-lazy bindings for gradm_pam. Added support for the pam USE flag. Pass custom CFLAGS in a nicer way.

Package-Manager: portage-2.0.52-r1

1 files changed, 12 insertions, 25 deletions

diff --git a/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild b/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
index c1e63ea3f81c..be1f9bcc2a5c 100644
--- a/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
+++ b/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
@@ -1,12 +1,11 @@
 # 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.2 2005/05/15 22:40:25 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild,v 1.3 2005/09/17 15:05:20 swegener Exp $
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs versionator
 
-myPV=${PV:0:5}-${PV:6}
+myPV="$(replace_version_separator 3 -)"
 
-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"
@@ -20,39 +19,27 @@ RDEPEND=""
 DEPEND="virtual/libc
 	sys-devel/bison
 	sys-devel/flex
-	sys-apps/chpax"
+	|| (
+		sys-apps/paxctl
+		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="$(tc-getCC)" || die "compile problem"
-	return 0
+	emake OPT_FLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "compile problem"
 }
 
 src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
+	einstall DESTDIR="${D}" || die "einstall failed"
 	fperms 711 /sbin/gradm
-	return 0
 }
 
 pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/grsec ] ; then
+	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"
+		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"
 }