Remove unnecessary static libraries because chrpath is dlopening the dynamic libraries instead. Fix documentation path.

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

3 files changed, 32 insertions, 29 deletions

diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog
index 003a2320bbec..36afd3e92255 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.15 2011/08/29 19:23:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.16 2011/10/10 22:28:37 ssuominen Exp $
+
+  10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> chrpath-0.13-r2.ebuild:
+  Remove unnecessary static libraries because chrpath is dlopening the dynamic
+  libraries instead. Fix documentation path.
 
 *chrpath-0.13-r2 (29 Aug 2011)
 
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index 43ffb9033dc6..bd770b9fd4c8 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX chrpath-0.13-multilib.patch 4130 RMD160 b128209343ac2fbf38d1fc2c8297c1c5ea7ad641 SHA1 5a638bb7ce305d09b46237b3bf3a32ffb4121ec3 SHA256 6abe262096db93bb62f0eccb8ed4da1a29f53076353da9dc4e1527165bd870c0
 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 1023 RMD160 2f77b0acf34363ed236afa01076aa893c357021b SHA1 4278fd9b585d17d634e9f1e03179dfa3bac90c61 SHA256 9c33f0e651c1c158bd5e3bfe261976a9afce0e41b1e32eac3bd6760570539c11
+EBUILD chrpath-0.13-r2.ebuild 934 RMD160 49fabef1a635ed86c88f5b07201e5876c3ec9f97 SHA1 faf0efcb291111219033646d67fc41e7d3477821 SHA256 a60dfbe8b62a0e6df096e4c95e3bfe913ab269c3ba062dbb9f006fb7b6739a7b
 EBUILD chrpath-0.13.ebuild 777 RMD160 c866c1dea58ce705a286aac74fdc2e74bbcd28da SHA1 932ac7854d6b67618c8a050d10f1d4b8cfb9cfe6 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53
-MISC ChangeLog 2545 RMD160 2c1c3e53ce6e4d2440ff03618011d9d45e532559 SHA1 5b34dd2a1e9ee7211dd3ab2ee77a842a4371f217 SHA256 563c6dfbfcedafc98ed9660977830dbcf7af8ed16aa1acdc2eaff2abfebf5363
+MISC ChangeLog 2749 RMD160 9e2b440507a558a83ce090ba07a07a5f0c56414f SHA1 91719e0136bbbfba7d089ee0513d31a21b0256e3 SHA256 4467fd6c36466c84f2da9e957bf11c2ffc5077909041231257dea2ae9afd7423
 MISC metadata.xml 225 RMD160 64d906ab1e771348a42813c979ca57263c640dc4 SHA1 ab1badf0dc60ef92417bf6b220dd37dcb4239e1a SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOW+cIAAoJEPqDWhW0r/LCFl8P/17ffzm6nldz7Jv6IKPNDdSQ
-aMrHWNROgQ6nADIKygFw9fgdaxorsjyommFKacTHZQhSg1LMwexha9fwit2Cr3/Z
-O+qLt6NafIUlgOIMLUBMZJ2Rq/bFd82d6ajknvip28AcRB7SDi5eFG2HG+/SCCjo
-i2oUACP8ElwFWPYRfh4c04W2tFePEsmJCRky0sWAafip4D2w7Qp1fD8oCkIUQFPu
-tgiHMZp01WZtRlAvHYT/mpV4mU0Qqg7u4R/miFxcQdIOAKTnewfOf0jRBTB67RhR
-wuH7qGqB4KoBNz33d9/8Gs7XTnHU5ZmjxR7MXqIPgBKPiZabTnldbOON4cnDtub8
-V4GnCGszmXHJ4u/jkLBzdXfWiWoRwgTnz9+06TCFfB0EzAQHeO/Tjb/ZWbq2khUs
-ricPTFSfb+xW/+FDBTnO+unz9VRE88KGUSQ23w6tIZlcUCnKHSimush7t4OkXUGN
-kdmMj6R7I07YfbE2D0SvMOjoHuaJe66Z5Y+b4fUFyjVP5VZ17h5VOpi4QMd0W0jl
-4d7V3lSiCJ7lsKzMo9MRF7BfScGvaaTdiIwpUlAhPZje0DF0CD10b0eVN2za0sDP
-B7Z4zLByEeIofITLa7SV/d7D/spMfJqvPF50B84cRg2gpyKAvhR13TaX2Om/Oo1b
-SoXBQ8/0o8a/2WEZ2VlQ
-=+bHI
+iQEcBAEBAgAGBQJOk3GnAAoJEEdUh39IaPFNe2QH/RjniLydwZGM5QI71imL/jRI
+1hZqOh0bOJJjy51Pv4f9VBQ6PcogM6tgw+y55zyIAYCIRUnR4NOohfKMgHYa5Lct
+WOm3JyholEkSo1UFL9/1o2mmB1Q8WEa1yqBDNvynigCD112o/zFqjwHvYlrSBPP7
+XBl/nNai+IMitDc+V351h2UsJCrXEItLGxL9/nKPGGhHq+Wji9+zr2ats3y9OTpC
+8WLO7wm47/y82Fj/omErra7qhk4Mmiv5PlkDd+Y08JfhB+H+9NMHZlKWh98SiUcV
+Faw6EMA7iakOwEPwQ7wLpwDeAJn6sIFskvJw9fL4wkUJe5FAUJRKH3v1S/smZIg=
+=POI2
 -----END PGP SIGNATURE-----
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index dff81c7cf066..047f80b7730c 100644
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -1,15 +1,13 @@
 # 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.1 2011/08/29 19:23:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.2 2011/10/10 22:28:37 ssuominen Exp $
 
-EAPI="2"
-
-inherit eutils autotools
+EAPI=4
+inherit autotools eutils
 
 DESCRIPTION="chrpath can modify the rpath and runpath of ELF executables"
 HOMEPAGE="http://directory.fsf.org/project/chrpath/"
-# original upstream no longer exists (ftp://ftp.hungry.com/pub/hungry)
-SRC_URI="http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,14 +15,21 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~
 IUSE=""
 
 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
+	epatch \
+		"${FILESDIR}"/${P}-multilib.patch \
+		"${FILESDIR}"/${PN}-keepgoing.patch \
+		"${FILESDIR}"/${P}-testsuite-1.patch
+
 	eautoreconf
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog AUTHORS NEWS README
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		install
+
+	rm -f \
+		"${ED}"usr/lib*/lib*.{a,la} \
+		"${ED}"usr/share/doc/${PF}/{COPYING,INSTALL}
 }