Let Portage decide whether to strip executables or not (bug #152345).

Package-Manager: portage-2.1.2_pre3-r7

5 files changed, 70 insertions, 20 deletions

diff --git a/media-gfx/bootsplash/ChangeLog b/media-gfx/bootsplash/ChangeLog
index 1a17b5d24244..57b2a8fac223 100644
--- a/media-gfx/bootsplash/ChangeLog
+++ b/media-gfx/bootsplash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/bootsplash
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.62 2006/10/23 19:27:06 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.63 2006/10/23 19:37:22 spock Exp $
+
+  23 Oct 2006; Michał Januszewski <spock@gentoo.org>
+  +files/bootsplash-nostrip.patch, bootsplash-0.6.1-r7.ebuild:
+  Let Portage decide whether to strip executables or not (bug #152345).
 
   23 Oct 2006; Michał Januszewski <spock@gentoo.org>
   -bootsplash-0.6-r16.ebuild, -bootsplash-0.6.1-r4.ebuild,
diff --git a/media-gfx/bootsplash/Manifest b/media-gfx/bootsplash/Manifest
index a4d3f9423c94..d3c520f7a968 100644
--- a/media-gfx/bootsplash/Manifest
+++ b/media-gfx/bootsplash/Manifest
@@ -9,28 +9,32 @@ AUX bootsplash-gcc4-fix.patch 762 RMD160 87344fb79aff9c3a2808348d6d3ee1d4879c4d6
 MD5 5be185bdc05784f2c883e17043abb465 files/bootsplash-gcc4-fix.patch 762
 RMD160 87344fb79aff9c3a2808348d6d3ee1d4879c4d6a files/bootsplash-gcc4-fix.patch 762
 SHA256 cd8bd2d0d2127549f4902fd352aff5a0116a02d39f69d3fb26aa1b389939090d files/bootsplash-gcc4-fix.patch 762
-DIST bootsplash-core-0.6.1-r6.tar.bz2 130805
-DIST bootsplash-kernel-0.6.1-r6.tar.bz2 177574
-DIST bootsplash-themes-0.6.1.tar.bz2 416892
-EBUILD bootsplash-0.6.1-r7.ebuild 3324 RMD160 df84e56636ca6b72d8a36039cbf246f8f14a8127 SHA1 80d2972c40511c957df02a439db462a58367c594 SHA256 7396185c52aef717bd605c882acd7e3c34f48316279e1dffb4d4a37a64f465d8
-MD5 874ef39c015514f1ec4810a01679020d bootsplash-0.6.1-r7.ebuild 3324
-RMD160 df84e56636ca6b72d8a36039cbf246f8f14a8127 bootsplash-0.6.1-r7.ebuild 3324
-SHA256 7396185c52aef717bd605c882acd7e3c34f48316279e1dffb4d4a37a64f465d8 bootsplash-0.6.1-r7.ebuild 3324
-MISC ChangeLog 12401 RMD160 6a984029a14c3b62999705921dda6eab44875e45 SHA1 29d7851e79aa9297c31da28b53d1412e38c73745 SHA256 81bf2b2624409979df9af08188f00e2f428611ee6aeea350c6cb9888a7c08765
-MD5 dc27c7005327c4f8fcfba560b6a60e73 ChangeLog 12401
-RMD160 6a984029a14c3b62999705921dda6eab44875e45 ChangeLog 12401
-SHA256 81bf2b2624409979df9af08188f00e2f428611ee6aeea350c6cb9888a7c08765 ChangeLog 12401
+AUX bootsplash-nostrip.patch 1260 RMD160 254050d67bbb511b8dee3775f111db6c1990ec77 SHA1 ffe3ac161f21cb60cb2458371fe801389d2d460b SHA256 b506212a4aabce9b82dadf9d6dc24bcc258af40f5d5f5d99dc107e43de7deee4
+MD5 bbc714a8c96c2fb064ab4a23c6386aa4 files/bootsplash-nostrip.patch 1260
+RMD160 254050d67bbb511b8dee3775f111db6c1990ec77 files/bootsplash-nostrip.patch 1260
+SHA256 b506212a4aabce9b82dadf9d6dc24bcc258af40f5d5f5d99dc107e43de7deee4 files/bootsplash-nostrip.patch 1260
+DIST bootsplash-core-0.6.1-r6.tar.bz2 130805 RMD160 21cb1cd07436abe07ad052c038c28262a36908d4 SHA1 b0f8c2d5c8b2dbd551143c8649675a21ee0e5b30 SHA256 59daccd6a504d37a014cf4b794793b6db726fff21146f7ad23c5d804081d46b2
+DIST bootsplash-kernel-0.6.1-r6.tar.bz2 177574 RMD160 a78e7dc7dafc5d24501c77c85c1e23a0be0bcc01 SHA1 06f7b7d82bf06e93bf97bb89751fa5e35d35dc10 SHA256 8f70876fcf9d625ea5014d1de72bb12727431ebf14dad77bdef9a71f9ad0a55b
+DIST bootsplash-themes-0.6.1.tar.bz2 416892 RMD160 108a73f2ad0ea42f802b93df0a6172ac916505a5 SHA1 c1ddfdb6968745f1e01eab5e7c01fa868fefb554 SHA256 4880ff19e9d1078059e92e5aa46f903a038b9499fe0b4a91176c6cf75c738405
+EBUILD bootsplash-0.6.1-r7.ebuild 3369 RMD160 489572298cf51ab66097e013d77e1abef565f8a0 SHA1 84204ffa83913584c4a35aa8085d4cfc33e44a1a SHA256 17156f94b8e4b8ffac27c267b6ec1dac5dfeb0fc1bfc7662a72a63b2df58ea3c
+MD5 a8c417ab1e8618b985873b215fb80945 bootsplash-0.6.1-r7.ebuild 3369
+RMD160 489572298cf51ab66097e013d77e1abef565f8a0 bootsplash-0.6.1-r7.ebuild 3369
+SHA256 17156f94b8e4b8ffac27c267b6ec1dac5dfeb0fc1bfc7662a72a63b2df58ea3c bootsplash-0.6.1-r7.ebuild 3369
+MISC ChangeLog 12591 RMD160 2ce74b67d2f301511d09d2c47bf94db2c43dd2c2 SHA1 b46a98be98903d7c3b1a9c730247f87156a27f39 SHA256 47779ea0e32e9c6873e2f9d85b71bc433aa60db46b1c90b1b5682104b2f5b9c1
+MD5 ca1e5de8c328094f15f19fc0937026da ChangeLog 12591
+RMD160 2ce74b67d2f301511d09d2c47bf94db2c43dd2c2 ChangeLog 12591
+SHA256 47779ea0e32e9c6873e2f9d85b71bc433aa60db46b1c90b1b5682104b2f5b9c1 ChangeLog 12591
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5 metadata.xml 255
-MD5 5c26bfaea2b292570606b499e4efdb53 files/digest-bootsplash-0.6.1-r7 232
-RMD160 7e544210136b0fd292675afe861801a38a6ee58c files/digest-bootsplash-0.6.1-r7 232
-SHA256 f8ad3bcd49bff3a26a0ec92fdfcecbcb31ec9ab790205a1f30afd87ab64325b5 files/digest-bootsplash-0.6.1-r7 232
+MD5 449e387205b51d2529b5669d9c4cdca2 files/digest-bootsplash-0.6.1-r7 834
+RMD160 1e8daebcd1584dfa64b011178c7fd3de7976fc5b files/digest-bootsplash-0.6.1-r7 834
+SHA256 b97e92825fe368e1f2735ba01afb6e450ec0225324d5592cd332e17fa5f8a36c files/digest-bootsplash-0.6.1-r7 834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFPReSchej4aZK9/cRAkB+AJ4jEbIxNnYfax0RJ1+CLF8l9S2GWgCdFgc5
-bXf6ugQ1EMMpWTa8e5t1hZ4=
-=8MGm
+iD8DBQFFPRn/chej4aZK9/cRAoC8AJ90GDhQ875c1wAz/GxuwLBgd9ktngCffo3K
+LXpAmO1yZzcUFV8ZpfFbgpQ=
+=j8wS
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild b/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
index 32a993cb103f..1bb74b6bd332 100644
--- a/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild,v 1.7 2005/12/10 16:58:19 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild,v 1.8 2006/10/23 19:37:22 spock Exp $
 
 inherit eutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/bootsplash-gcc4-fix.patch
+	epatch ${FILESDIR}/bootsplash-nostrip.patch
 }
 
 src_compile() {
diff --git a/media-gfx/bootsplash/files/bootsplash-nostrip.patch b/media-gfx/bootsplash/files/bootsplash-nostrip.patch
new file mode 100644
index 000000000000..005a24d8689c
--- /dev/null
+++ b/media-gfx/bootsplash/files/bootsplash-nostrip.patch
@@ -0,0 +1,35 @@
+diff -Naurp boot-orig/utils/fbmngplay/Makefile boot/utils/fbmngplay/Makefile
+--- boot-orig/utils/fbmngplay/Makefile	2004-03-06 10:41:30.000000000 +0100
++++ boot/utils/fbmngplay/Makefile	2006-10-23 21:32:15.000000000 +0200
+@@ -11,7 +11,7 @@
+ ARCH     = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/)
+ SHELL    = /bin/sh
+ CC       = gcc
+-STRIP	 = strip
++STRIP	 = true
+ 
+ # Triggering lib64 path from spec file.
+ ifeq ($(PREFIX)x,x)
+diff -Naurp boot-orig/utils/fbtruetype/Makefile boot/utils/fbtruetype/Makefile
+--- boot-orig/utils/fbtruetype/Makefile	2003-04-21 03:07:56.000000000 +0200
++++ boot/utils/fbtruetype/Makefile	2006-10-23 21:32:27.000000000 +0200
+@@ -11,7 +11,7 @@
+ ARCH     = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/)
+ SHELL    = /bin/sh
+ CC       = gcc
+-STRIP	 = strip
++STRIP	 = true
+ 
+ # Triggering lib64 path from spec file.
+ PREFIX   ?= /usr
+diff -Naurp boot-orig/utils/splashutils/Makefile boot/utils/splashutils/Makefile
+--- boot-orig/utils/splashutils/Makefile	2004-08-05 13:25:46.000000000 +0200
++++ boot/utils/splashutils/Makefile	2006-10-23 21:32:01.000000000 +0200
+@@ -5,7 +5,6 @@ CFLAGS = -Os -Wall
+ # CFLAGS := $(CFLAGS) -DFBMNGDEBUG
+ 
+ all: $(PROGRAMS)
+-	strip $(PROGRAMS)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .o
diff --git a/media-gfx/bootsplash/files/digest-bootsplash-0.6.1-r7 b/media-gfx/bootsplash/files/digest-bootsplash-0.6.1-r7
index 1ff076217525..72e482824d99 100644
--- a/media-gfx/bootsplash/files/digest-bootsplash-0.6.1-r7
+++ b/media-gfx/bootsplash/files/digest-bootsplash-0.6.1-r7
@@ -1,3 +1,9 @@
 MD5 3ec34e6cc47d7e47825658f1f71e718f bootsplash-core-0.6.1-r6.tar.bz2 130805
+RMD160 21cb1cd07436abe07ad052c038c28262a36908d4 bootsplash-core-0.6.1-r6.tar.bz2 130805
+SHA256 59daccd6a504d37a014cf4b794793b6db726fff21146f7ad23c5d804081d46b2 bootsplash-core-0.6.1-r6.tar.bz2 130805
 MD5 61ad5145876db963402bcf166a01f94a bootsplash-kernel-0.6.1-r6.tar.bz2 177574
+RMD160 a78e7dc7dafc5d24501c77c85c1e23a0be0bcc01 bootsplash-kernel-0.6.1-r6.tar.bz2 177574
+SHA256 8f70876fcf9d625ea5014d1de72bb12727431ebf14dad77bdef9a71f9ad0a55b bootsplash-kernel-0.6.1-r6.tar.bz2 177574
 MD5 1d93157ac8796a86cc269b24bb882769 bootsplash-themes-0.6.1.tar.bz2 416892
+RMD160 108a73f2ad0ea42f802b93df0a6172ac916505a5 bootsplash-themes-0.6.1.tar.bz2 416892
+SHA256 4880ff19e9d1078059e92e5aa46f903a038b9499fe0b4a91176c6cf75c738405 bootsplash-themes-0.6.1.tar.bz2 416892