cleanups and tell users to `emerge --config` #140371 by Jakub Moc

(Portage version: 2.1.1_pre2-r4)

1 files changed, 15 insertions, 30 deletions

diff --git a/sys-apps/sal-client/sal-client-1.0_rc3.ebuild b/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
index 1a15135a5a98..a0293e424779 100644
--- a/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
+++ b/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
@@ -1,45 +1,32 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/sal-client-1.0_rc3.ebuild,v 1.11 2005/12/25 16:49:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/sal-client-1.0_rc3.ebuild,v 1.12 2006/07/15 05:09:15 vapier Exp $
 
 MY_P=${P/_/-}
 DESCRIPTION="Client side programs for SAL, the Secure Auditing for Linux project."
 HOMEPAGE="http://secureaudit.sourceforge.net/"
 SRC_URI="mirror://sourceforge/secureaudit/${MY_P/rc3/RC3}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	dev-libs/openssl"
-
+DEPEND="dev-libs/openssl"
 # put a depend on hardened sources -- repoman doesn't like it, and we've got
 # critical issues so blah
 
 S=${WORKDIR}/sal-client
 
-src_compile() {
-	emake || die
-	#make || die
-}
-
 src_install() {
-	dosbin ${S}/daemon/auditd
-	dosbin ${S}/client/auditclient
+	dosbin daemon/auditd client/auditclient || die
 
+	newinitd "${FILESDIR}"/sal-client-init auditd
+	newconfd "${FILESDIR}"/auditd.confd auditd
 
-	exeinto /etc/init.d; newexe ${FILESDIR}/sal-client-init auditd
-	insinto /etc/conf.d; newins ${FILESDIR}/auditd.confd auditd
-
-	mv ${S}/patches/README ${S}/patches/README.patches
-	mv ${S}/patches/README.todo ${S}/patches/README.todo.patches
-	dodoc ${S}/README
-	dodoc ${S}/README.todo
-	dodoc ${S}/patches/README.patches
-	dodoc ${S}/patches/README.todo.patches
-
+	mv patches/README patches/README.patches
+	mv patches/README.todo patches/README.todo.patches
+	dodoc README README.todo patches/README.patches patches/README.todo.patches
 }
 
 pkg_postinst() {
@@ -47,7 +34,7 @@ pkg_postinst() {
 	einfo "To create the necessary secure directory to hold your buffered logs,"
 	einfo "please remember to configure using the following line:"
 	echo
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	einfo "emerge --config =${CATEGORY}/${PF}"
 	echo
 	ewarn "Please note that using the above method is NOT secure. You will need to explore"
 	ewarn "either a crypto loopback filesystem, or other means of creating a secure jail"
@@ -58,9 +45,7 @@ pkg_postinst() {
 
 pkg_config() {
 	einfo "Creating default temporary log directory in ${ROOT}/var/lib/auditd"
-	mkdir ${ROOT}/var/lib/auditd
-	chown root:0 ${ROOT}/var/lib/auditd
-	chmod 0600 ${ROOT}/var/lib/auditd
+	mkdir "${ROOT}"/var/lib/auditd
+	chown root:0 "${ROOT}"/var/lib/auditd
+	chmod 0600 "${ROOT}"/var/lib/auditd
 }
-
-