Cleanup static-libs code, thanks Kacper Kowalik and Agostino Sarubbo. The produced shared libraries are only dlopened by the main chrpath program to work around a duplicate names issue, it are in fact just ordinary shared libraries, so we should retain .la files for them if we want static libs.

Package-Manager: portage-2.2.01.19572-prefix/cvs/SunOS i386

3 files changed, 18 insertions, 9 deletions

diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog
index 738bcbac23a9..b190249d00f4 100644
--- a/app-admin/chrpath/ChangeLog
+++ b/app-admin/chrpath/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/chrpath
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.18 2011/10/11 18:19:49 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.19 2011/11/29 18:37:49 grobian Exp $
+
+  29 Nov 2011; Fabian Groffen <grobian@gentoo.org> chrpath-0.13-r2.ebuild:
+  Cleanup static-libs code, thanks Kacper Kowalik and Agostino Sarubbo.  The
+  produced shared libraries are only dlopened by the main chrpath program to
+  work around a duplicate names issue, it are in fact just ordinary shared
+  libraries, so we should retain .la files for them if we want static libs.
 
   11 Oct 2011; Fabian Groffen <grobian@gentoo.org> chrpath-0.13-r2.ebuild:
   Fix odd double docs dir installation, remove libtool archives, install static
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index 759c8f7008a7..d80aa7f21b8d 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -5,14 +5,14 @@ AUX chrpath-0.13-multilib.patch 4130 RMD160 b128209343ac2fbf38d1fc2c8297c1c5ea7a
 AUX chrpath-0.13-testsuite-1.patch 575 RMD160 0cf149b5798f3f0fd15ea98f89700feee2104cea SHA1 3683b4e6ef4219fd815367d2a638c4ab646a7188 SHA256 f780b05ce1bc8b77012bb81dabdbd9ef7487643e767c734275f5d8f915355dd4
 AUX chrpath-keepgoing.patch 1041 RMD160 9c454d96245d434b69db0b176a792f50eb882429 SHA1 a213403888ca21aa7730b4957b8f9f7e6c4b05b6 SHA256 6c45aa896835cea3df7b0edcadea2171e8e5833b4d40c99babab15b5648d219a
 DIST chrpath-0.13.tar.gz 125129 RMD160 89b91919e3f629173388f10469dc94fadd46aa56 SHA1 11ff3e3dda2acaf1e529475f394f74f2ef7a8204 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b
-EBUILD chrpath-0.13-r2.ebuild 1175 RMD160 3f6c48040527820d4c4d21644a4f43cb6bf0ba92 SHA1 01712ebd46635066d394fcb8404095de1d475bfb SHA256 3aa8c5f685de896152de15032209a699445548ddb5e160592867dc091d1407da
+EBUILD chrpath-0.13-r2.ebuild 1202 RMD160 145d69b167704781598f6b61049574d137b88e74 SHA1 6b9294dba400071e953af16099bb3be283efb91c SHA256 cc68c29bd29bb1e6fdecb437f5824c6bf4586663359a933107009a0c253f4540
 EBUILD chrpath-0.13.ebuild 777 RMD160 c866c1dea58ce705a286aac74fdc2e74bbcd28da SHA1 932ac7854d6b67618c8a050d10f1d4b8cfb9cfe6 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53
-MISC ChangeLog 3175 RMD160 211ed930f147f31a3a6308d4d34863595183d040 SHA1 7cc4beb96d169d1b5c18eb2003f802d7c44ea3c0 SHA256 9f8366d64f17b25a6785968ad6f93aadf247b6245f7fe306b5e8554be6d62bc0
+MISC ChangeLog 3556 RMD160 068b8b442edb645f233337a6d1233730e858d8d2 SHA1 456d16fc5b8065817fe771ddc39823d33145755d SHA256 47771511ac0b3bb48514cdde8b244971c6a6ad42c2672202c7545b751176bd65
 MISC metadata.xml 225 RMD160 64d906ab1e771348a42813c979ca57263c640dc4 SHA1 ab1badf0dc60ef92417bf6b220dd37dcb4239e1a SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (SunOS)
 
-iEYEARECAAYFAk6UiMsACgkQX3X2B8XHTomg4wCfUpHhxCB0afWh1W90oCgl26HP
-9hoAn2RjkNKTyzpI2S9YDwcOt1ugHqH/
-=RGpk
+iEYEARECAAYFAk7VJpUACgkQX3X2B8XHTomxxACfQTeOd9VXX+wWTvYhjvDN8Oi/
+EOIAn2g/2Tru7k4bbj7o58KLpn1pm4FI
+=VbcZ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index db6414fc388b..3631530e6ffe 100644
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.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/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.4 2011/10/11 18:19:49 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.5 2011/11/29 18:37:49 grobian Exp $
 
 EAPI="2"
 
@@ -25,9 +25,12 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_enable static_libs static) || die
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog AUTHORS NEWS README
-	find "${D}" -name "*.la" -exec rm '{}' +
-	use static-libs || find "${D}" -name "*.a" -exec rm '{}' +
+	use static-libs || find "${D}" -name "*.la" -exec rm '{}' +
 }