Version bump. Install translated man pages with USE=nls, bug 269905.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 106 insertions, 11 deletions

diff --git a/app-admin/realpath/ChangeLog b/app-admin/realpath/ChangeLog
index 36a3e80483c8..9f17b319245f 100644
--- a/app-admin/realpath/ChangeLog
+++ b/app-admin/realpath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/realpath
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/ChangeLog,v 1.41 2009/05/19 22:11:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/ChangeLog,v 1.42 2009/06/13 09:37:26 ulm Exp $
+
+*realpath-1.15 (13 Jun 2009)
+
+  13 Jun 2009; Ulrich Mueller <ulm@gentoo.org> realpath-1.14-r1.ebuild,
+  +realpath-1.15.ebuild:
+  Version bump. Install translated man pages (extracted from deb file) with
+  USE=nls again, bug 269905.
 
 *realpath-1.14-r1 (19 May 2009)
 
diff --git a/app-admin/realpath/Manifest b/app-admin/realpath/Manifest
index aaa0b1a3eeb1..eba72ea43f93 100644
--- a/app-admin/realpath/Manifest
+++ b/app-admin/realpath/Manifest
@@ -5,14 +5,18 @@ AUX realpath-1.14-build.patch 1019 RMD160 d9a19eadd3ef17347e901d00f662f9b265581e
 AUX realpath-1.14-no-po4a.patch 288 RMD160 0c652a04b84432353b0547dba1454a4784350ee6 SHA1 0ef6f48971ffd947e09361225c1faf6d2f6f6c32 SHA256 5fc4321c8e6a3906366d198d309768de026b628ec320bf4c00c137f9fa6eeacc
 DIST realpath_1.12.tar.gz 5758 RMD160 9b156fb2edfe814e67ed5be759f4d40a50c1bd39 SHA1 ed710508b8255682e12cb510c7c35b418fca6656 SHA256 3bb156ebe4b34ded4f0653e8c18a32d1209d65a73c910b6ac1c54aab22b5ea8d
 DIST realpath_1.14.tar.gz 15504 RMD160 8655a853c6d2e836391114e7a10ce6098464fa2e SHA1 652e911a55dad22394b0946c07a10d3fcb458570 SHA256 3c6f8efd5ab095121c9f5b284b138c642e796aa2d7e06a2dabb9fa112709cba1
+DIST realpath_1.14_i386.deb 13278 RMD160 3e65d0a9527b817b7e5c67089a3a8c75c2b29bb3 SHA1 1ca482730fe2dea26de2dfbdeb5ef3ca15c5f5de SHA256 b866f85320c1005bebb5ed70746e6b1e205bb135a4a509a142bea0fb0ceae283
+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.12.ebuild 791 RMD160 5d60bd90b6f500518790b0c294fa04c67ab84a37 SHA1 3205eb6f22133ad1ff9147cd52b30757b1e4eb32 SHA256 de5c293d38dea0f5f09990fe02cb7e99c934c1db545eb4461b42a0d659793dc9
-EBUILD realpath-1.14-r1.ebuild 898 RMD160 aba7d6385e17cfdf370b6d7b302a57601dcad1f5 SHA1 2cdaae2f45bac25a5eef48e97dbe29b830daad70 SHA256 29fee501434dd0ac56e659fac45a3fef23b8eeb640c5f6b8b9767ae31992ba74
-MISC ChangeLog 5180 RMD160 0e6350df5903ff1dbdb0af26e6416fb15910112c SHA1 65c521d510e3aac061b07a6c3e8f4a29c39d3942 SHA256 eef010996fb8cef972cdd9e7ca4c8c1064b041de142a0ea33d8d301ee7e51be9
+EBUILD realpath-1.14-r1.ebuild 1606 RMD160 3ab3403ec1ebeb03a99bfccee926834092abeaa6 SHA1 6a792fa22868a04040394d33eb79ed57f1dfeca4 SHA256 1079600776faa8447f6257e2935d51414b9a9fa22cbe73b4c754b9910af8dc70
+EBUILD realpath-1.15.ebuild 1615 RMD160 242be90dfb425490be1321b46aeeb12eae3c007f SHA1 8eb9c849866c5c9204faeea0a2f4b9d45053de99 SHA256 423fffa7709f04402a175b4098046f8a27b7234605d188cc5ed71598c71cb3d0
+MISC ChangeLog 5413 RMD160 6bb75916dcab39ba0273397b3f5f0409a1a8ae90 SHA1 41804a08a41eba6a64cf43481871c2ce832be94e SHA256 aca806d861a39a468ef1bf4be8e99e84f3b69f689b91e77e379e20863e2213ff
 MISC metadata.xml 330 RMD160 5950556892ea6f23923cffac156e97738e7fa100 SHA1 c2de52e56f312be68eb5f2966ca0fa62f07c3a4a SHA256 f17d27a5a01ee6d023639016bc98148c14af2ec8566c7253d4049941c1e54760
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkoTLvgACgkQOeoy/oIi7uyt/ACcCPAk7TtVfvxST+SIJN2V7JKL
-MMMAoIT0FKeK3E/lHAbXyzcmqZ94GSo1
-=WnU+
+iEYEARECAAYFAkozc7oACgkQOeoy/oIi7uxuiQCg13ftM+hSziLbuTh0Vwbr7iju
+ZQgAoIKLSaUC6oUBc/o1ilTgiki9+zGT
+=kyzK
 -----END PGP SIGNATURE-----
diff --git a/app-admin/realpath/realpath-1.14-r1.ebuild b/app-admin/realpath/realpath-1.14-r1.ebuild
index 6b5591f40cd9..d0e980fc18a4 100644
--- a/app-admin/realpath/realpath-1.14-r1.ebuild
+++ b/app-admin/realpath/realpath-1.14-r1.ebuild
@@ -1,21 +1,36 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.14-r1.ebuild,v 1.1 2009/05/19 22:11:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.14-r1.ebuild,v 1.2 2009/06/13 09:37:26 ulm 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"
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+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"
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-no-po4a.patch
@@ -23,10 +38,21 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake VERSION="${PV}"|| die "emake failed"
+	emake VERSION="${PV}" SUBDIRS="src man $(use nls && echo po)" \
+		|| die "emake failed"
 }
 
 src_install() {
-	emake VERSION="${PV}" DESTDIR="${D}" install || die "emake install failed"
+	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
 }
diff --git a/app-admin/realpath/realpath-1.15.ebuild b/app-admin/realpath/realpath-1.15.ebuild
new file mode 100644
index 000000000000..26b45aa4a900
--- /dev/null
+++ b/app-admin/realpath/realpath-1.15.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.15.ebuild,v 1.1 2009/06/13 09:37:26 ulm 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 ~mips ~ppc ~ppc64 ~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"
+	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
+}