Bump and remove deprecated versions

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 45 insertions, 183 deletions

diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 672a2a0959e6..31a278d57394 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/gradm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.129 2010/08/26 11:43:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.130 2010/09/02 22:14:11 blueness Exp $
+
+*gradm-2.2.0.201008292125 (02 Sep 2010)
+
+  02 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  -gradm-2.1.14.200907110111.ebuild, -gradm-2.1.14.200910072130.ebuild,
+  -gradm-2.2.0.201006192157.ebuild, -gradm-2.2.0.201007222349.ebuild,
+  +gradm-2.2.0.201008292125.ebuild, +files/gradm-2.2.0.201008292125.patch:
+  Bump and remove deprecated versions
 
   26 Aug 2010; Anthony G. Basile <blueness@gentoo.org>
   gradm-2.1.14.201005041005.ebuild:
diff --git a/sys-apps/gradm/files/gradm-2.2.0.201008292125.patch b/sys-apps/gradm/files/gradm-2.2.0.201008292125.patch
new file mode 100644
index 000000000000..b8d892816582
--- /dev/null
+++ b/sys-apps/gradm/files/gradm-2.2.0.201008292125.patch
@@ -0,0 +1,30 @@
+--- Makefile.orig	2010-08-13 21:39:07.000000000 -0400
++++ Makefile	2010-08-13 21:40:54.000000000 -0400
+@@ -18,16 +18,16 @@
+ BISON=/usr/bin/bison
+ #YACC := $(shell if [ -x $(BYACC) ]; then echo $(BYACC); else echo $(BISON); fi)
+ YACC=$(BISON)
+-MKNOD=/bin/mknod
++MKNOD=true
+ #for dietlibc
+ #CC=/usr/bin/diet /usr/bin/gcc
+ CC=/usr/bin/gcc
+ FIND=/usr/bin/find
+-STRIP=/usr/bin/strip
++STRIP=true
+ LIBS := $(shell if [ "`uname -m`" != "sparc64" ]; then echo "-lfl" ; else echo "" ; fi)
+ OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi)
+ CFLAGS := $(OPT_FLAGS) -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE
+-LDFLAGS=
++LDFLAGS+=
+ INSTALL = /usr/bin/install -c
+ 
+ # FHS
+@@ -134,6 +134,7 @@
+ 			$(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \
+ 		fi \
+ 	fi
++	@mkdir -p $(DESTDIR)/etc/udev/rules.d
+ 	@if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \
+ 		echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
+ 		echo "KERNEL==\"grsec\",          MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \
diff --git a/sys-apps/gradm/gradm-2.1.14.200907110111.ebuild b/sys-apps/gradm/gradm-2.1.14.200907110111.ebuild
deleted file mode 100644
index 2a330f013a0f..000000000000
--- a/sys-apps/gradm/gradm-2.1.14.200907110111.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.14.200907110111.ebuild,v 1.2 2009/09/23 20:24:21 patrick Exp $
-
-inherit flag-o-matic toolchain-funcs eutils versionator
-
-myPV="$(replace_version_separator 3 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://dev.gentoo.org/~gengor/distfiles/${CATEGORY}/${PN}/${PN}-${myPV}.tar.gz"
-#RESTRICT=primaryuri
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="pam"
-RDEPEND=""
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	pam? ( virtual/pam )
-	|| ( sys-apps/paxctl sys-apps/chpax )"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/2.1.7.200511041858-non-lazy-bindings.patch
-	sed -i -e s/MKNOD=/'MKNOD ?='/ -e s/STRIP=/'STRIP ?='/ "${S}/Makefile"
-}
-
-src_compile() {
-	local target=""
-	use pam || target="nopam"
-
-	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" || die "compile problem"
-}
-
-src_install() {
-	einstall DESTDIR="${D}" MKNOD=true STRIP=true || die "einstall failed"
-	fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
-	[ -e "${ROOT}"/dev/grsec ] && rm -f "${ROOT}"/dev/grsec
-	einfo "Making character device for grsec2 learning mode"
-	mkdir -p -m 755 "${ROOT}"/dev/
-	mknod -m 0622 "${ROOT}"/dev/grsec c 1 13 || die "Cant mknod for grsec learning device"
-
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
-	ewarn
-	ewarn "This version of gradm is only supported with a kernel >=2.6.29!"
-}
diff --git a/sys-apps/gradm/gradm-2.1.14.200910072130.ebuild b/sys-apps/gradm/gradm-2.1.14.200910072130.ebuild
deleted file mode 100644
index e540f62d7c8c..000000000000
--- a/sys-apps/gradm/gradm-2.1.14.200910072130.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.14.200910072130.ebuild,v 1.1 2010/02/01 04:56:05 gengor Exp $
-
-EAPI=2
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_PV="$(replace_version_separator 3 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://dev.gentoo.org/~gengor/distfiles/${CATEGORY}/${PN}/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	pam? ( virtual/pam )
-	|| ( sys-apps/paxctl sys-apps/chpax )"
-
-S="${WORKDIR}/${PN}2"
-
-src_prepare() {
-	sed -i  -e s:^LDFLAGS=:LDFLAGS+=: \
-		-e s:^MKNOD=.*:MKNOD=true: \
-		-e s:^STRIP=.*:STRIP=true: Makefile
-
-	append-ldflags -Wl,-z,now
-}
-
-src_compile() {
-	local target
-	use pam || target="nopam"
-
-	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	einstall DESTDIR="${D}" || die "einstall failed"
-	fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
-	[ -e "${ROOT}"/dev/grsec ] && rm -f "${ROOT}"/dev/grsec
-	einfo "Making character device for grsec2 learning mode"
-	mkdir -p -m 755 "${ROOT}"/dev/
-	mknod -m 0622 "${ROOT}"/dev/grsec c 1 13 || die "mknod on grsec learning device failed"
-
-	einfo
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
-	ewarn
-	ewarn "This version of gradm is only supported with a kernel >=2.6.29!"
-	einfo
-}
diff --git a/sys-apps/gradm/gradm-2.2.0.201006192157.ebuild b/sys-apps/gradm/gradm-2.2.0.201006192157.ebuild
deleted file mode 100644
index 0bc1459c8b88..000000000000
--- a/sys-apps/gradm/gradm-2.2.0.201006192157.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.2.0.201006192157.ebuild,v 1.1 2010/06/30 16:22:10 blueness Exp $
-
-EAPI=2
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_PV="$(replace_version_separator 3 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	pam? ( virtual/pam )
-	|| ( sys-apps/paxctl sys-apps/chpax )"
-
-S="${WORKDIR}/${PN}2"
-
-src_prepare() {
-	sed -i  -e s:^LDFLAGS=:LDFLAGS+=: \
-		-e s:^MKNOD=.*:MKNOD=true: \
-		-e s:^STRIP=.*:STRIP=true: Makefile
-
-	append-ldflags -Wl,-z,now
-}
-
-src_compile() {
-	local target
-	use pam || target="nopam"
-
-	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	einstall DESTDIR="${D}" || die "einstall failed"
-	fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
-	[ -e "${ROOT}"/dev/grsec ] && rm -f "${ROOT}"/dev/grsec
-	einfo "Making character device for grsec2 learning mode"
-	mkdir -p -m 755 "${ROOT}"/dev/
-	mknod -m 0622 "${ROOT}"/dev/grsec c 1 13 || die "mknod on grsec learning device failed"
-
-	einfo
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
-	ewarn
-	ewarn "This version of gradm is only supported with a kernel >=2.6.29!"
-	einfo
-}
diff --git a/sys-apps/gradm/gradm-2.2.0.201007222349.ebuild b/sys-apps/gradm/gradm-2.2.0.201008292125.ebuild
index 6ff1a9f53de3..42ff368eb79c 100644
--- a/sys-apps/gradm/gradm-2.2.0.201007222349.ebuild
+++ b/sys-apps/gradm/gradm-2.2.0.201008292125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.2.0.201007222349.ebuild,v 1.1 2010/07/31 01:50:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.2.0.201008292125.ebuild,v 1.1 2010/09/02 22:14:11 blueness Exp $
 
 EAPI=2
 
@@ -26,11 +26,7 @@ DEPEND="sys-devel/bison
 S="${WORKDIR}/${PN}2"
 
 src_prepare() {
-	sed -i  -e s:^LDFLAGS=:LDFLAGS+=: \
-		-e s:^MKNOD=.*:MKNOD=true: \
-		-e s:^STRIP=.*:STRIP=true: Makefile
-
-	append-ldflags -Wl,-z,now
+	epatch "${FILESDIR}/${P}.patch"
 }
 
 src_compile() {
@@ -46,11 +42,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	[ -e "${ROOT}"/dev/grsec ] && rm -f "${ROOT}"/dev/grsec
-	einfo "Making character device for grsec2 learning mode"
-	mkdir -p -m 755 "${ROOT}"/dev/
-	mknod -m 0622 "${ROOT}"/dev/grsec c 1 13 || die "mknod on grsec learning device failed"
-
+	local UDEVADM="/sbin/udevadm"
+	if [[ -x ${UDEVADM} ]] ; then
+		$UDEVADM trigger --action=add --sysname-match=grsec
+	fi
 	einfo
 	ewarn
 	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"