Fix stripping issue per bug #257297. Again big thanks to Victor Ostroga.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 45 insertions, 7 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index e44047b08780..e50ffd559272 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.62 2009/05/13 21:04:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.63 2009/05/14 12:29:51 scarabeus Exp $
+
+*boinc-6.4.5-r2 (14 May 2009)
+
+  14 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/6.4.5-nostrip.patch, -boinc-6.4.5-r1.ebuild,
+  +boinc-6.4.5-r2.ebuild:
+  Fix stripping issue per bug #257297. Again big thanks to Victor Ostroga.
 
   13 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
   +files/6.4.5-gcc44.patch, boinc-6.4.5-r1.ebuild:
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index ec03f40ec1d4..5c96f30c4b98 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,8 +1,9 @@
 AUX 6.4.5-RSA_security.patch 2413 RMD160 8bf2d0573fedbdbc54f0c479747a23f0ff840f22 SHA1 e5fcafdd0da06a8a59350ff85cf3725e9ff8cede SHA256 f21a6904459ffcfd40cc0804d4a7f46e5a9ef013c217f204e100a8adf8cd4f87
 AUX 6.4.5-gcc44.patch 1831 RMD160 82aaff8e51077c712b318a473a77a69ec1e1b615 SHA1 bdd2f4baa48d7949d37150e926dcd0a0625caaf8 SHA256 63d9005aab4e60522f32484694c42f70d291b492c76a839aff348be052845fc4
+AUX 6.4.5-nostrip.patch 1052 RMD160 9a23c9cd8f3a47fe53fe8cccfca6d0b94587f716 SHA1 bae0a9de0c0980fd1f64e8b60a74548554dbe382 SHA256 f301d68819c4d93b930d4179ff2bb604d23ca7e221d843c6ed6cf65f27a53da2
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
 AUX boinc.init 3083 RMD160 5e3dffe7cf45f91b340b9e2bfd2986b1b2a25b36 SHA1 3fb5ab86d900c71ae3546f979fe8953082a7b884 SHA256 06508a2a77854e2ad08d61a796d9c3a49e00d9e35850afabf67e60b275e08bcf
 DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc SHA1 24c63d11c8e9ebda17beac359928407ce3b8678d SHA256 f6f1d053f10873ed9b3b6ce8dc4444a49f6c804196a3eb080f574db36e58557a
-EBUILD boinc-6.4.5-r1.ebuild 4420 RMD160 73421ea8ed5735b8a5f08fb608fb5144ffae4429 SHA1 abfada7ff9f2bbc2241e45241028056702917a52 SHA256 5b84f7fb9b629036e94447ef6b7f1da7c41639380e2a64034b87a17e4e011142
-MISC ChangeLog 11924 RMD160 7ca7ec104397e4a875be1b3f326742f639127203 SHA1 1e24b1dabe77ed2b0cd6db9867fd5bc54a700ed2 SHA256 c5869298339aee57c8677c2a35c19e5bafe343601aea97680eacee08ebdbcbc8
+EBUILD boinc-6.4.5-r2.ebuild 4466 RMD160 86846db2091d9fcca4d47b48308c39fa1f300aac SHA1 d8797beb4592a4aa5ec926ba031f421eeefb74cd SHA256 521aa70eb81600c6433c01a09c470b6cebf0867a9194bffaec2ad325e65ba97e
+MISC ChangeLog 12163 RMD160 93950c476567da3c233eaada5150ca92f2572659 SHA1 0ac45a5a3c534d23f8c5e654802086ef801d9e00 SHA256 43488df01ed165e72d9882c16a8ad6dae167039f288138890678325670bb5f8c
 MISC metadata.xml 697 RMD160 8cfc36bbae9395d2675629d68af1c6354244bd5f SHA1 bcfd28d367a81a6fa8b6a548703270cb066a9392 SHA256 614f44eeb4b76fccb040b9ab7dee69e50152c930a9224946010f39e7eed6e04c
diff --git a/sci-misc/boinc/boinc-6.4.5-r1.ebuild b/sci-misc/boinc/boinc-6.4.5-r2.ebuild
index db34712a498c..17e63ca61284 100644
--- a/sci-misc/boinc/boinc-6.4.5-r1.ebuild
+++ b/sci-misc/boinc/boinc-6.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r1.ebuild,v 1.7 2009/05/13 21:04:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r2.ebuild,v 1.1 2009/05/14 12:29:51 scarabeus Exp $
 
 #
 # Don't forget to keep things in sync with binary boinc package!
@@ -54,11 +54,11 @@ src_prepare() {
 	cp "${S}"/sea/*.png "${S}"/clientgui/res/
 	# RSA Security bug fix. Per bug #258011
 	# GCC 4.4 Compilation issue. Per bug #269618
+	# Fix stripping. Per bug #257297
 	epatch \
 		"${FILESDIR}"/${PV}-RSA_security.patch \
-		"${FILESDIR}"/${PV}-gcc44.patch
-	# fix stripping
-	## TODO
+		"${FILESDIR}"/${PV}-gcc44.patch \
+		"${FILESDIR}"/${PV}-nostrip.patch
 }
 
 src_configure() {
diff --git a/sci-misc/boinc/files/6.4.5-nostrip.patch b/sci-misc/boinc/files/6.4.5-nostrip.patch
new file mode 100644
index 000000000000..cc9da4cef949
--- /dev/null
+++ b/sci-misc/boinc/files/6.4.5-nostrip.patch
@@ -0,0 +1,30 @@
+diff -NrU5 boinc-6.4.5.orig/client/Makefile.in boinc-6.4.5/client/Makefile.in
+--- boinc-6.4.5.orig/client/Makefile.in	2009-05-14 00:59:41.000000000 -0600
++++ boinc-6.4.5/client/Makefile.in	2009-05-14 01:01:10.000000000 -0600
+@@ -1330,11 +1330,10 @@
+ @CLIENT_BIN_FILENAME@: boinc_client
+ 	rm -f $@
+ 	rm -f $@.unmodified
+ 	cp $? $@.unmodified
+ 	@LN@ $? $@
+-	@STRIP@ $@
+ 
+ clean-local:
+ 	rm -f @CLIENT_BIN_FILENAME@
+ 	rm -f @CLIENT_BIN_FILENAME@.unmodified
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff -NrU5 boinc-6.4.5.orig/lib/Makefile.in boinc-6.4.5/lib/Makefile.in
+--- boinc-6.4.5.orig/lib/Makefile.in	2009-05-14 00:59:41.000000000 -0600
++++ boinc-6.4.5/lib/Makefile.in	2009-05-14 01:00:31.000000000 -0600
+@@ -950,11 +950,10 @@
+ @CLIENT_CMD_BIN_FILENAME@: boinc_cmd$(EXEEXT)
+ 	rm -f $@
+ 	rm -f $@.unmodified
+ 	cp $? $@.unmodified
+ 	@LN@ $? $@
+-	@STRIP@ $@
+ 
+ clean-local:
+ 	rm -f @CLIENT_CMD_BIN_FILENAME@
+ 	rm -f @CLIENT_CMD_BIN_FILENAME@.unmodified
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.