Fix up some build issues with audit, LDAP is only needed for the z/OS plugin, Prelude support is not needed, and it fails to install docs due to a Makefile bug.

Package-Manager: portage-2.1.4.4

4 files changed, 51 insertions, 10 deletions

diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index 063ea20cf89c..8cd02dc839e3 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/audit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.38 2008/02/20 15:30:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.39 2008/02/20 22:42:21 robbat2 Exp $
+
+  20 Feb 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/audit-1.6.8-subdirs-fix.patch, audit-1.6.8.ebuild:
+  Fix up some build issues with audit, LDAP is only needed for the z/OS
+  plugin, Prelude support is not needed, and it fails to install docs due to a
+  Makefile bug.
 
   20 Feb 2008; Jeroen Roovers <jer@gentoo.org> audit-1.6.8.ebuild:
   Marked ~hppa (bug #184563).
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 62ac6667c4ff..cffbe962f6b0 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,5 +1,6 @@
 AUX audit-1.5.4-build.patch 292 RMD160 6f97369e4d1b27b293f5b875790dee502927f7e0 SHA1 964fc33bf0c668ebd9bf0cf439538fc5b5101a22 SHA256 ef286820b8d34efa8aa04a8cd0344a78eeb0fa50a6ad12f94427bd01dea53534
 AUX audit-1.5.4-swig-gcc-attribute.patch 434 RMD160 dc8c3d070a75f05883784dce72273551513e6fad SHA1 eb8774038fb07434030c9dad839e7d5dc5c9d027 SHA256 0da2225a8bd1f3f83a2e8c54d1c2fe97f9917be6b0a4ed116baa8f06f1800818
+AUX audit-1.6.8-subdirs-fix.patch 548 RMD160 e17fef17c9f5d19a19ec912e9e693080436af938 SHA1 efe094b98380a34d840910f8a0375c21c8fb052b SHA256 26b3ce2f56ce792924be534a43e4c455b9067898642419a1411c4048f1da6c47
 AUX audit.rules 997 RMD160 bfa56758dd5f2caa8835f8d01a465124f4591c69 SHA1 f487461c83c6a732ebbe2c9811911550c92468ec SHA256 adc4779fd55919ca32b2de0d955779b7950a159c449a46ea7c0c6654a9049ee9
 AUX audit.rules.stop.post 573 RMD160 2e6503fc7ee07c4c1e58fb9ddf4b13eec6d95044 SHA1 4ef80c15f2792f17c1764eb2e21654ede46e482d SHA256 4c2e0be1a63b6800396e31153a899d4e3f2db1cee41b4dd271064dc97521edfe
 AUX audit.rules.stop.pre 500 RMD160 6b56a9522e140b48b7f7e67570596ba298a51dc7 SHA1 032921fc3ee730139b39f019b0268a2f1b1962ad SHA256 044cf06cea49f9d38ea114eb16b0a1428465fa2158aea713ef92e67e07e13c48
@@ -12,6 +13,6 @@ DIST audit-1.6.8.tar.gz 799726 RMD160 8dfd6671f61a932ece208d650e042e31cc128b00 S
 EBUILD audit-1.5.4.ebuild 1997 RMD160 c5af2f10f5579c692d86d9abf477dff0d2d0dd69 SHA1 fd475c7839c09fad89b0c0a8501db5c924927383 SHA256 2f6025a8d490971d60b496593a28fbebf5106b3fb23f83d9dade1b69de2d65bf
 EBUILD audit-1.6.1.ebuild 2377 RMD160 38a790e3c70f6214c4188c8036280a14cd63bd4c SHA1 92b1e3cd01fde97e992f84313f424d26829d5d1a SHA256 7cf9fe270225a9d75ac2ad2f7d6dd7baed76919db05d3612e56aaca8198bc103
 EBUILD audit-1.6.2.ebuild 2375 RMD160 3cc4ecf0bee9b63e16195ae5bc441b05e206e107 SHA1 210883b3de3d136653a19db68ab89aa435154538 SHA256 69cec25370267a580f4a97d9e5a4a456313c15789809910935f2241cab3d8e8e
-EBUILD audit-1.6.8.ebuild 2380 RMD160 0aa73801fd86698417de4455d69fef859a0476f3 SHA1 7012a3121c0d1cb59ca032bc947dd574ba2cde86 SHA256 f63eb2f954b095f276335c398e8c13d5c728142a9a059adf35a4186fb71a73ce
-MISC ChangeLog 6285 RMD160 5321b9fc60f9d6180babc2b8fac6e0cf3d744bf9 SHA1 15e969a17e51287cd4a664fd435491c19dc27b1a SHA256 0efeb100265f8b98035e6e7bc8ab6e0cdf481cdaf1b51d72b99462dde9359697
+EBUILD audit-1.6.8.ebuild 2842 RMD160 15df697ad7e7151cfc77c57a2f979f48f167d8ef SHA1 78101f6b73624756b7085a1dcd946fba492ab53a SHA256 42e8ecc4fb95e0b67e29758843a730fe13f2a895eb5e5b593d35022ebbd78b57
+MISC ChangeLog 6570 RMD160 c273512a34ccd585a1540cb262fd55d4b33b4e65 SHA1 58d69afe7b210a1543fc2bab24483386c5fcb1fc SHA256 cc1c85f8d93a3f5a34415462a10088e15929667136b441865f2e3fc4a83323e4
 MISC metadata.xml 231 RMD160 e78f0580e975fa82702433055e1498b0d9228104 SHA1 de14a9907da991c933aed57aeba714d7b7ce28c6 SHA256 f62f6487425736b6d2f27bb84ee09ccee245c1abf74462b6fbcb90f2c368ad2e
diff --git a/sys-process/audit/audit-1.6.8.ebuild b/sys-process/audit/audit-1.6.8.ebuild
index 329e058fb3d0..929ca647be92 100644
--- a/sys-process/audit/audit-1.6.8.ebuild
+++ b/sys-process/audit/audit-1.6.8.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-process/audit/audit-1.6.8.ebuild,v 1.2 2008/02/20 15:30:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.6.8.ebuild,v 1.3 2008/02/20 22:42:21 robbat2 Exp $
 
 inherit autotools multilib toolchain-funcs python
 
@@ -11,9 +11,10 @@ SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="ldap"
 
-RDEPEND=">=dev-lang/python-2.4"
+RDEPEND=">=dev-lang/python-2.4
+		ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 	dev-lang/swig
 	>=sys-kernel/linux-headers-2.6.22-r2"
@@ -30,23 +31,44 @@ src_unpack() {
 	#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
 
 	# Do not build GUI tools
-	sed -i -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' "${S}"/configure.ac
-	sed -i -e 's,system-config-audit,,g' -e '/^SUBDIRS/s,\\$,,g' "${S}"/Makefile.am
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+		"${S}"/configure.ac
+	sed -i \
+		-e 's,system-config-audit,,g' \
+		-e '/^SUBDIRS/s,\\$,,g' \
+		"${S}"/Makefile.am
 	rm -rf "${S}"/system-config-audit
 
+	# Probably goes away in 1.6.9
+	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
+
+	if ! use ldap; then
+		sed -i \
+			-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+			"${S}"/configure.ac
+		sed -i \
+			-e '/^SUBDIRS/s,zos-remote,,g' \
+			"${S}"/audisp/plugins/Makefile.am
+	fi
+
 	# Regenerate autotooling
 	eautoreconf
 }
 
 src_compile() {
 	#append-flags -D'__attribute__(x)='
-	econf --sbindir=/sbin || die
+	econf --sbindir=/sbin --without-prelude || die
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README* THANKS TODO contrib/*
+	dodoc AUTHORS ChangeLog README* THANKS TODO
+	docinto contrib
+	dodoc contrib/*
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
 
 	newinitd "${FILESDIR}"/auditd-init.d-1.2.3 auditd
 	newconfd "${FILESDIR}"/auditd-conf.d-1.2.3 auditd
diff --git a/sys-process/audit/files/audit-1.6.8-subdirs-fix.patch b/sys-process/audit/files/audit-1.6.8-subdirs-fix.patch
new file mode 100644
index 000000000000..662e376b40ed
--- /dev/null
+++ b/sys-process/audit/files/audit-1.6.8-subdirs-fix.patch
@@ -0,0 +1,12 @@
+--- audit-1.6.8/Makefile.am.orig	2008-02-20 14:33:51.034127088 -0800
++++ audit-1.6.8/Makefile.am	2008-02-20 14:33:57.640162864 -0800
+@@ -21,8 +21,7 @@
+ #   Rickard E. (Rik) Faith <faith@redhat.com>
+ #
+ 
+-SUBDIRS = lib auparse src/mt src audisp tools swig bindings init.d 
+-	docs 
++SUBDIRS = lib auparse src/mt src audisp tools swig bindings init.d docs 
+ EXTRA_DIST = ChangeLog AUTHORS NEWS README README-install audit.spec \
+ 	contrib/capp.rules contrib/nispom.rules contrib/lspp.rules \
+ 	contrib/skeleton.c contrib/avc_snap contrib/avc_syslog \