add prefix support (bug #434530)

Package-Manager: portage-2.2.0_alpha125/cvs/Linux i686

3 files changed, 29 insertions, 33 deletions

diff --git a/sys-devel/pmake/ChangeLog b/sys-devel/pmake/ChangeLog
index 7585129610af..9f90f4d14ff5 100644
--- a/sys-devel/pmake/ChangeLog
+++ b/sys-devel/pmake/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/pmake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/ChangeLog,v 1.45 2012/06/27 11:46:04 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/ChangeLog,v 1.46 2012/09/11 01:30:35 ottxor Exp $
+
+  11 Sep 2012; Christoph Junghans <ottxor@gentoo.org> pmake-1.111.3.1.ebuild:
+  add prefix support (bug #434530)
 
   27 Jun 2012; Naohiro Aota <naota@gentoo.org> pmake-1.111.3.1.ebuild:
   Add CFLAGS to build on gcc-4.7. #423013
@@ -165,4 +168,3 @@
   
   Initial import, thanks to Spider's work for getting it 100% :).
   
-
diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest
index abcff225789c..309ac0ad6829 100644
--- a/sys-devel/pmake/Manifest
+++ b/sys-devel/pmake/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pmake-1.111.1-ldflags.patch 484 RMD160 fca7d1773d302b3f82e8bbf9f9d11f7b84270c40 SHA1 0470faf8bdb50cdae594da39f7a853f8ff6154a4 SHA256 64bfa9f5d832c6a7ffd19c133c5f061ab347f69da0130141b54d378f2173fd89
-AUX pmake-1.98-skipdots.patch 513 RMD160 384425fe18ab9b8dca9233c12c23bf9b81ad7bd5 SHA1 4004eef24bcfbaf779ae326e026ebcddada40180 SHA256 4d12778d4940012a98773fc4c180418f3409529beadc909921dc07d2c8b4e32d
-DIST pmake_1.111-3.1.debian.tar.gz 32176 RMD160 66e6f8485c173ece4c8d447a09a59414d411f7ea SHA1 190a85e7030f2683ec8c511edaaea633605ac280 SHA256 964101c5c06f32161398bf6efa0c52e59763523bd633fded6eb165ec3d025da7
-DIST pmake_1.111.orig.tar.gz 264383 RMD160 d1acb558b3b89fa9f1665ab16fb93aad281bd776 SHA1 9209414f7daacdc79f33ab7839ebf592f65ead1d SHA256 dde37ac618f19a7cce174754c207e90501cab362b51f904bcfb20dfb24a13539
-EBUILD pmake-1.111.3.1.ebuild 2423 RMD160 22e49cf0f5bc92f75f179f67aac97415c987cc8b SHA1 acbcd125602e188eeacd5e9eb9d77196d0338b9d SHA256 134aedd0a0370b2576724878b7ec80b9771b2c48fb12e2dd160ce173af8078a6
-MISC ChangeLog 5829 RMD160 d965e65658f06cf563ed0829269b8234f22ce9fc SHA1 059155853cfcf463f3894bb1dc73133ed92ff4f3 SHA256 ce22653b1879920c68b13d41a9296043805adb30e654b26df651af95b6187fa7
-MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
+AUX pmake-1.111.1-ldflags.patch 484 SHA256 64bfa9f5d832c6a7ffd19c133c5f061ab347f69da0130141b54d378f2173fd89 SHA512 10276e6caa4e339a2e7c787ee04dc97187d48cf433cd6148ec5451ae055d638f79c8d8950c94fe84cdffa02b20519423272f09a6ee669ab026db861442051849 WHIRLPOOL 05995b5ffb2fe2b1a84ac38890ad17fd568645e5a8f796665311f09afd7fb69047d8289481843fe7d25f4efbe2d222dc0a3e5bd098f4609a0da01126241f79b7
+AUX pmake-1.98-skipdots.patch 513 SHA256 4d12778d4940012a98773fc4c180418f3409529beadc909921dc07d2c8b4e32d SHA512 ccd751cca406abdb763f251c147f7b7efd7b001e415bc8c98a4fa8069420b64c3a5819b4abd5f174606390f903f8cba5e560e02a14519619713da26ab52c54ad WHIRLPOOL 8e70f4400ec3f560b94a2fb01b01a4227d4e719b487d53e9862c3c8ddf31a9d160f4524e6f9dedb3dea511caa22e8f86b708bdd059f0cf464433fb080a9a2113
+DIST pmake_1.111-3.1.debian.tar.gz 32176 SHA256 964101c5c06f32161398bf6efa0c52e59763523bd633fded6eb165ec3d025da7 SHA512 a5743c0b0478119cf8ac01b0182f14cf213b275078b1cd2badee9ac26a3b40660bf4fd430af079fdaa7bc8117ed8a1cdf855166e34e151204e34e7d2b67beee3 WHIRLPOOL 155682e807d06b9df0a8ce37f1e98250246ea7cda12f7342cf25388b08f4e5d4b1cb3aa4922a4dbd37f6ffcba0918ae32d37686f91abeca6517cfafe0bffedac
+DIST pmake_1.111.orig.tar.gz 264383 SHA256 dde37ac618f19a7cce174754c207e90501cab362b51f904bcfb20dfb24a13539 SHA512 ad48708ea014d6a38ad36303504c52992b51a1e815564f1710849d859b1fc3cd58c4a1a71f54ec902c9b69112e9cd1e1a64282ff738439cdb209a4f75c364c22 WHIRLPOOL c3038682686acc4c32e25efb3db623b06f7f1d6df5813389319cc32151207f0cb93e44bedd82e7486907cbb9f0950a4a80c811eb1b6a148083bef23f613a7ec2
+EBUILD pmake-1.111.3.1.ebuild 2474 SHA256 1f2d80d5ca670cb98fdc9e230845f8bf9016a83cd1014a9798f427fc1c84165c SHA512 47d9976122a3dbd0e8286be61c8298f7e3cebedbb5401a117b5a184af44ec588b3af6a9c8c8301aa5e5e3ac5313ff49cb47e1f0aebb5071b5cab26eeac6be362 WHIRLPOOL fe8378e12836d825d11ecd39a2ee5d40b0e56c988bf38cfee34dc58316a7c723c7d9b3a50ef0574db9769a322fdda1e7d374cdfd7b67b0dee60de301670dc3d9
+MISC ChangeLog 5943 SHA256 814bdfa3bfaed84682ee0da62a6bfe6e98f60327824298455664477a397161b7 SHA512 ffcf9798c3bad1db9d740a131ac7da637b53f1a70564a3ed51bd3be7090f91f34eebc12c6dac4114e8be21f3408cf445d92320bbd69993ecd2c0f5e6a2bda774 WHIRLPOOL 2feab193148cbfa523d8c9080e16b7af869fbd3563aa6829ffbfc986cfad33f3af6a9a050bd0cc239667af37a52014a8a76d3f47a85a69245097275cbd8c8764
+MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP6vJ+AAoJEDYO1FT4VRUUeSEP/3r/fK67ZIa6AcMJ8LNLyMHH
-G03TTPhYp2V8+RYkxCggC/qcppDbmF4vlE+JZUjU8v6jKCU5RZVdVT+Emqv8Vz8B
-g7RvrfbQ9qEd5NNZv5SFhHgvPmkvXoNKh3V3BRAhxNS7h1i8yz1nIUqdReIY0YjV
-UJHeG0tPRclSKkYO2/WpkL0MCpN2TK7rGQo9BX8qxV5iXm3tz/t8LlaE33x0Z0fE
-cuTrSdh0tHeejRHZd0rMIEarC0vaEJsfRxwp4w7mvNuw8w1MKRfhYf7xB1gOAjzX
-omZ6phZjNSzfw50CUvM2yIOkdBO5vWsbu5RlVjf2eNvSqZZ+8PkKrtyA+2rnfvva
-OfdcuA4yPf+RY26g0vCQUliprjU0NAKoEkhpkwDbzK17PlxAsfMrF3rSMPwtLHOC
-HoAVGkDcK++ygALp7v+cWtalnL4O4TuR0KY4Qv7l3PpLVlu01uIuLz4/4ssDKpeT
-DggE8Kc+BHRgku0wpw9o0H56Om9ZoDaOliXdfo+8TMsXK5cvg6MemNtQUY0rv3ex
-gRlLX6DM75bcXMGYmAx9Zikg3Pxd9XkthwTHg2QTbXaFIqzKso6FlLlALpkoXYYn
-b+t9wJkqiYWCrJp4w+sy0WlAXFht9xLPkYzUiuc6jyW4YFkMiVgfJW49/u0ON8zV
-HwQrzzNglfqLK9V8rzuG
-=yA56
+iQEcBAEBCAAGBQJQTpRBAAoJEOeBhlrCAAWGi34H/2/FFQIe50k5K0DZEAAs2905
+HXg+u2lEPihpY3m8Dn3zTHIcqKokdKdlXvVFFktQIHO+jAdkAy11+OcCH2DeJ3bL
+DdYlOhgHT02JHnJr1tY7xChd8QkDuULkfsvxdinHyQ0B7kpaYJqQG5L8BQsQ3DNN
+Ysx8T4N6wTvEOIqBmPqjdNkAhuXktkH1IYUGzz3rDZu0EBdRTqih5oW1hCyUldjL
+0NRyD3+mOdnJL0lk3PB4///gf1oGWS6na0Hqh6/eYv/27nNe540JzXOqJiVFnXxY
+7x5jCIiVds08GTEMMLVzyRt3oWXe7tTqd4Ab2f8z9nwkMsTgumEErQBf/LK/dgY=
+=byey
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/pmake/pmake-1.111.3.1.ebuild b/sys-devel/pmake/pmake-1.111.3.1.ebuild
index bb6d88de9e95..4b4da5c2d63f 100644
--- a/sys-devel/pmake/pmake-1.111.3.1.ebuild
+++ b/sys-devel/pmake/pmake-1.111.3.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.111.3.1.ebuild,v 1.7 2012/06/27 11:46:04 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.111.3.1.ebuild,v 1.8 2012/09/11 01:30:35 ottxor Exp $
+
+EAPI=4
 
 inherit eutils toolchain-funcs versionator
 
@@ -15,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
@@ -23,10 +25,7 @@ DEPEND=""
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	EPATCH_FORCE="yes" \
 		EPATCH_OPTS="-g0 -E --no-backup-if-mismatch -p1" \
 		EPATCH_SUFFIX="diff" \
@@ -50,15 +49,16 @@ src_compile() {
 		-DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_SETENV \
 		-D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -I. \
 		-DMACHINE=\\\"gentoo\\\" -DMACHINE_ARCH=\\\"$(tc-arch-kernel)\\\" \
+		-D_PATH_DEFSHELLDIR=\\\"${EPREFIX}/bin\\\" \
+		-D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk\\\" \
 		-DHAVE_VSNPRINTF"
 	if [[ "${USERLAND}" == "GNU" ]]; then
-		CFLAGS="${CFLAGS} -D_PATH_DEFSYSPATH=\\\"/usr/share/mk/${PN}\\\""
+		CFLAGS="${CFLAGS} -D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk/${PN}\\\""
 	fi
 
 	emake -f Makefile.boot \
 		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		|| die "make failed"
+		CFLAGS="${CFLAGS}"
 }
 
 src_install() {
@@ -68,8 +68,8 @@ src_install() {
 		doins mk/*
 	fi
 
-	newbin bmake pmake || die "newbin failed"
-	dobin mkdep || die "dobin failed"
+	newbin bmake pmake
+	dobin mkdep
 	mv make.1 pmake.1
 	doman mkdep.1 pmake.1
 	dodoc PSD.doc/tutorial.ms