Restore strip/binchecks RESTRICT, it does NOT work without them, bug #296294

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 11 insertions, 30 deletions

diff --git a/dev-embedded/scratchbox-devkit-qemu/ChangeLog b/dev-embedded/scratchbox-devkit-qemu/ChangeLog
index b9c52a26a368..4d24339e4fa2 100644
--- a/dev-embedded/scratchbox-devkit-qemu/ChangeLog
+++ b/dev-embedded/scratchbox-devkit-qemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/scratchbox-devkit-qemu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox-devkit-qemu/ChangeLog,v 1.4 2010/01/07 21:38:23 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox-devkit-qemu/ChangeLog,v 1.5 2010/01/18 05:44:36 tester Exp $
+
+  18 Jan 2010; Olivier Crête <tester@gentoo.org>
+  -scratchbox-devkit-qemu-0.10.0.0.5.ebuild,
+  scratchbox-devkit-qemu-0.10.0.0.10.ebuild:
+  Restore strip/binchecks RESTRICT, it does NOT work without them, bug
+  #296294
 
 *scratchbox-devkit-qemu-0.10.0.0.10 (07 Jan 2010)
 
diff --git a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild b/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild
index 0364e00c075d..f4d760e4ad6a 100644
--- a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild
+++ b/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild,v 1.1 2010/01/07 21:38:23 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild,v 1.2 2010/01/18 05:44:36 tester Exp $
 
 SBOX_GROUP="sbox"
 
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
+RESTRICT="strip binchecks"
+
 RDEPEND="=dev-embedded/scratchbox-1.0*"
 RDEPEND=""
 
diff --git a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.5.ebuild b/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.5.ebuild
deleted file mode 100644
index b0021cc0fced..000000000000
--- a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.5.ebuild,v 1.3 2009/11/30 11:07:21 flameeyes Exp $
-
-SBOX_GROUP="sbox"
-
-MYPV=0.10.0-0sb5
-MYP=${PN}-${MYPV}
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier."
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${MYP}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-RDEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}