From 4d77419faa2e83f208465c50a40586e517240345 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 30 Apr 2010 17:09:52 +0000 Subject: [PATCH] Fix for #300657, thanks Gianluigi Tiesi for providing the patches Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- app-misc/realpath/ChangeLog | 8 ++- app-misc/realpath/Manifest | 14 ++++- .../realpath/files/realpath-1.15-nonls.patch | 25 ++++++++ app-misc/realpath/realpath-1.15-r1.ebuild | 60 +++++++++++++++++++ 4 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 app-misc/realpath/files/realpath-1.15-nonls.patch create mode 100644 app-misc/realpath/realpath-1.15-r1.ebuild diff --git a/app-misc/realpath/ChangeLog b/app-misc/realpath/ChangeLog index 0d804e5c1408..2562908b8bff 100644 --- a/app-misc/realpath/ChangeLog +++ b/app-misc/realpath/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/realpath # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.2 2010/04/01 17:14:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.3 2010/04/30 17:09:52 jlec Exp $ + +*realpath-1.15-r1 (30 Apr 2010) + + 30 Apr 2010; Justin Lecher +realpath-1.15-r1.ebuild, + +files/realpath-1.15-nonls.patch: + Fix for #300657, thanks Gianluigi Tiesi for providing the patches 01 Apr 2010; Raúl Porcel realpath-1.15.ebuild: m68k/s390/sh stable diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest index 13f878023827..d02ea396eaea 100644 --- a/app-misc/realpath/Manifest +++ b/app-misc/realpath/Manifest @@ -1,7 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX realpath-1.14-build.patch 1019 RMD160 d9a19eadd3ef17347e901d00f662f9b265581e8b SHA1 9fd50083a6dee83f4fe6d77ef70cde85f3814a5a SHA256 050432c91359228e47e57c989425428096a081b9c82ae037ec3876fac1fabafc AUX realpath-1.14-no-po4a.patch 288 RMD160 0c652a04b84432353b0547dba1454a4784350ee6 SHA1 0ef6f48971ffd947e09361225c1faf6d2f6f6c32 SHA256 5fc4321c8e6a3906366d198d309768de026b628ec320bf4c00c137f9fa6eeacc +AUX realpath-1.15-nonls.patch 583 RMD160 a8c791e5660616a696247cf07a59d87589fa34b9 SHA1 14495120ca591ae4126321d0dffd660066b4f3c4 SHA256 c8ef7560ba210b2fec7397e287bb4e3073ca14cbccf5e77f34f52886a0722c7a DIST realpath_1.15.tar.gz 17406 RMD160 83129946171248446b3bcd1eae8ad82217c4248d SHA1 27174ef37d846761a12ebd81af1398327ee824b9 SHA256 b3d11cec375145ea60663e6fe54727c70a0e86c18f40bddac2a89b635cc1531f DIST realpath_1.15_i386.deb 15670 RMD160 cedc694ff0e7302581ee3a81ba951ca591309828 SHA1 a890ea32d012d712fc263a68a076631805feab4c SHA256 6fdcace221422a042d7fce941e46977adfb3b1da44d23e8be00628c56d726d3e +EBUILD realpath-1.15-r1.ebuild 1686 RMD160 4ab10a3bdc8a64b72362c35de5bb11e270d0f033 SHA1 3ae1d5372113941780a08b6127f94a978e880b5d SHA256 3c1008716dbd657319d413d8a252de72e8aed950de9715c7efb708f0657ac79e EBUILD realpath-1.15.ebuild 1622 RMD160 38c07807aebe4e13afe78c4b05568dae384d2d48 SHA1 72735665619d065d6016b28e264b0b04d18e554c SHA256 815c12beadef024bedf1388b2a605a08eaa77f440d79ac2dd0f15e0722b9dea3 -MISC ChangeLog 6374 RMD160 af389d52bd90b5776ffe838ca575083e8a469d0a SHA1 9c65379a38499566071aaa4ff3422b882f9473cf SHA256 fe07fccc3a2ee1c97da33b833cb4e59f6118a8d972995ad282918d9a66bfc671 +MISC ChangeLog 6582 RMD160 e74cd9839a27991e1eeffd7618f45870048e55af SHA1 09fb646d89eeb7aef5f40955d35147c7496d5ca8 SHA256 52b1c44059610f6c426f02193d8d07f4b4d786da6acaa75d0f9901fd2adf7ea6 MISC metadata.xml 328 RMD160 405f12dbe5abd64eccefcefead9cb2662b687b1f SHA1 c2dafdc2d68df2e12665c5b15d88010414497af1 SHA256 71d668f1cb87b5412b35f181bc761921019e7502b7b56bf7ea9aa5c514e939e0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvbDugACgkQgAnW8HDreRZ15QCfczY1UtzZJ2nUorcGCuwNPoxB +sasAoK5oWDIGj8XXkyvOIb+TMNL6oLeu +=DQv1 +-----END PGP SIGNATURE----- diff --git a/app-misc/realpath/files/realpath-1.15-nonls.patch b/app-misc/realpath/files/realpath-1.15-nonls.patch new file mode 100644 index 000000000000..1a6c0d6d376c --- /dev/null +++ b/app-misc/realpath/files/realpath-1.15-nonls.patch @@ -0,0 +1,25 @@ +--- realpath-1.15/src/realpath.c.orig 2010-01-12 03:20:42 +0000 ++++ realpath-1.15/src/realpath.c 2010-01-12 03:20:59 +0000 +@@ -23,9 +23,8 @@ + #include + #include + #include +-#include + +-#define _(String) gettext (String) ++#define _(String) (String) + + static char *stripdir(char * dir, char *buf, int maxlen); + +@@ -115,11 +114,6 @@ + + myname = ( p = strchr(argv[0], '/') ) ? p+1 : argv[0]; + +- setlocale(LC_ALL, ""); +- bindtextdomain(PACKAGE, LOCALEDIR); +- textdomain(PACKAGE); +- +- + parse_options(argc, argv); + + while (optind < argc) { diff --git a/app-misc/realpath/realpath-1.15-r1.ebuild b/app-misc/realpath/realpath-1.15-r1.ebuild new file mode 100644 index 000000000000..25381f20a36d --- /dev/null +++ b/app-misc/realpath/realpath-1.15-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r1.ebuild,v 1.1 2010/04/30 17:09:52 jlec Exp $ + +EAPI=2 +inherit eutils toolchain-funcs + +DESCRIPTION="Return the canonicalized absolute pathname" +HOMEPAGE="http://packages.debian.org/unstable/utils/realpath" +SRC_URI="mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz + nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="nls" + +RDEPEND="!sys-freebsd/freebsd-bin" + +src_unpack() { + unpack ${PN}_${PV}.tar.gz + + if use nls; then + # Unpack the .deb file, in order to get the preprocessed man page + # translations. This way we avoid a dependency on app-text/po4a. + mkdir deb + cd deb + unpack ${PN}_${PV}_i386.deb + unpack ./data.tar.gz + gunzip -r usr/share/man || die "gunzip failed" + else + epatch "${FILESDIR}"/${PN}-1.15-nonls.patch + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.14-build.patch + epatch "${FILESDIR}"/${PN}-1.14-no-po4a.patch +} + +src_compile() { + tc-export CC + emake VERSION="${PV}" SUBDIRS="src man $(use nls && echo po)" \ + || die "emake failed" +} + +src_install() { + emake VERSION="${PV}" SUBDIRS="src man $(use nls && echo po)" \ + DESTDIR="${D}" install || die "emake install failed" + newdoc debian/changelog ChangeLog.debian + + if use nls; then + local dir + for dir in "${WORKDIR}"/deb/usr/share/man/*; do + [ -f "${dir}"/man1/realpath.1 ] || continue + newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1 \ + || die "newman failed" + done + fi +} -- 2.26.2