diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-10-11 16:49:17 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-10-11 16:49:17 +0000 |
| commit | 47cbd2a14d1a6c7d013ae2a1179d095390e45c9a (patch) | |
| tree | dcc0a0416b3a076ee1425d5bb2f2baba85e4fb86 | |
| parent | Fix runtime dependencies, reported by Victor Khimenko. (diff) | |
| download | gentoo-2-47cbd2a14d1a6c7d013ae2a1179d095390e45c9a.tar.gz gentoo-2-47cbd2a14d1a6c7d013ae2a1179d095390e45c9a.tar.bz2 gentoo-2-47cbd2a14d1a6c7d013ae2a1179d095390e45c9a.zip | |
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
(Portage version: 2.2.01.19295-prefix/cvs/SunOS i386)
| -rw-r--r-- | app-admin/chrpath/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/chrpath/chrpath-0.13-r2.ebuild | 29 |
2 files changed, 18 insertions, 18 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 <grobian@gentoo.org> 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 <ssuominen@gentoo.org> chrpath-0.13-r2.ebuild: Remove unnecessary static libraries because chrpath is dlopening the dynamic 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 } |