added prefix support (bug #432262)

(Portage version: 2.2.0_alpha131/cvs/Linux i686)

5 files changed, 70 insertions, 46 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/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() {