QA, imported prefix changes

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 122 insertions, 1 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/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
+}