QA, imported prefix changes

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 135 insertions, 2 deletions

diff --git a/app-misc/realpath/ChangeLog b/app-misc/realpath/ChangeLog
index 4785e0f78901..e93f91157ef2 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.4 2010/06/10 03:16:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.5 2010/06/15 11:39:10 jlec Exp $
+
+*realpath-1.15-r2 (15 Jun 2010)
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> +realpath-1.15-r2.ebuild,
+  +files/realpath-1.15-prefix.patch:
+  QA, imported prefix changes
 
   10 Jun 2010; Jeroen Roovers <jer@gentoo.org> realpath-1.15-r1.ebuild:
   Stable for HPPA (bug #322919).
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index a755720f0cd1..7e133813c08c 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -1,9 +1,21 @@
+-----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
+AUX realpath-1.15-prefix.patch 1376 RMD160 d4d2c7b25449a76ec9f9359cc28d00f6a79fb051 SHA1 f8eec6945bede799f65db97e51c65ac27e163896 SHA256 3a02646e51597458ce1e42ad505c387ed0c4869b60ac5d407e7c812d24d176ab
 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 1684 RMD160 3bd7b11e15453924c82fd25363347367c376e5a7 SHA1 130c033acb208517de1c34828e1365a7924a5ccb SHA256 9dd1f44bd01722ce2265477e87a0d7c255cd2d4bea981161a083982893ddc57f
+EBUILD realpath-1.15-r2.ebuild 2373 RMD160 76fa955ba8add3afafd2cbe0bc41014e05f24612 SHA1 cfa872d142e9f7084420409cca9e3686cfadea10 SHA256 f92f132fc8caf82dfbe76b9d463c03f17d75df4ba04aeec8c504f2ee04612e86
 EBUILD realpath-1.15.ebuild 1622 RMD160 38c07807aebe4e13afe78c4b05568dae384d2d48 SHA1 72735665619d065d6016b28e264b0b04d18e554c SHA256 815c12beadef024bedf1388b2a605a08eaa77f440d79ac2dd0f15e0722b9dea3
-MISC ChangeLog 6687 RMD160 02809b894a5d9d0306794e3ad15dd409a0830aa8 SHA1 0210be59223c5b5be861a746eb2d401e3f253a27 SHA256 2d4b966968761089b862b47e34c58cc181f40d2e287e8be9e2b43cd9d25b1bdb
+MISC ChangeLog 6862 RMD160 104fc25fadcc5bad386e776a8aba31f605cde13e SHA1 80173767dae70a40b375a85e3fd80901ce94a2f7 SHA256 07f64b8536b5288b5935a288b6f0d11a9fd36f16677d74f1ce87eccebecea2c9
 MISC metadata.xml 328 RMD160 405f12dbe5abd64eccefcefead9cb2662b687b1f SHA1 c2dafdc2d68df2e12665c5b15d88010414497af1 SHA256 71d668f1cb87b5412b35f181bc761921019e7502b7b56bf7ea9aa5c514e939e0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwXZmcACgkQgAnW8HDreRafCQCgivpxgTEFABCgrVVWpvrEvh/s
+LbIAnAstnPyp6xXQYfKyg7beaBw8voME
+=sxIP
+-----END PGP SIGNATURE-----
diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch
new file mode 100644
index 000000000000..480425b2dfe6
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.15-prefix.patch
@@ -0,0 +1,41 @@
+* <grobian@gentoo.org>: /bin/sh is no good (on e.g. Solaris) same for perl
+
+--- common.mk
++++ common.mk
+@@ -8,16 +8,17 @@
+ 
+ override PACKAGE  := realpath
+ 
+-PATH            := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH)
++#PATH            := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH)
++SHELL           := @GENTOO_PORTAGE_EPREFIX@/bin/bash
+ 
+ # build abstraction
+-install_file    := install -p -o root -g root -m 644
+-install_script  := install -p -o root -g root -m 755
+-install_dir     := install -d -o root -g root -m 755
++install_file    := install -p -m 644
++install_script  := install -p -m 755
++install_dir     := install -d -m 755
+ install_link    := ln -sf
+ compress        := gzip -9f
+ 
+-prefix          := /usr
++prefix          := @GENTOO_PORTAGE_EPREFIX@/usr
+ etcdir          := /etc/$(PACKAGE)
+ bindir          := $(prefix)/bin
+ sbindir         := $(prefix)/sbin
+@@ -33,11 +34,11 @@
+ webcgidir	      := $(prefix)/lib/cgi-bin
+ applicationsdir := $(prefix)/share/applications
+ 
+-PERL            := /usr/bin/perl
++PERL            := @GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
+ CC              ?= gcc
+ CFLAGS          += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
+ LDFLAGS         +=
+-LIBS            := 
++LIBS            += 
+ 
+ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+   CFLAGS += -O0
diff --git a/app-misc/realpath/realpath-1.15-r2.ebuild b/app-misc/realpath/realpath-1.15-r2.ebuild
new file mode 100644
index 000000000000..6632fe1ff425
--- /dev/null
+++ b/app-misc/realpath/realpath-1.15-r2.ebuild
@@ -0,0 +1,74 @@
+# 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-r2.ebuild,v 1.1 2010/06/15 11:39:10 jlec Exp $
+
+EAPI="3"
+inherit eutils toolchain-funcs flag-o-matic prefix
+
+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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="!sys-freebsd/freebsd-bin"
+DEPEND="${RDEPEND}
+	elibc_IRIX? ( dev-libs/gnulib )
+	x86-interix? ( dev-libs/gnulib )
+	virtual/libintl
+	elibc_mintlib? ( virtual/libiconv )"
+
+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"
+	fi
+}
+
+src_prepare() {
+	use nls || epatch "${FILESDIR}"/${P}-nonls.patch
+	epatch "${FILESDIR}"/${PN}-1.14-build.patch
+	epatch "${FILESDIR}"/${PN}-1.14-no-po4a.patch
+	epatch "${FILESDIR}"/${P}-prefix.patch
+	eprefixify common.mk
+}
+
+src_compile() {
+	tc-export CC
+	use !elibc_glibc && append-libs -lintl
+	[[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
+	if [[ ${CHOST} == *-irix* || ${CHOST} == *-interix[35]* ]] ; then
+		append-flags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
+		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/$(get_libdir)
+		append-libs -lgnu
+	fi
+
+	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 || die
+
+	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
+}