Let portage handle the stripping of binaries.

(Portage version: 2.0.51.22-r1)

5 files changed, 21 insertions, 9 deletions

diff --git a/app-arch/unzip/ChangeLog b/app-arch/unzip/ChangeLog
index dc224ab06cb0..ed497da1371d 100644
--- a/app-arch/unzip/ChangeLog
+++ b/app-arch/unzip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/unzip
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.27 2005/03/13 08:11:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.28 2005/05/31 15:18:54 swegener Exp $
+
+  31 May 2005; Sven Wegener <swegener@gentoo.org> unzip-5.50-r2.ebuild,
+  unzip-5.52.ebuild:
+  Let portage handle the stripping of binaries.
 
 *unzip-5.52 (13 Mar 2005)
 
diff --git a/app-arch/unzip/unzip-5.50-r2.ebuild b/app-arch/unzip/unzip-5.50-r2.ebuild
index 1aab0e44b0fd..4c2a125f260d 100644
--- a/app-arch/unzip/unzip-5.50-r2.ebuild
+++ b/app-arch/unzip/unzip-5.50-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.50-r2.ebuild,v 1.20 2005/03/13 08:10:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.50-r2.ebuild,v 1.21 2005/05/31 15:18:54 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND=""
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
@@ -24,6 +24,7 @@ src_unpack() {
 		-e "s:-O3:${CFLAGS}:" \
 		-e "s:CC=gcc LD=gcc:CC=$(tc-getCC) LD=$(tc-getCC):" \
 		-e "s:-O :${CFLAGS} :" \
+		-e "s:LF2 = -s:LF2 = :" \
 		unix/Makefile \
 		|| die "sed unix/Makefile failed"
 }
diff --git a/app-arch/unzip/unzip-5.52.ebuild b/app-arch/unzip/unzip-5.52.ebuild
index 27983c7ec996..60bbaace84b9 100644
--- a/app-arch/unzip/unzip-5.52.ebuild
+++ b/app-arch/unzip/unzip-5.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.52.ebuild,v 1.1 2005/03/13 08:11:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.52.ebuild,v 1.2 2005/05/31 15:18:54 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-RDEPEND=""
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
@@ -23,6 +23,7 @@ src_unpack() {
 		-e "s:CC=gcc :CC=$(tc-getCC) :" \
 		-e "s:LD=gcc :LD=$(tc-getCC) :" \
 		-e "s:-O :${CFLAGS} :" \
+		-e "s:LF2 = -s:LF2 = :" \
 		unix/Makefile \
 		|| die "sed unix/Makefile failed"
 }
diff --git a/app-shells/sash/ChangeLog b/app-shells/sash/ChangeLog
index 79bd7eb9bc10..3c6586ec945d 100644
--- a/app-shells/sash/ChangeLog
+++ b/app-shells/sash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-shells/sash
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.34 2005/01/02 21:48:35 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.35 2005/05/31 15:23:41 swegener Exp $
+
+  31 May 2005; Sven Wegener <swegener@gentoo.org> sash-3.7.ebuild:
+  Let portage handle the stripping of binaries.
 
   02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-shells/sash/sash-3.7.ebuild b/app-shells/sash/sash-3.7.ebuild
index 548042647582..7bc972cd34eb 100644
--- a/app-shells/sash/sash-3.7.ebuild
+++ b/app-shells/sash/sash-3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7.ebuild,v 1.21 2005/04/09 18:47:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7.ebuild,v 1.22 2005/05/31 15:23:41 swegener Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -14,7 +14,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="readline"
 
 DEPEND=">=sys-libs/zlib-1.1.4
-	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )"
+	readline? (
+		>=sys-libs/readline-4.1
+		>=sys-libs/ncurses-5.2
+	)"
 RDEPEND=""
 
 src_unpack() {
@@ -27,7 +30,7 @@ src_unpack() {
 
 	sed -i \
 		-e "s:-O3:${CFLAGS}:" \
-		-e "/^LDFLAGS /s:$: ${LDFLAGS}:" \
+		-e "/^LDFLAGS /s: -s$: ${LDFLAGS}:" \
 		Makefile || die "sed failed"
 }