bump 1.3.7+unquoted variable fixes, cleanup old ebuilds

1.3.5-r1 stable
(Portage version: 2.1.4.4)

5 files changed, 29 insertions, 161 deletions

diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog
index f299d66f477a..4a4bb4077008 100644
--- a/sys-apps/rsbac-admin/ChangeLog
+++ b/sys-apps/rsbac-admin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/rsbac-admin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.35 2008/02/02 13:51:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.36 2008/02/15 17:46:42 kang Exp $
+
+*rsbac-admin-1.3.7 (15 Feb 2008)
+
+  15 Feb 2008; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-admin-1.3.0.ebuild, -rsbac-admin-1.3.1.ebuild,
+  -rsbac-admin-1.3.4.ebuild, rsbac-admin-1.3.5-r1.ebuild,
+  +rsbac-admin-1.3.7.ebuild:
+  Bump to 1.3.7, removed old versions.
+  fix unquoted variables in 1.3.7
+  1.3.5-r1 stable
 
   02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   rsbac-admin-1.3.4-r1.ebuild, rsbac-admin-1.3.5-r1.ebuild:
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.1.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.1.ebuild
deleted file mode 100644
index a4feaeb821e2..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.1.ebuild,v 1.3 2007/06/08 14:26:20 kang Exp $
-
-inherit eutils libtool
-
-IUSE="pam"
-
-# RSBAC Adming packet name
-#ADMIN=rsbac-admin-v${PV}
-
-DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
-HOMEPAGE="http://www.rsbac.org/ http://hardened.gentoo.org/rsbac"
-SRC_URI="http://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-NSS="1.3.1"
-
-DEPEND="dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack $A
-	cd ${S}
-	elibtoolize
-}
-
-src_compile() {
-	local rsbacmakeargs
-	rsbacmakeargs="libs tools"
-	use pam && {
-		rsbacmakeargs="${makeargs} pam nss"
-	}
-	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
-}
-
-src_install() {
-	local rsabacinstallargs
-	rsbacinstallargs="headers-install libs-install tools-install"
-	use pam && {
-		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
-	}
-	make PREFIX=/usr DESTDIR=${D} ${rsbacinstallargs} || \
-	die "cannot install (${rsbacinstallargs})"
-	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
-	dodir /secoff
-	keepdir /secoff
-	dodir /var/log/rsbac
-	keepdir /var/log/rsbac
-}
-
-pkg_postinst() {
-	enewgroup secoff 400 || die "problem adding group secoff"
-	enewuser secoff 400 /bin/bash /secoff secoff || \
-	die "problem adding user secoff"
-	enewgroup audit 404 || die "problem adding group audit"
-	enewuser audit 404 -1 /dev/null audit || \
-	die "problem adding user audit"
-
-	chmod 700 /secoff /var/log/rsbac ||  \
-	die "problem changing permissions of /secoff and/or /secoff/log"
-	chown secoff:secoff -R /secoff || \
-	die "problem changing ownership of /secoff"
-	einfo "It is suggested to run (for example) a separate copy of syslog-ng to"
-	einfo "log RSBAC messages, as user audit (uid 404) instead of using the deprecated"
-	einfo "rklogd. See http://rsbac.org/documentation/administration_examples/syslog-ng"
-	einfo "for more information."
-}
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.4.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.4.ebuild
deleted file mode 100644
index 5607e726a100..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.4.ebuild,v 1.1 2007/06/08 14:26:20 kang Exp $
-
-inherit eutils libtool
-
-IUSE="pam"
-
-# RSBAC Adming packet name
-#ADMIN=rsbac-admin-v${PV}
-
-DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
-HOMEPAGE="http://www.rsbac.org/ http://hardened.gentoo.org/rsbac"
-SRC_URI="http://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-NSS="1.3.4"
-
-DEPEND="dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack $A
-	cd ${S}
-	elibtoolize
-}
-
-src_compile() {
-	local rsbacmakeargs
-	rsbacmakeargs="libs tools"
-	use pam && {
-		rsbacmakeargs="${makeargs} pam nss"
-	}
-	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
-}
-
-src_install() {
-	local rsabacinstallargs
-	rsbacinstallargs="headers-install libs-install tools-install"
-	use pam && {
-		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
-	}
-	make PREFIX=/usr DESTDIR=${D} ${rsbacinstallargs} || \
-	die "cannot install (${rsbacinstallargs})"
-	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
-	dodir /secoff
-	keepdir /secoff
-	dodir /var/log/rsbac
-	keepdir /var/log/rsbac
-}
-
-pkg_postinst() {
-	enewgroup secoff 400 || die "problem adding group secoff"
-	enewuser secoff 400 /bin/bash /secoff secoff || \
-	die "problem adding user secoff"
-	enewgroup audit 404 || die "problem adding group audit"
-	enewuser audit 404 -1 /dev/null audit || \
-	die "problem adding user audit"
-
-	chmod 700 /secoff /var/log/rsbac ||  \
-	die "problem changing permissions of /secoff and/or /secoff/log"
-	chown secoff:secoff -R /secoff || \
-	die "problem changing ownership of /secoff"
-	einfo "It is suggested to run (for example) a separate copy of syslog-ng to"
-	einfo "log RSBAC messages, as user audit (uid 404) instead of using the deprecated"
-	einfo "rklogd. See http://rsbac.org/documentation/administration_examples/syslog-ng"
-	einfo "for more information."
-}
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
index b6d751b08abe..1cd351feb0b0 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild,v 1.2 2008/02/02 13:51:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild,v 1.3 2008/02/15 17:46:42 kang Exp $
 
 inherit eutils libtool multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 NSS="1.3.5"
 
 DEPEND="dev-util/dialog
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.0.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.7.ebuild
index 52511495b36e..69e82186ea1f 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.0.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.3.7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.0.ebuild,v 1.2 2007/01/12 10:37:25 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.7.ebuild,v 1.1 2008/02/15 17:46:42 kang Exp $
 
-inherit eutils libtool
+inherit eutils libtool multilib toolchain-funcs
 
 IUSE="pam"
 
-# RSBAC Adming packet name
+# RSBAC Admin packet name
 #ADMIN=rsbac-admin-v${PV}
 
 DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
@@ -16,7 +16,7 @@ SRC_URI="http://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
-NSS="1.3.0"
+NSS="1.3.7"
 
 DEPEND="dev-util/dialog
 	pam? ( sys-libs/pam )
@@ -26,7 +26,7 @@ RDEPEND=">=sys-libs/ncurses-5.2"
 
 src_unpack() {
 	unpack $A
-	cd ${S}
+	cd "${S}"
 	elibtoolize
 }
 
@@ -36,7 +36,7 @@ src_compile() {
 	use pam && {
 		rsbacmakeargs="${makeargs} pam nss"
 	}
-	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
+	emake PREFIX=/usr LIBDIR=/$(get_libdir) ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
@@ -45,14 +45,20 @@ src_install() {
 	use pam && {
 		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
 	}
-	make PREFIX=/usr DESTDIR=${D} ${rsbacinstallargs} || \
+	make PREFIX=/usr LIBDIR=/$(get_libdir) DESTDIR="${D}" "${rsbacinstallargs}" || \
 	die "cannot install (${rsbacinstallargs})"
 	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
+	newins "${FILESDIR}/rsbac.conf" rsbac.conf "${FILESDIR}/nsswitch.conf"
 	dodir /secoff
 	keepdir /secoff
 	dodir /var/log/rsbac
 	keepdir /var/log/rsbac
+	#FHS compliance
+	dodir /usr/$(get_libdir)
+	mv "${D}/$(get_libdir)/librsbac.{,l}a" "${D}/usr/$(get_libdir)"
+	mv "${D}/$(get_libdir)/libnss_rsbac.{,l}a" "${D}/usr/$(get_libdir)"
+	gen_usr_ldscript librsbac.so
+	gen_usr_ldscript libnss_rsbac.so
 }
 
 pkg_postinst() {
@@ -69,6 +75,6 @@ pkg_postinst() {
 	die "problem changing ownership of /secoff"
 	einfo "It is suggested to run (for example) a separate copy of syslog-ng to"
 	einfo "log RSBAC messages, as user audit (uid 404) instead of using the deprecated"
-	einfo "rklogd. See http://rsbac.org/documentation/administration_examples/syslog-ng"
+	einfo "rklogd. See http://www.rsbac.org/documentation/administration_examples/syslog-ng"
 	einfo "for more information."
 }