added prefix support (bug #432262)

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

6 files changed, 88 insertions, 50 deletions

diff --git a/app-shells/mksh/ChangeLog b/app-shells/mksh/ChangeLog
index 8eb72f34a27f..0c3fff97053d 100644
--- a/app-shells/mksh/ChangeLog
+++ b/app-shells/mksh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/mksh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.33 2012/04/07 00:49:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.34 2012/09/22 20:04:21 ottxor Exp $
+
+  22 Sep 2012; Christoph Junghans <ottxor@gentoo.org>
+  +files/mksh-40f-etc-configurable.patch, -files/mksh-39c-urandom-write.patch,
+  mksh-40f.ebuild, mksh-9999.ebuild:
+  added prefix support (bug #432262)
 
 *mksh-40f (07 Apr 2012)
 
@@ -151,4 +156,3 @@
 
   22 Jun 2005; Hanno Boeck <hanno@gentoo.org> +mksh-23.ebuild:
   Initial commit by the request of Mirabile.
-
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 1f2a2008c49c..f546baf04094 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,6 +1,20 @@
-AUX mksh-39c-urandom-write.patch 479 SHA256 77ff00ee60aa0f7164a4c02d63ec17d7e6b31a15d2ddb39808e3d2e029ae0879 SHA512 707e6124926578edf47301a87ce049511fdc8bb51e1fcbb437a508327414ad1824292b7aa9c9ac7e8e7118132031dac7d37057903860fd0d76d75dfe99743050 WHIRLPOOL 2e6ef47d654b0febb0a3cb4b9570e73867239433bf9914edcbb5cbc989fa320f52a98746f87675e33c42707afc39baedf456faca871f2bc748d1f782ff4fb626
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX mksh-40f-etc-configurable.patch 993 SHA256 9908537998a8d41b011449c69b451d2cce7929f42fe755728c38a43728f00ab6 SHA512 d382fcdae6b5ad6940c0fff01a114209f91f5420f6f28771aec63f92bcea0b1ef274cd0919b5258f605dd84698c949db22e887f27cc7e42f85b6799c0ff63125 WHIRLPOOL 2012280d92af631cd1cecc78568a4b1895bce221b10b346228a9edffb43fc3507a40d75e37b7aa3343afe305473ce0b623c261cbffc3b251538e07ea43074f39
 DIST mksh-R40f.cpio.gz 331196 SHA256 d8657102f3e9f0c432388f1c820821ebe0eee442739604293488e6266c298762 SHA512 a396ef02aecd713d44597da286bac2bdfe12f12f9712ebc21825283f3900bfca5b79125ca7e191c9970bde761e7873fc68ad3c822238e70697d65eb373560c75 WHIRLPOOL 4627639d67155cdfe09d0bff1fc16abf4111654a8538378ed4465fd71013e9562869c967bdcecf7c300712363775ef6cd67ae51c1cb52424c6a1ae36f2db68f8
-EBUILD mksh-40f.ebuild 850 SHA256 7771fc68b1a3cf5f465cc61ab4dd390978ca7e9665bb476953121f0f171fb62e SHA512 6fb073555967cc1f0dbbc7638a905cf582d3e673ef6e845520904a6dc2c6f699620b2e98a0dc2a2e95bbd14c2e0a37814224e03b3e409f29061c371d10660882 WHIRLPOOL b882c8edfb836dfa15344b9b1c58bfd783c44fe8d12fc7d235a48b4ed634b28ca046bc4778a213b70b6ebca2538f232df1c89a4dc67365cd3c5b322cecb9541f
-EBUILD mksh-9999.ebuild 703 SHA256 d5a9dbe93373cf8c4439ab8bcc2260c4686d98b1f70102e5ffd5057d8d57d919 SHA512 0b3fb8084239878bab170e8f72e3910404bec77252245eefb9537957ea71aabf8a869154008cf68d6820abc08f377bafb3baa179e316f9212a1e914f6eed2bfd WHIRLPOOL 474cd42ad31a3bd39096767f025dc37fc752c814a1cbb467982a6dcf6a94527f204e51f1ca2928bb4256fb1d66fcb67ca6d237fc0757c7df321205cd7ad66ceb
-MISC ChangeLog 4057 SHA256 5762b758abbf407c8650d3c473bfd91173949e1a3dde2b87bdabb48479e7ef35 SHA512 84f907d50f314da537d0ec45085bb28faedef6871bfe3c672b053b311893100866e062dcab0b83a76f06ed94c265ed86608d771a3e9017d2a0a856fb587db137 WHIRLPOOL de6950a572f6e0681fe3efeff4ccc506fa39a640bc1c6d7269969cd70e1ed8722227f938621d0e1cd90e04729304ab0806d21da590bf4c3f784b6f782e5d02f3
+EBUILD mksh-40f.ebuild 959 SHA256 88fc1a1a62fe3729ec3934f61a713095b7aafda29bceda124562986a22c6deea SHA512 9cc3b7ee637d98fa902d83f50f4416877ddd80994571bc538bd68adb2a5721a01ae67de2ac12dad371432011e39c1b93eb282fb1b6a9a2b8e5a526ea1dec94b8 WHIRLPOOL 0a23e99b86c0f235c343ddfc583923e615ea0d2a1d41e366079a38cf79bb9561e5cf37f699d12d51b802a0b0b5a6c5af26117841e6acf3f2142010a5331fd03f
+EBUILD mksh-9999.ebuild 966 SHA256 f653ee74b70107212e2a2adb40a577e833058b4e22d80755d35a3d9aa2d68b8a SHA512 05a30be5c65cb0b8ae937bcbfe31be6475f10efc7a36c4bb924fcbdce4525f2a43546e4dceb2fa09ed71bdd2c7cbfbfb631bb00d74507a9499ae160266de73c1 WHIRLPOOL af62e73ba96650ea81f33f2761fc5ba8cc46e0873c073a77d41273c815a026205333cdf53908aca05a23b23bfd17af11b18f47b6cff8d0d1617521e6467f37e9
+MISC ChangeLog 4263 SHA256 9e96c9f140430acd2aef5583ca3b0d3e36721a88fd1c4c0e63b7584130dde080 SHA512 ef339a2c376811a7b64287705aecc35fdd1dc408c63ba67a6c033a304e9b0641f18508eccc2aec8c7589165c61ee34b202973296e915582f12edfcc4385cc50f WHIRLPOOL 260e02f35abcc55835404648ad766a4eb0365749185efd4d5d638a95283f70358a00cb27103a0ad231eb5707c76149d52030b5dda510893e0268b614bcce5f7b
 MISC metadata.xml 196 SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445 SHA512 ba2a04029fc9fd51726e618311fc0d5ca87333acb0c067a353000a5e0cd31a9f4095adc14faae4d1f14409303051f381c66c3a4cd6ac6699a9476193ac7030f4 WHIRLPOOL 002f8951fc98cfd1917aeef67a1ef0fbc7b662f4cce3c4d9735f198ec8fcaa7e258524a80dbdea1eb485db6faae224dfb317af827582c0777faeba8cd2950ccb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQXhnLAAoJEOeBhlrCAAWGDucH/0cYzxb7fOvTT1UiCQ7j1zzO
+PVC3Br/vA2xXoAOLrQeZD2dadQEJp+J/cnUmvmZro42JEh0kIBuPbXCIl3NBtVcq
+swKKhZi2PMqVQ9fZQcCEkpusu4HKP5MRVWwwblfU9xBrdLoRkr/wouMd+F//Tw1O
+ZCOCDQ7jSay0HOphDWysyZ/d4DEhPAFJEtymkYa1CylPov50aM2emImUYdkX6Fp/
+IPmjhyhPWy0+6xJbEsxGP0HRYw4cJp3xfUtdOoB+zfUnQbFPyEJ748XZyGgDF8cu
+Q9TIMq9LTumHs1Or6pMUG3po952Wd7UJhHvg1iifFnhk7hMp4mFbUoE/dthpW7E=
+=WmeG
+-----END PGP SIGNATURE-----
diff --git a/app-shells/mksh/files/mksh-39c-urandom-write.patch b/app-shells/mksh/files/mksh-39c-urandom-write.patch
deleted file mode 100644
index 59f8a762c5d0..000000000000
--- a/app-shells/mksh/files/mksh-39c-urandom-write.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: work/mksh/arc4random.c
-===================================================================
---- work.orig/mksh/arc4random.c
-+++ work/mksh/arc4random.c
-@@ -367,14 +367,7 @@ arc4_writeback(uint8_t *buf, size_t len,
- 	memcpy(buf, &num, sizeof (num));
- 	return (do_rd ? 0 : 1);
- #else
--	int fd;
--
--	if ((fd = open(__randomdev, O_WRONLY)) != -1) {
--		if (write(fd, buf, len) < 4)
--			do_rd = 1;
--		close(fd);
--	}
--	return (do_rd || fd == -1 ? 0 : 1);
-+	return (0);
- #endif
- }
- 
diff --git a/app-shells/mksh/files/mksh-40f-etc-configurable.patch b/app-shells/mksh/files/mksh-40f-etc-configurable.patch
new file mode 100644
index 000000000000..5d2b2e769a1a
--- /dev/null
+++ b/app-shells/mksh/files/mksh-40f-etc-configurable.patch
@@ -0,0 +1,30 @@
+Index: sh.h
+===================================================================
+RCS file: /cvs/src/bin/mksh/sh.h,v
+retrieving revision 1.579
+retrieving revision 1.580
+diff -u -r1.579 -r1.580
+--- sh.h	24 Aug 2012 19:03:21 -0000	1.579
++++ sh.h	24 Aug 2012 19:09:34 -0000	1.580
+@@ -959,15 +959,16 @@
+ 
+ /* Determine the location of the system (common) profile */
+ 
+-/* This is deliberately not configurable via CPPFLAGS */
++#ifndef MKSH_DEFAULT_PROFILEDIR
+ #if defined(ANDROID)
+-#define MKSH_ETC_LOCATION	"/system/etc"
++#define MKSH_DEFAULT_PROFILEDIR	"/system/etc"
+ #else
+-#define MKSH_ETC_LOCATION	"/etc"
++#define MKSH_DEFAULT_PROFILEDIR	"/etc"
++#endif
+ #endif
+ 
+-#define MKSH_SYSTEM_PROFILE	MKSH_ETC_LOCATION "/profile"
+-#define MKSH_SUID_PROFILE	MKSH_ETC_LOCATION "/suid_profile"
++#define MKSH_SYSTEM_PROFILE	MKSH_DEFAULT_PROFILEDIR "/profile"
++#define MKSH_SUID_PROFILE	MKSH_DEFAULT_PROFILEDIR "/suid_profile"
+ 
+ 
+ /* Used by v_evaluate() and setstr() to control action when error occurs */
diff --git a/app-shells/mksh/mksh-40f.ebuild b/app-shells/mksh/mksh-40f.ebuild
index 0766b6fb620e..ec7056d7dd2d 100644
--- a/app-shells/mksh/mksh-40f.ebuild
+++ b/app-shells/mksh/mksh-40f.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-40f.ebuild,v 1.1 2012/04/07 00:49:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-40f.ebuild,v 1.2 2012/09/22 20:04:21 ottxor Exp $
 
-inherit eutils
+EAPI=4
+
+inherit eutils toolchain-funcs unpacker
 
 DESCRIPTION="MirBSD KSH Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
@@ -10,27 +12,28 @@ ARC4_VERSION="1.14"
 SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DEPEND="app-arch/cpio"
 RDEPEND=""
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	gzip -dc "${DISTDIR}/${PN}-R${PV}.cpio.gz" | cpio -mid
+src_prepare(){
+	epatch "${FILESDIR}/${P}-etc-configurable.patch"
 }
 
 src_compile() {
 	tc-export CC
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
 	# we can't assume lto existing/enabled, so we add a fallback
 	sh Build.sh -r -c lto || sh Rebuild.sh || die
 }
 
 src_install() {
 	exeinto /bin
-	doexe mksh || die
-	doman mksh.1 || die
-	dodoc dot.mkshrc || die
+	doexe mksh
+	doman mksh.1
+	dodoc dot.mkshrc
 }
 
 src_test() {
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index de81ca435daa..7f2931834046 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,38 +1,45 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.2 2011/02/13 00:22:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.3 2012/09/22 20:04:21 ottxor Exp $
 
-inherit eutils cvs
+EAPI=4
 
-ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
-ECVS_MODULE="mksh"
-ECVS_USER="_anoncvs"
-ECVS_AUTH="ext"
+inherit eutils toolchain-funcs
+
+if [[ $PV = 9999 ]]; then
+	inherit cvs
+	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
+	ECVS_MODULE="mksh"
+	ECVS_USER="_anoncvs"
+	ECVS_AUTH="ext"
+	KEYWORDS=""
+else
+	inherit unpacker
+	DEPEND="app-arch/cpio"
+	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz"
+	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+fi
 
 DESCRIPTION="MirBSD Korn Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
-DEPEND=""
+DEPEND="${DEPEND}"
 RDEPEND=""
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	cvs_src_unpack
-}
-
 src_compile() {
 	tc-export CC
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
 	sh Build.sh -r || die
 }
 
 src_install() {
 	exeinto /bin
-	doexe mksh || die
-	doman mksh.1 || die
-	dodoc dot.mkshrc || die
+	doexe mksh
+	doman mksh.1
+	dodoc dot.mkshrc
 }
 
 src_test() {