From 8e9a6ced55f599ba682663d4001f7b9b2cab0147 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 11 Oct 2011 16:49:17 +0000 Subject: [PATCH] Revert ssuominen's changes that were totally uncalled for and most importantly broke the installation of this package on the main consumer's platform: Prefix Package-Manager: portage-2.2.01.19295-prefix/cvs/SunOS i386 --- app-admin/chrpath/ChangeLog | 7 +++++- app-admin/chrpath/Manifest | 16 +++++-------- app-admin/chrpath/chrpath-0.13-r2.ebuild | 29 ++++++++++-------------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog index 36afd3e92255..f81a711ce53d 100644 --- a/app-admin/chrpath/ChangeLog +++ b/app-admin/chrpath/ChangeLog @@ -1,6 +1,11 @@ # 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.16 2011/10/10 22:28:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.17 2011/10/11 16:49:17 grobian Exp $ + + 11 Oct 2011; Fabian Groffen chrpath-0.13-r2.ebuild: + Revert ssuominen's changes that were totally uncalled for and most + importantly broke the installation of this package on the main consumer's + platform: Prefix 10 Oct 2011; Samuli Suominen chrpath-0.13-r2.ebuild: Remove unnecessary static libraries because chrpath is dlopening the dynamic diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest index bd770b9fd4c8..c03f5d53e593 100644 --- a/app-admin/chrpath/Manifest +++ b/app-admin/chrpath/Manifest @@ -5,18 +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 934 RMD160 49fabef1a635ed86c88f5b07201e5876c3ec9f97 SHA1 faf0efcb291111219033646d67fc41e7d3477821 SHA256 a60dfbe8b62a0e6df096e4c95e3bfe913ab269c3ba062dbb9f006fb7b6739a7b +EBUILD chrpath-0.13-r2.ebuild 1022 RMD160 99c71ad51249ebec059705fa155f7a8088d4afa2 SHA1 716fbf456f8b4dff73cc4c43367b90426f25f137 SHA256 6f5970d377de33c98351860d0354678f01a2ab085392894946cfa6f8a9c45b55 EBUILD chrpath-0.13.ebuild 777 RMD160 c866c1dea58ce705a286aac74fdc2e74bbcd28da SHA1 932ac7854d6b67618c8a050d10f1d4b8cfb9cfe6 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53 -MISC ChangeLog 2749 RMD160 9e2b440507a558a83ce090ba07a07a5f0c56414f SHA1 91719e0136bbbfba7d089ee0513d31a21b0256e3 SHA256 4467fd6c36466c84f2da9e957bf11c2ffc5077909041231257dea2ae9afd7423 +MISC ChangeLog 2987 RMD160 a72e896f4b32b551adae9222b5dcbb0e1e8be201 SHA1 f38661645cfd31d83c7efcef3befc80b55263d17 SHA256 2ca4c9b44a47c8fb721a4a59caa664a45011fd0d4d658c649cdb0303a22c5a74 MISC metadata.xml 225 RMD160 64d906ab1e771348a42813c979ca57263c640dc4 SHA1 ab1badf0dc60ef92417bf6b220dd37dcb4239e1a SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.18 (SunOS) -iQEcBAEBAgAGBQJOk3GnAAoJEEdUh39IaPFNe2QH/RjniLydwZGM5QI71imL/jRI -1hZqOh0bOJJjy51Pv4f9VBQ6PcogM6tgw+y55zyIAYCIRUnR4NOohfKMgHYa5Lct -WOm3JyholEkSo1UFL9/1o2mmB1Q8WEa1yqBDNvynigCD112o/zFqjwHvYlrSBPP7 -XBl/nNai+IMitDc+V351h2UsJCrXEItLGxL9/nKPGGhHq+Wji9+zr2ats3y9OTpC -8WLO7wm47/y82Fj/omErra7qhk4Mmiv5PlkDd+Y08JfhB+H+9NMHZlKWh98SiUcV -Faw6EMA7iakOwEPwQ7wLpwDeAJn6sIFskvJw9fL4wkUJe5FAUJRKH3v1S/smZIg= -=POI2 +iEYEARECAAYFAk6Uc5MACgkQX3X2B8XHTomC8gCaAnccm38s83/UFBx/fOziDnB1 +EaQAn1QxGz7hLZ9NwUwJBOjhlqxUiXNG +=tfBy -----END PGP SIGNATURE----- diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild index 047f80b7730c..e7d5e550664c 100644 --- a/app-admin/chrpath/chrpath-0.13-r2.ebuild +++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild @@ -1,13 +1,15 @@ # 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.2 2011/10/10 22:28:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.3 2011/10/11 16:49:17 grobian Exp $ -EAPI=4 -inherit autotools eutils +EAPI="2" + +inherit eutils autotools DESCRIPTION="chrpath can modify the rpath and runpath of ELF executables" HOMEPAGE="http://directory.fsf.org/project/chrpath/" -SRC_URI="mirror://gentoo/${P}.tar.gz" +# 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" LICENSE="GPL-2" SLOT="0" @@ -15,21 +17,14 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ IUSE="" src_prepare() { - epatch \ - "${FILESDIR}"/${P}-multilib.patch \ - "${FILESDIR}"/${PN}-keepgoing.patch \ - "${FILESDIR}"/${P}-testsuite-1.patch - + 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 eautoreconf } src_install() { - emake \ - DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} \ - install - - rm -f \ - "${ED}"usr/lib*/lib*.{a,la} \ - "${ED}"usr/share/doc/${PF}/{COPYING,INSTALL} + emake install DESTDIR="${D}" || die + dodoc ChangeLog AUTHORS NEWS README } -- 2.26.2