Don't install uninstall script and conditionally remove .la files.

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

3 files changed, 26 insertions, 14 deletions

diff --git a/net-analyzer/nessus-libraries/ChangeLog b/net-analyzer/nessus-libraries/ChangeLog
index 03dd8aa651cc..cbaabf3d2817 100644
--- a/net-analyzer/nessus-libraries/ChangeLog
+++ b/net-analyzer/nessus-libraries/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nessus-libraries
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.93 2011/04/20 11:19:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.94 2011/09/12 06:46:58 radhermit Exp $
+
+  12 Sep 2011; Tim Harder <radhermit@gentoo.org>
+  nessus-libraries-2.2.9-r1.ebuild:
+  Don't install uninstall script and conditionally remove .la files.
 
   20 Apr 2011; Justin Lecher <jlec@gentoo.org>
   -nessus-libraries-2.3.1-r2.ebuild:
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
index eb18e7de60e8..81d3d2551ae4 100644
--- a/net-analyzer/nessus-libraries/Manifest
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX nessus-libraries-2.2.9-asneeded.patch 444 RMD160 a0c556c14b72c253b8f47dfca7367fd1b5a49474 SHA1 5c5fb21c964bc906d33aff41530e6e1a0810d90f SHA256 db6c6b9f3eef5e03e3c37887f227d24688f812665a873abf80f2d68756685cda
 AUX nessus-libraries-2.2.9-linking.patch 2009 RMD160 8ac7834f2ed7ee97b8d72a790356a2136e3dabc4 SHA1 30e804f646685b4e1516bc07059f5a011279f322 SHA256 24428548259153da84932c782707b1183869ece1543ef3b35ef291f4a8f58b88
 AUX nessus-libraries-2.3.1-ldflags.patch 1424 RMD160 4cf59110cb43a73ed8f59b33b864aaf9743b5d0d SHA1 6810494fc8bef34e77ec282f8adf99cf46ec0843 SHA256 ce8b9ebff69c678f8488b2dd75240a1837a67c67dd6e3ea9aa9e7875ebfba1bb
 DIST nessus-libraries-2.2.9.tar.gz 426560 RMD160 a3ce920ff48fcb7879f7026e2b7d271151132787 SHA1 de1ce2c522d6127a436574a96b1a5ec9873b597c SHA256 5a3c32d6eab8ccc8a22ab5bb224228152e10731c06561f679c41b92263c7ef18
-EBUILD nessus-libraries-2.2.9-r1.ebuild 1143 RMD160 f0d34323630fa2ecc46351f6f3771ad781b899d1 SHA1 c5b0fc0c5d0bb53b2ee0eae2e993fd03525ec2ee SHA256 98139ffdcf399f506b4601789f5746a0ac959a673f0e5a6378e73b5a65e43284
+EBUILD nessus-libraries-2.2.9-r1.ebuild 1266 RMD160 9e03a43ddb2c772a32248c4792525d20c36c19de SHA1 a2dbdb9f25990c97cb13f16a0a819731d514963e SHA256 93457969e78ce312331fb9cd75f4b7d71201ecffdcdbb9418c3ea727509a1cc2
 EBUILD nessus-libraries-2.2.9.ebuild 905 RMD160 222421bb9d28437b05a7d95c1b29872be5166604 SHA1 8b5e4d243135b02dc93f4f2a9cc7f4fc827f8430 SHA256 43bc880b103271befc6782835bab1df6b867e2eb1a6f60da37c49cb981a9ec27
-MISC ChangeLog 13491 RMD160 3d9041b8f0b6d8816557ef0f63e6383c87933506 SHA1 eaa12af81cdbf06f9e9d9d01d8ca6fa384d7e9ae SHA256 bdb197af63278b68bbef9b9172fcab5741d685a66132987b4b6d357811a954ad
+MISC ChangeLog 13651 RMD160 d792a25c7b4de61489047ce86614490898649de4 SHA1 51f2dccd6d92c639a390b87b66a00c99c9cab106 SHA256 7b3291013e9cdc4d5c0b98ab410dbd3390e6838b279583f0a2be6070596b6d30
 MISC metadata.xml 249 RMD160 733e7145e60c54eb0c583195b4c0c6ebb91756c0 SHA1 0a5d282d1381312bc9eaee4f4cc282811ba33a64 SHA256 14643d9de5c8caeb0c6ab8044426e00b98dab06667ef8d75472a365ef8011754
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2uwU0ACgkQgAnW8HDreRa0xgCfQMwK/6SFzs/7EZF1+MYQIF5S
-huYAmwasE1wBHx+1peYH/3FEIJzzkL1F
-=+DzP
+iQEcBAEBCgAGBQJObaroAAoJEEqz6FtPBkyjhSIH/Ax5ZntT2EC4zT2lz+hyvHN/
+pi07SxXp3xJB3whAmzZbgWJAHIg5kDMIykQ0lmGJO8si3u4/9ja7LREd8UDjMwzA
+t4YNuxql7GHibFmfVf+3eRQhYHfDO57pARUNSbYwQ9M3v5G3BvFWPTTN9qs2Dbt0
+IaPwpsUZbxkspaBqHi3+r2jfh5+96GCh7CtYv7hg4rirNdE29fTSPER0mVzRXyER
+XgZux0UDMp85qM7qct2jN4QjrZ8l32or9V20dnAQGRMYdGGH/UaxohMMpr7RGO30
+IOkbm3CMHgJr6Hx2v7VSU8uTjbZdvIEaZx6FVJ8deYAlZ9eefk8/0GMEQHjR9EU=
+=M+5i
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
index 1c92dccb1b19..908d561e2931 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild,v 1.1 2011/04/20 07:17:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild,v 1.2 2011/09/12 06:46:58 radhermit Exp $
 
 EAPI=4
 
@@ -24,11 +24,10 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}"/${PN}
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-linking.patch
-	sed \
-		-e "s:^\(LDFLAGS=\):\1 ${LDFLAGS}:g" \
-		-i nessus.tmpl.in
+	epatch "${FILESDIR}"/${P}-linking.patch
+
+	sed -i -e "s:^\(LDFLAGS=\):\1 ${LDFLAGS}:g" nessus.tmpl.in || die
+	sed -i -e '/sbindir/d' Makefile || die
 }
 
 src_configure() {
@@ -42,3 +41,8 @@ src_configure() {
 		--with-ssl="${EPREFIX}/usr/$(get_libdir)" \
 		--disable-nessuspcap
 }
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}