[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in app-admin/chrpath: ChangeLog chrpath-0.13-r2.ebuild

[Samuli Suominen]

On 10/11/2011 07:49 PM, Fabian Groffen (grobian) wrote:
> grobian     11/10/11 16:49:18
>
>   Modified:             ChangeLog chrpath-0.13-r2.ebuild
>   Log:
>   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)
>
> Revision  Changes    Path
> 1.17                 app-admin/chrpath/ChangeLog
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chrpath/ChangeLog?rev=1.17&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chrpath/ChangeLog?rev=1.17&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chrpath/ChangeLog?r1=1.16&r2=1.17
>
> Index: ChangeLog
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -r1.16 -r1.17
> --- ChangeLog	10 Oct 2011 22:28:37 -0000	1.16
> +++ ChangeLog	11 Oct 2011 16:49:17 -0000	1.17
> @@ -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@g.o> 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@g.o> chrpath-0.13-r2.ebuild:
>    Remove unnecessary static libraries because chrpath is dlopening the dynamic
>
>
>
> 1.3                  app-admin/chrpath/chrpath-0.13-r2.ebuild
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild?rev=1.3&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild?rev=1.3&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild?r1=1.2&r2=1.3
>
> Index: chrpath-0.13-r2.ebuild
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- chrpath-0.13-r2.ebuild	10 Oct 2011 22:28:37 -0000	1.2
> +++ chrpath-0.13-r2.ebuild	11 Oct 2011 16:49:17 -0000	1.3
> @@ -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 @@
>  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
>  }

You just broke the package again by reverting technically correct commits:

Documentation:

>>> /usr/share/doc/chrpath-0.13-r2/ChangeLog.bz2
>>> /usr/share/doc/chrpath-0.13-r2/AUTHORS.bz2
>>> /usr/share/doc/chrpath-0.13-r2/NEWS.bz2
>>> /usr/share/doc/chrpath-0.13-r2/README.bz2
>>> /usr/share/doc/-chrpath-/
>>> /usr/share/doc/-chrpath-/README
>>> /usr/share/doc/-chrpath-/NEWS
>>> /usr/share/doc/-chrpath-/INSTALL
>>> /usr/share/doc/-chrpath-/ChangeLog
>>> /usr/share/doc/-chrpath-/COPYING
>>> /usr/share/doc/-chrpath-/AUTHORS

Unused libtool files:

>>> /usr/lib64/libchrpath64.la
>>> /usr/lib64/libchrpath32.la

Libs used only by chrpath itself now install static versions of
themself, unused:

>>> /usr/lib64/libchrpath32.a
>>> /usr/lib64/libchrpath64.a

So I've missed one ${EPREFIX} for docdir= ? How about just fixing that,
and not crapping all over the package?

- Samuli