Fix swig build. Bug #398071: Fix audisp-remote location, move to /usr/sbin due to linkage against libcap-ng.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

4 files changed, 19 insertions, 8 deletions

diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index c85726550f11..049029c17424 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/audit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.85 2012/12/22 07:02:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.86 2012/12/22 07:36:33 robbat2 Exp $
+
+  22 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> audit-2.1.3-r1.ebuild,
+  audit-2.2.2.ebuild:
+  Fix swig build. Bug #398071: Fix audisp-remote location, move to /usr/sbin due
+  to linkage against libcap-ng.
 
 *audit-2.2.2 (22 Dec 2012)
 
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 81682ee57961..31be53cf31ce 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -28,8 +28,8 @@ EBUILD audit-1.7.17.ebuild 3491 SHA256 68b02ea9e54e67b4f06e10341ba267df69efd50a7
 EBUILD audit-1.7.18.ebuild 3491 SHA256 ef678f9bb88c2f1dd949cdf3bd92207b4d0f5bd295fde08baf425e66d550c0e6 SHA512 7da7d063fd9802567f3758b887d40d8ece6343845cb48b02d01b2231cdafe1fc770b2d2b8a6404a5cfa17518af30531ccb18648b57f2d93e758b06402d2f1a56 WHIRLPOOL 21f393e0c8c1b48d80528275a2c0b36ed1b3da261eb7cea09ea1fb4d6d9dabf335a9584c811929360acba7c784a0d265246f0bb3075daf1efd41c54cdbc73dd3
 EBUILD audit-1.7.4.ebuild 3394 SHA256 0cdf6975cefd382655936486a8c4b1bf7805e28e3aa45c9264bc92304afbd685 SHA512 153b3479b228675a950564f7f38f734692a4611059ef11b2e0c7a8b1c55acfb8f06fe58ec0e3d36757c91e7e33586336cf1907348a29ce0ddd647b44f681cb3a WHIRLPOOL 37a274d499950c9381d3f5de90f35b84aa2143350898bd214630b58f5f41aff19f3b74f2e7be537f325c542d3f226e77fffa711bf8568c5d16f1d4218784781c
 EBUILD audit-2.0.5.ebuild 4468 SHA256 af5a547f8a131e00050baf000232da2d742029199356d76db195a68e850c1152 SHA512 99837c530ca5a5f35e241f4c3b70e4bfe45a74e91d2181356f417b3f0fc72a1fdf8172c7d52c5b7322a1d59cb351d6ce3d69e623778ca77005cd01e0c86cb7a4 WHIRLPOOL e9554be479f1b11c6d466a4c11b54aa6d39df4c6617934d70ffc410d6006b4b4a6ea980a316dde91cbdb4b91ebb1190c17825df14b04e104a583b57e0a3cc1d9
-EBUILD audit-2.1.3-r1.ebuild 4929 SHA256 295efbc782206bf0a01e037f5d57876d92714dca4a0524fd71c8909276a57e27 SHA512 a0325fb8efd1ab4653d1bf2213dceb84e379021c3189fd9a167e3ae37aab961889a85213c9a5f3b68a0eba3a6862283f970356d5a33cc95adc8ad77d98e1fec5 WHIRLPOOL 1af17add2d8d0920973187a06f4a1b4921e2e27968c9bfef4a1689fa64a54cc980fc239d9e9e1be1d488c012f335e73b50a3f47b86cde35d0fee608ad325e6ff
+EBUILD audit-2.1.3-r1.ebuild 5019 SHA256 24bee31cd3c215ab8c22867eab010e7cfd32727c65124abbe23850b2a0109afa SHA512 4c92350fa9bd92d00412f7380be84f84afe6e558e5ef219e2016724949a45ce7c10c7ec2a8824ac7d8a50175e1ab5bf03a4ac942d52b44e1742889e3b60fa0ea WHIRLPOOL 858dd3606158b36cc5a7a7304d46d813d1529d0ac65c2cc6b02a2ca7556def059be13fa749f2e711428030fdf81c5807484d48d24c819076f290114a51059f53
 EBUILD audit-2.1.3.ebuild 4503 SHA256 a921ad2e649cc25d513c3e1d66411751e15c544979ffc44c9ee589cd98bf7df1 SHA512 0e0c4a43220a8f898f7a590c0e9469839cf2f422da755678db24d39aa82247100973a80437a169af7f16f8af716e0a162c5e9346736e2bb2bacb1548b9ae7b3c WHIRLPOOL b400d245780b7b0f5a75b46fbc8c83949133f8cfe991058ff158072290618ef14bd495edb7f7e427ebbd1c63f8ed49c14150db56d87cb9b99f0a1a4adbeb0102
-EBUILD audit-2.2.2.ebuild 4871 SHA256 9ac1e374396ad2588ddd64ef7b6763de7d303be4e4a1f6016f23088da0ca2a25 SHA512 1feebd6e89d0131713c3b197f405cb908789f6d25be5755b587d12b2f0c51dce8bb3627e7e649ca89b58ece096de3d45f5641ce454f2ac0791df09911bd2459a WHIRLPOOL c23d294e41a8145355b8fef66ef01e0e43d276e4539469d0d8549bb6603bbc733d86f2a6087d069ff61528102c18dee354717a3c5a00f26bfaad63d7b5fe6eec
-MISC ChangeLog 13833 SHA256 84793682a926d4a7a0dc30f9df428c26b52254379df6ca15a3fcb960b2012746 SHA512 d135a88179ad5682c196577725ad3555ae666c2ad5cea35e4a8c25949fa48c72b5392ac2eb01f06df9935a3999f6b5f22672b0a4bd563ff552c0d56d18d3b35a WHIRLPOOL 73ba5b9d0d66a6e16f65881d9acdc8c7993dcbae58cac0e795b4e0c956d7519fb19d66bf70957dd64562fc5edb5028f6fecc36ac0b55f10dc2c080ad3d853b44
+EBUILD audit-2.2.2.ebuild 4961 SHA256 a96896564a66e23c2465c20dc6dee0706665647587ab2a552162f639eac23b8e SHA512 a5af055d6c83b6c6100f40963e0898f86ddb86a1261c63dd11dc91668e11e36fb04fea2a43ff6e4c88b8a451ce6f04e304b192e8e8f8c9778ef7abef99c87b30 WHIRLPOOL 7879ba738de8c703805837b72566c0419d7a7ef92be7b37551ea60c7b553afa283d2d46163e46a2d5ac200c5a503cded50b970245f555569abc459556922af05
+MISC ChangeLog 14045 SHA256 7d9aecde9f4abf33ac6f3da00c83a2abeabaac17b7013dfed3c91f66710e52b1 SHA512 76a12810c7c02373c9fb7cbbc330477c1bed6927b2a8c170e2f2b00368471d495ef8407ce089f7c96c0ee78b1891f3c2be76b385b81719728f6e29a2af3b5545 WHIRLPOOL 34be7b9a99d080b7d08cd36ebcbe00e4464e1f5178093e300c0ad4b1fdde45d08203243036bc0c886447ccb626a78f52b10299d905702915ce57bb8a48c82018
 MISC metadata.xml 208 SHA256 474aad89b28273a47e9d612283399fab63cd9ada8b3c4fa65b16250128abf342 SHA512 761ae3cffc33d4832cd02525e53fa449295e779fac539a6c11d746001689e781939e059c8a444365b42b291e295d5d1620d67af401c2c80c568be8ef596d147d WHIRLPOOL 060c71b4ace40817c787afb38b4919804322e09983dba790fbdcf0c3021a7bfa94ed0f1f4fb5db8893d0c68aebdec378ed055f420501bd7df0f03eec50e220aa
diff --git a/sys-process/audit/audit-2.1.3-r1.ebuild b/sys-process/audit/audit-2.1.3-r1.ebuild
index 5a06c65474bc..b3faf3249d08 100644
--- a/sys-process/audit/audit-2.1.3-r1.ebuild
+++ b/sys-process/audit/audit-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.11 2012/12/22 03:36:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.12 2012/12/22 07:36:33 robbat2 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -75,7 +75,7 @@ src_prepare() {
 
 	# Python bindings are built/installed manually.
 	sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-	sed -e "/^SUBDIRS =/s/ swig//" -i Makefile.am
+	sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
 
 	# Regenerate autotooling
 	eautoreconf
@@ -142,6 +142,9 @@ src_install() {
 	# things like shadow use this so we need to be in /
 	gen_usr_ldscript -a audit auparse
 
+	[ -f "${D}"/sbin/audisp-remote ] && \
+	mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
+
 	# remove RedHat garbage
 	rm -r "${D}"/etc/{rc.d,sysconfig} || die
 
diff --git a/sys-process/audit/audit-2.2.2.ebuild b/sys-process/audit/audit-2.2.2.ebuild
index cd515e140cf8..660171dd9447 100644
--- a/sys-process/audit/audit-2.2.2.ebuild
+++ b/sys-process/audit/audit-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.2.2.ebuild,v 1.1 2012/12/22 07:02:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.2.2.ebuild,v 1.2 2012/12/22 07:36:33 robbat2 Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -75,7 +75,7 @@ src_prepare() {
 
 	# Python bindings are built/installed manually.
 	sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-	sed -e "/^SUBDIRS =/s/ swig//" -i Makefile.am
+	sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
 
 	# Regenerate autotooling
 	eautoreconf
@@ -142,6 +142,9 @@ src_install() {
 	# things like shadow use this so we need to be in /
 	gen_usr_ldscript -a audit auparse
 
+	[ -f "${D}"/sbin/audisp-remote ] && \
+	mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
+
 	# remove RedHat garbage
 	rm -r "${D}"/etc/{rc.d,sysconfig} || die