1.3.5 changed the way FHS, libtool and /lib was handled. fixed to reflect this change (or libs wouldn't work anyway.) Pruned old 1.2 ebuilds.

Package-Manager: portage-2.1.3_rc8

9 files changed, 36 insertions, 187 deletions

diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog
index fb937eb2cb74..4b38424c2d18 100644
--- a/sys-apps/rsbac-admin/ChangeLog
+++ b/sys-apps/rsbac-admin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/rsbac-admin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.33 2007/07/24 09:41:34 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.34 2007/07/27 15:03:02 kang Exp $
+
+*rsbac-admin-1.3.5-r1 (27 Jul 2007)
+
+  27 Jul 2007; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-admin-1.2.5.ebuild, -rsbac-admin-1.2.6.ebuild,
+  -rsbac-admin-1.2.7.ebuild, +rsbac-admin-1.3.5-r1.ebuild:
+  Fixed 1.3.5 ebuild to create FHS-standard library install into /lib
+  correctly (due to changes in 1.3.5 makefiles), pruned old 1.2 releases.
 
   24 Jul 2007; Guillaume Destuynder <kang@gentoo.org>
   rsbac-admin-1.3.4-r1.ebuild:
diff --git a/sys-apps/rsbac-admin/Manifest b/sys-apps/rsbac-admin/Manifest
index 7a7562756e87..df76010b0a37 100644
--- a/sys-apps/rsbac-admin/Manifest
+++ b/sys-apps/rsbac-admin/Manifest
@@ -10,25 +10,10 @@ AUX rsbac.conf 209 RMD160 fb3ae78191f308ef488832eb844c6f3c7c3ccedf SHA1 82fc8195
 MD5 3b63c2f46e9c0531be23e630133fe6a7 files/rsbac.conf 209
 RMD160 fb3ae78191f308ef488832eb844c6f3c7c3ccedf files/rsbac.conf 209
 SHA256 7ce39c310463001cffb2f8db01c8ff5154abdbede48a7e5c7b7a0252c8a80c19 files/rsbac.conf 209
-DIST rsbac-admin-1.2.5.tar.bz2 279064 RMD160 5eb079e711028e26533f53805ae914f5191d6822 SHA1 2b2d1e052d2f1ae2f898d6129131abc07526e091 SHA256 f1cd5fa854a23d707cd1968dbef85340dba8171509727e6a7cb2568efaccdf91
-DIST rsbac-admin-1.2.6.tar.bz2 273778 RMD160 3fd1e203e770eba2fab1d04334b6a50eb29c24bb SHA1 5b7c3c878412e86a5946a98cd6010335fd5bf4b1 SHA256 dbd650dd64c39d2dc218f92e7a1492a17254d38e40a26bb7eac7c198d439dfb7
-DIST rsbac-admin-1.2.7.tar.bz2 273610 RMD160 e2939ec79cc45eaaf22218f04530d772b0bef956 SHA1 42b55d30fa17050c95e3ff48f5bb42b09d706293 SHA256 1d49aaaf18e518681798a31a1e04c56947b24c5c0f206fca348b9624f56b133b
 DIST rsbac-admin-1.3.0.tar.bz2 277266 RMD160 51eb8a40e432c73c1a6491760208e87afaa82956 SHA1 0c5b581ea4764c69fb03f17cb282d14b7b3c4298 SHA256 4415cc458a88afa3598b63ee7dbba7d0fcda72d9ac7fe046ac3693fcda77f99e
 DIST rsbac-admin-1.3.1.tar.bz2 277714 RMD160 64ab7fd728caa689bb60326f40ecc3b6b3d9457f SHA1 f485028fe0f95a500fa860d1fd17f7fc711e6205 SHA256 1e33afd5c540902e22a29039061ba833325c60aad6fc4e0c77feea916623cbaa
 DIST rsbac-admin-1.3.4.tar.bz2 279557 RMD160 8ac22d3d16340fbc8882bdcf7f93ece419e37406 SHA1 0d6dac513d5ad3db9e311f0f9f641be4b2386616 SHA256 b2c378461c580e201f0184a64db87d479471b25cd6a8541cd706c9e48dce24e5
 DIST rsbac-admin-1.3.5.tar.bz2 279824 RMD160 b5bb373290082cf9df580592fe8008c182c6ffc4 SHA1 e4893fb241300a6cb88454364cd6268c73884a61 SHA256 da85c0353c5752171b3a9ac5946319528519b3d1dd49c9dc3cd2024cb08c383d
-EBUILD rsbac-admin-1.2.5.ebuild 2094 RMD160 b379d937f2cb0d882bcaa59185068a94b2d2b49a SHA1 40d80f4c58967ede37d99db0c230530e20d4e1e0 SHA256 8c39332d2abd35dc68265717f19b34a7ec0108cd92f9bb5b74f766d1475e34d6
-MD5 0460c1444d0e8206dc69b4135f648741 rsbac-admin-1.2.5.ebuild 2094
-RMD160 b379d937f2cb0d882bcaa59185068a94b2d2b49a rsbac-admin-1.2.5.ebuild 2094
-SHA256 8c39332d2abd35dc68265717f19b34a7ec0108cd92f9bb5b74f766d1475e34d6 rsbac-admin-1.2.5.ebuild 2094
-EBUILD rsbac-admin-1.2.6.ebuild 2151 RMD160 6809fcc992154c28ce4b0222a59c7f161667a677 SHA1 9155bc0b54b2faae18632fb061a254a5c3e0cc98 SHA256 c79ce0f6fcfeb23741c20d5d736dcccc779b7a799ac034cbca5eac6d38bf75a3
-MD5 261ba7173cfabbccdedf4bea0ceb92e6 rsbac-admin-1.2.6.ebuild 2151
-RMD160 6809fcc992154c28ce4b0222a59c7f161667a677 rsbac-admin-1.2.6.ebuild 2151
-SHA256 c79ce0f6fcfeb23741c20d5d736dcccc779b7a799ac034cbca5eac6d38bf75a3 rsbac-admin-1.2.6.ebuild 2151
-EBUILD rsbac-admin-1.2.7.ebuild 2151 RMD160 dca763c38e9b3d0500d08ded987b98f8870bd6f4 SHA1 fb5d8e5f74cdd411636c8f12bd7589fb245f87f6 SHA256 f1386a6c93e05997200f61c2556484471e54c69b348dd36890353a9eb00fe8d3
-MD5 e872a44000513306b918aaa3dd31456f rsbac-admin-1.2.7.ebuild 2151
-RMD160 dca763c38e9b3d0500d08ded987b98f8870bd6f4 rsbac-admin-1.2.7.ebuild 2151
-SHA256 f1386a6c93e05997200f61c2556484471e54c69b348dd36890353a9eb00fe8d3 rsbac-admin-1.2.7.ebuild 2151
 EBUILD rsbac-admin-1.2.99.ebuild 2162 RMD160 a11c80a643504307f7509a3eaad69425ecde362a SHA1 266afee824e35bbd60da341ae6830ef299d00d3e SHA256 845e71cfc97dce7c49cb11ce4bd6322f4b4d71948b37b29a184d304d16ca2fa9
 MD5 cba08d9ca9a4830f7a712dbbda4537e3 rsbac-admin-1.2.99.ebuild 2162
 RMD160 a11c80a643504307f7509a3eaad69425ecde362a rsbac-admin-1.2.99.ebuild 2162
@@ -49,27 +34,22 @@ EBUILD rsbac-admin-1.3.4.ebuild 2151 RMD160 0e6bad49597f3a7726b5a94b61c7d09dd7ce
 MD5 46055cf4c5216537706791fb477702a9 rsbac-admin-1.3.4.ebuild 2151
 RMD160 0e6bad49597f3a7726b5a94b61c7d09dd7ced861 rsbac-admin-1.3.4.ebuild 2151
 SHA256 35ddc79cc13c2e576ced69cfc79f3a4ca506b7c11fce66facb5c863a32b8f519 rsbac-admin-1.3.4.ebuild 2151
+EBUILD rsbac-admin-1.3.5-r1.ebuild 2419 RMD160 22d11f69c6a46f4fbd1321d379ef6f080fc426b0 SHA1 0222924527d4f596e9a84f94ace251ab6beb2b7e SHA256 5b6d40adb10d9ef4ec0fe61932e33ccf7efdcc59430ac1ddb886622250c31849
+MD5 fdb8325ab1e2b032677d10cc3912ec4a rsbac-admin-1.3.5-r1.ebuild 2419
+RMD160 22d11f69c6a46f4fbd1321d379ef6f080fc426b0 rsbac-admin-1.3.5-r1.ebuild 2419
+SHA256 5b6d40adb10d9ef4ec0fe61932e33ccf7efdcc59430ac1ddb886622250c31849 rsbac-admin-1.3.5-r1.ebuild 2419
 EBUILD rsbac-admin-1.3.5.ebuild 2394 RMD160 3bc1bd6437cfac4b53a08a15b81a49c61fe190fa SHA1 0944bb03f4327253f991eb5240d2654d0fdfed79 SHA256 d41f6b6b1db7e31dcee601df77554e48cad24fc9514e4403f3bcbeab8dd6847f
 MD5 11d97948fbd75ddd273041e26a0a680c rsbac-admin-1.3.5.ebuild 2394
 RMD160 3bc1bd6437cfac4b53a08a15b81a49c61fe190fa rsbac-admin-1.3.5.ebuild 2394
 SHA256 d41f6b6b1db7e31dcee601df77554e48cad24fc9514e4403f3bcbeab8dd6847f rsbac-admin-1.3.5.ebuild 2394
-MISC ChangeLog 5945 RMD160 880de2a22808e6fc5695201f39a681b873c4e8fc SHA1 7ad4bc53cdee55a53a034d38d9f79e0e9a317826 SHA256 ebf050c9badc0c94ec5ec3784316b24698cc8ea6b4ee199f7bb65bd50962255c
-MD5 b49e1d69c8cd6ab814a9f7257544d575 ChangeLog 5945
-RMD160 880de2a22808e6fc5695201f39a681b873c4e8fc ChangeLog 5945
-SHA256 ebf050c9badc0c94ec5ec3784316b24698cc8ea6b4ee199f7bb65bd50962255c ChangeLog 5945
+MISC ChangeLog 6296 RMD160 5cfd8f870f1007b34479f47b09bb9d7735590b12 SHA1 33e13f68d07e44bfd047b76bfc015a745d569306 SHA256 00bc8fcfdde91c312185525a1a173684861d00494238eeb25e509381fd0e747b
+MD5 05fae1710f9cb09579b9506f07f1a2d2 ChangeLog 6296
+RMD160 5cfd8f870f1007b34479f47b09bb9d7735590b12 ChangeLog 6296
+SHA256 00bc8fcfdde91c312185525a1a173684861d00494238eeb25e509381fd0e747b ChangeLog 6296
 MISC metadata.xml 260 RMD160 93d035e25e95aa3588892ef261f67e427ac41239 SHA1 d4e1e029e9fb96ae91cb1e4eba0a7902da9e2964 SHA256 aff8f9d24589bbd26b4783bb4cf52d9a1baf38872e67de6ee30427007c0e0efe
 MD5 9da6967950985fc6ce099317ef2b9935 metadata.xml 260
 RMD160 93d035e25e95aa3588892ef261f67e427ac41239 metadata.xml 260
 SHA256 aff8f9d24589bbd26b4783bb4cf52d9a1baf38872e67de6ee30427007c0e0efe metadata.xml 260
-MD5 d1cba382896b3706cd30d57475ee5c49 files/digest-rsbac-admin-1.2.5 256
-RMD160 d3467a8a75372559c90e76cd43180767e220ba75 files/digest-rsbac-admin-1.2.5 256
-SHA256 11f9a6010c27fe616d5eef31beade1e408e37a6e08312cf0e2b262cebf1f719e files/digest-rsbac-admin-1.2.5 256
-MD5 ba32bccb7ac782d025b6f37199b4d173 files/digest-rsbac-admin-1.2.6 256
-RMD160 f038e9e07ca9985d2922987bcacd975b48d9287f files/digest-rsbac-admin-1.2.6 256
-SHA256 798834902929d48c7c2fdbaffda0d3c143a3236b37a822d1ce09dcafdb42c0c8 files/digest-rsbac-admin-1.2.6 256
-MD5 855d02216f846fe338315465e06a23b6 files/digest-rsbac-admin-1.2.7 256
-RMD160 1dbee50598598e1dd2db3a559015d2045e58af06 files/digest-rsbac-admin-1.2.7 256
-SHA256 59060f0bd4e7c19ac1978e20b4f0949f611a9f09696e236f2c63dbed37cee2af files/digest-rsbac-admin-1.2.7 256
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rsbac-admin-1.2.99 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-rsbac-admin-1.2.99 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-rsbac-admin-1.2.99 0
@@ -88,3 +68,6 @@ SHA256 74ba42b06f9d84c8d84bac46a8e4e945d28beb0e334ad9f78ce6ee4793e0dd30 files/di
 MD5 21b2f8cbf59daf6152f86964eff4a8a3 files/digest-rsbac-admin-1.3.5 256
 RMD160 3ee96683a1c68487c9d9059be9b253ebe509a8a0 files/digest-rsbac-admin-1.3.5 256
 SHA256 6dc182d7ae3169f43fc33c595d942a3f7259f86dff454a8dd3597eb50680b32b files/digest-rsbac-admin-1.3.5 256
+MD5 21b2f8cbf59daf6152f86964eff4a8a3 files/digest-rsbac-admin-1.3.5-r1 256
+RMD160 3ee96683a1c68487c9d9059be9b253ebe509a8a0 files/digest-rsbac-admin-1.3.5-r1 256
+SHA256 6dc182d7ae3169f43fc33c595d942a3f7259f86dff454a8dd3597eb50680b32b files/digest-rsbac-admin-1.3.5-r1 256
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.5 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.5
deleted file mode 100644
index d16b2b5aed1d..000000000000
--- a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12560426f1724b5b140e661547356260 rsbac-admin-1.2.5.tar.bz2 279064
-RMD160 5eb079e711028e26533f53805ae914f5191d6822 rsbac-admin-1.2.5.tar.bz2 279064
-SHA256 f1cd5fa854a23d707cd1968dbef85340dba8171509727e6a7cb2568efaccdf91 rsbac-admin-1.2.5.tar.bz2 279064
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.6 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.6
deleted file mode 100644
index 48736cd1763e..000000000000
--- a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 167ca4c00e2a17b59c5194707be95a26 rsbac-admin-1.2.6.tar.bz2 273778
-RMD160 3fd1e203e770eba2fab1d04334b6a50eb29c24bb rsbac-admin-1.2.6.tar.bz2 273778
-SHA256 dbd650dd64c39d2dc218f92e7a1492a17254d38e40a26bb7eac7c198d439dfb7 rsbac-admin-1.2.6.tar.bz2 273778
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.7 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.7
deleted file mode 100644
index c42c7a65e320..000000000000
--- a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db0ae77cbeeb2380e3dbb7d7e2abeae2 rsbac-admin-1.2.7.tar.bz2 273610
-RMD160 e2939ec79cc45eaaf22218f04530d772b0bef956 rsbac-admin-1.2.7.tar.bz2 273610
-SHA256 1d49aaaf18e518681798a31a1e04c56947b24c5c0f206fca348b9624f56b133b rsbac-admin-1.2.7.tar.bz2 273610
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.3.5-r1 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.3.5-r1
new file mode 100644
index 000000000000..df9766ea42d8
--- /dev/null
+++ b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.3.5-r1
@@ -0,0 +1,3 @@
+MD5 5bd46bcd85c7b10c3830b4120d330266 rsbac-admin-1.3.5.tar.bz2 279824
+RMD160 b5bb373290082cf9df580592fe8008c182c6ffc4 rsbac-admin-1.3.5.tar.bz2 279824
+SHA256 da85c0353c5752171b3a9ac5946319528519b3d1dd49c9dc3cd2024cb08c383d rsbac-admin-1.3.5.tar.bz2 279824
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
deleted file mode 100644
index 761b0c305cac..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 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.2.5.ebuild,v 1.6 2006/02/16 10:24:00 kang Exp $
-
-inherit eutils
-
-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.2.5"
-
-DEPEND="dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-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=${D}/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.2.7.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.7.ebuild
deleted file mode 100644
index 2f1664eae826..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 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.2.7.ebuild,v 1.1 2006/06/07 10:15:35 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.2.7"
-
-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.2.6.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
index e96cd56ae0a9..fb05342bbc37 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.6.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.2.6.ebuild,v 1.1 2006/05/19 11:19:07 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild,v 1.1 2007/07/27 15:03:02 kang Exp $
 
-inherit eutils libtool
+inherit eutils libtool toolchain-funcs
 
 IUSE="pam"
 
@@ -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.2.6"
+NSS="1.3.5"
 
 DEPEND="dev-util/dialog
 	pam? ( sys-libs/pam )
@@ -36,7 +36,7 @@ src_compile() {
 	use pam && {
 		rsbacmakeargs="${makeargs} pam nss"
 	}
-	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
+	emake PREFIX=/usr LIBDIR=/lib ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
@@ -45,7 +45,7 @@ src_install() {
 	use pam && {
 		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
 	}
-	make PREFIX=/usr DESTDIR=${D} ${rsbacinstallargs} || \
+	make PREFIX=/usr LIBDIR=/lib DESTDIR=${D} ${rsbacinstallargs} || \
 	die "cannot install (${rsbacinstallargs})"
 	insinto /etc
 	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
@@ -53,6 +53,12 @@ src_install() {
 	keepdir /secoff
 	dodir /var/log/rsbac
 	keepdir /var/log/rsbac
+	#FHS compliance
+	dodir /usr/lib
+	mv ${D}/lib/librsbac.la ${D}/lib/librsbac.a ${D}/usr/lib
+	mv ${D}/lib/libnss_rsbac.la ${D}/lib/libnss_rsbac.a ${D}/usr/lib
+	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."
 }