Fix odd double docs dir installation, remove libtool archives, install static archives with USE=static-libs

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

3 files changed, 17 insertions, 10 deletions

diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog
index f81a711ce53d..738bcbac23a9 100644
--- a/app-admin/chrpath/ChangeLog
+++ b/app-admin/chrpath/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2011/10/11 16:49:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.18 2011/10/11 18:19:49 grobian Exp $
+
+  11 Oct 2011; Fabian Groffen <grobian@gentoo.org> chrpath-0.13-r2.ebuild:
+  Fix odd double docs dir installation, remove libtool archives, install static
+  archives with USE=static-libs
 
   11 Oct 2011; Fabian Groffen <grobian@gentoo.org> chrpath-0.13-r2.ebuild:
   Revert ssuominen's changes that were totally uncalled for and most
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index c03f5d53e593..759c8f7008a7 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 1022 RMD160 99c71ad51249ebec059705fa155f7a8088d4afa2 SHA1 716fbf456f8b4dff73cc4c43367b90426f25f137 SHA256 6f5970d377de33c98351860d0354678f01a2ab085392894946cfa6f8a9c45b55
+EBUILD chrpath-0.13-r2.ebuild 1175 RMD160 3f6c48040527820d4c4d21644a4f43cb6bf0ba92 SHA1 01712ebd46635066d394fcb8404095de1d475bfb SHA256 3aa8c5f685de896152de15032209a699445548ddb5e160592867dc091d1407da
 EBUILD chrpath-0.13.ebuild 777 RMD160 c866c1dea58ce705a286aac74fdc2e74bbcd28da SHA1 932ac7854d6b67618c8a050d10f1d4b8cfb9cfe6 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53
-MISC ChangeLog 2987 RMD160 a72e896f4b32b551adae9222b5dcbb0e1e8be201 SHA1 f38661645cfd31d83c7efcef3befc80b55263d17 SHA256 2ca4c9b44a47c8fb721a4a59caa664a45011fd0d4d658c649cdb0303a22c5a74
+MISC ChangeLog 3175 RMD160 211ed930f147f31a3a6308d4d34863595183d040 SHA1 7cc4beb96d169d1b5c18eb2003f802d7c44ea3c0 SHA256 9f8366d64f17b25a6785968ad6f93aadf247b6245f7fe306b5e8554be6d62bc0
 MISC metadata.xml 225 RMD160 64d906ab1e771348a42813c979ca57263c640dc4 SHA1 ab1badf0dc60ef92417bf6b220dd37dcb4239e1a SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (SunOS)
 
-iEYEARECAAYFAk6Uc5MACgkQX3X2B8XHTomC8gCaAnccm38s83/UFBx/fOziDnB1
-EaQAn1QxGz7hLZ9NwUwJBOjhlqxUiXNG
-=tfBy
+iEYEARECAAYFAk6UiMsACgkQX3X2B8XHTomg4wCfUpHhxCB0afWh1W90oCgl26HP
+9hoAn2RjkNKTyzpI2S9YDwcOt1ugHqH/
+=RGpk
 -----END PGP SIGNATURE-----
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index e7d5e550664c..db6414fc388b 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.3 2011/10/11 16:49:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.4 2011/10/11 18:19:49 grobian Exp $
 
 EAPI="2"
 
@@ -14,17 +14,20 @@ SRC_URI="http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+IUSE="static-libs"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-multilib.patch
 	epatch "${FILESDIR}"/${PN}-keepgoing.patch
 	epatch "${FILESDIR}"/${P}-testsuite-1.patch
-	sed -i -e '/^docdir/d' Makefile.am # use standard docdir
+	# disable installing redundant docs in the wrong dir
+	sed -i -e '/doc_DATA/d' Makefile.am || die
 	eautoreconf
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	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 '{}' +
 }