Added patch to fix 'QA Notice: pre-stripped files found'

Package-Manager: portage-2.1.2_rc1-r6

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 03bf381aa28ef4cbe9b30a2e54d503264d6117a0..c567e6cbfa13e09f7d420f2cf07cd856ef2ab4fb 100644 (file)
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/rox
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.24 2006/11/13 17:25:59 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.25 2006/11/16 16:30:30 lack Exp $
+
+  16 Nov 2006; Jim Ramsay <lack@gentoo.org> +files/rox-2.5-nostrip.patch,
+  rox-2.5.ebuild:
+  Added patch to fix 'QA Notice: pre-stripped files found'
 
   13 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> rox-2.5.ebuild:
   Stable on sparc wrt #155015

diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index ddd3606770d00158652c71869ae3943a551e246f..2f271a2fcb0dab83abd026bd2b01a83968fe066b 100644 (file)
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rox-2.2.0-gcc4.patch 746 RMD160 454cea01e0afaab42ce40d13e1778cda90a31238 SHA1 d8259eaaccf3abc1f36974993ca14286940c9375 SHA256 97dfd3b338f7da7462b06d586ba9933c819d3f2fbed64e18d809d08ef2ced813
 MD5 6582a6fac3d7f42181413ef84b8ef834 files/rox-2.2.0-gcc4.patch 746
 RMD160 454cea01e0afaab42ce40d13e1778cda90a31238 files/rox-2.2.0-gcc4.patch 746
 SHA256 97dfd3b338f7da7462b06d586ba9933c819d3f2fbed64e18d809d08ef2ced813 files/rox-2.2.0-gcc4.patch 746
+AUX rox-2.5-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SHA1 b9f0fe536442382a393e059ed8a2c830663427cb SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc
+MD5 f2e89f5a5d685a0015bb66308a0ec6b8 files/rox-2.5-nostrip.patch 664
+RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc files/rox-2.5-nostrip.patch 664
+SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc files/rox-2.5-nostrip.patch 664
 DIST 01_all_rox-cvs-fix.patch.bz2 52369 RMD160 e3a18045f6aac0862b5dd13c152fe150093d62ce SHA256 0f20cf0e1f976cd270756f8f0a068e82ebd0e923016401d2cadc8ddd0a8bc8b2
 DIST rox-2.2.0.tgz 2033724 RMD160 6fe46202ddd3f04c07a0eaaabde88eb776c535dd SHA1 1653a11058eed9858bfd828392e9329c0ac39104 SHA256 31bdaa795c4b166a665460289db8adaea2708bc67c1fe8b3d34a569a784d3d2a
 DIST rox-2.3.tgz 2246715 RMD160 073227bf60046e325e6b414c19db62fa1be3d43d SHA256 268704b4dd5910a8713afc36a8e53f728516b766a635a4a361fb034a47689ba0
@@ -26,14 +27,14 @@ EBUILD rox-2.4.1.ebuild 2160 RMD160 5b6802d3a453c7d7f6642db938c87e579b74c1a3 SHA
 MD5 d5cae12863add1501a2021e0a10aa112 rox-2.4.1.ebuild 2160
 RMD160 5b6802d3a453c7d7f6642db938c87e579b74c1a3 rox-2.4.1.ebuild 2160
 SHA256 0acab63e5b5cb0691b983254ce59b6d2f3298ec74f16b90e3a4b7e07af47e54b rox-2.4.1.ebuild 2160
-EBUILD rox-2.5.ebuild 2154 RMD160 5e755e2d473713308181f4e820c1d5c09922cbac SHA1 01424eba215517ae5a2e0eed148fe2a5ed5203cf SHA256 099bc1c1720858a87332ed77f1ee7637509e0bb235332781e4877ea623bf80a2
-MD5 fa91f9617d0590943123f2de0cc1c547 rox-2.5.ebuild 2154
-RMD160 5e755e2d473713308181f4e820c1d5c09922cbac rox-2.5.ebuild 2154
-SHA256 099bc1c1720858a87332ed77f1ee7637509e0bb235332781e4877ea623bf80a2 rox-2.5.ebuild 2154
-MISC ChangeLog 8427 RMD160 663db297130f4965aba6bc3b59ca035f2f2e2828 SHA1 f0adf7fa36a149cf141299f826df497413fd4d47 SHA256 b90e9737ab523e22286b255d731541506a23351a2d3aa276d8b8887c3f29c326
-MD5 aee57f6fdec506f6dc1e9a311ca71302 ChangeLog 8427
-RMD160 663db297130f4965aba6bc3b59ca035f2f2e2828 ChangeLog 8427
-SHA256 b90e9737ab523e22286b255d731541506a23351a2d3aa276d8b8887c3f29c326 ChangeLog 8427
+EBUILD rox-2.5.ebuild 2323 RMD160 a5ba26ca473a98e7b195aa727e55ad9a6390ec9b SHA1 045f80660cadf0dc05d7305cc5f64f6e7c6f5673 SHA256 45dc7ef4294599d8e0fbee93bf3a2f23ccd36a21aa54182e034f0d491d3b5bf1
+MD5 90813f156e6c1cf37c42ccf741c67ff0 rox-2.5.ebuild 2323
+RMD160 a5ba26ca473a98e7b195aa727e55ad9a6390ec9b rox-2.5.ebuild 2323
+SHA256 45dc7ef4294599d8e0fbee93bf3a2f23ccd36a21aa54182e034f0d491d3b5bf1 rox-2.5.ebuild 2323
+MISC ChangeLog 8575 RMD160 8fe4a6985750e36ea528412bb39de1882f066dfe SHA1 6ca2ce37afdef8e08a23366aaf81e9fa599f68e4 SHA256 bdd367dc7ccc50d4f4b68d23f5b75678e166ad4e275630b0cf75fb12944d866f
+MD5 53e1cf372ddff634e5376a9b57701c25 ChangeLog 8575
+RMD160 8fe4a6985750e36ea528412bb39de1882f066dfe ChangeLog 8575
+SHA256 bdd367dc7ccc50d4f4b68d23f5b75678e166ad4e275630b0cf75fb12944d866f ChangeLog 8575
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -53,10 +54,3 @@ SHA256 f95cd49a245bec5fa93eebaf33fff85f7748c7a91fe5664fc611f7882fe6ba4a files/di
 MD5 129b0aba331c1b60b4f4d36dc9ec6285 files/digest-rox-2.5 247
 RMD160 e88ed5793da89d95aa649731e02ac493946768c8 files/digest-rox-2.5 247
 SHA256 80aa922b52d2abdb4c36a84de64c7898fbe8ac09f547d26e969e4e32b015e3cb files/digest-rox-2.5 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFWKp6KRy60XGEcJIRAiKRAKC060015qCtDqT0QZnSdZ+RXKGxUQCeO3aF
-Pntoq2xu9CZbuoNVUmgL0oA=
-=b8uc
------END PGP SIGNATURE-----

diff --git a/rox-base/rox/files/rox-2.5-nostrip.patch b/rox-base/rox/files/rox-2.5-nostrip.patch
new file mode 100644 (file)
index 0000000..2a63ce7
--- /dev/null
+++ b/rox-base/rox/files/rox-2.5-nostrip.patch
@@ -0,0 +1,20 @@
+Index: ROX-Filer/src/Makefile.in
+===================================================================
+--- ROX-Filer/src/Makefile.in  (revision 4834)
++++ ROX-Filer/src/Makefile.in  (working copy)
+@@ -51,10 +51,12 @@
+ ${PROG}: ${OBJECTS}
+       ${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS}
+       mv "${PROG}" "${PLATFORM_DIR}"
++
++${PROG}.dbg: ${PROG}
+       -(cd "${PLATFORM_DIR}" && \
+-       objcopy --only-keep-debug ROX-Filer ROX-Filer.dbg && \
+-       strip ROX-Filer && \
+-       objcopy --add-gnu-debuglink=ROX-Filer.dbg ROX-Filer)
++       objcopy --only-keep-debug ${PROG} ${PROG}.dbg && \
++       strip ${PROG} && \
++       objcopy --add-gnu-debuglink=${PROG}.dbg ${PROG})
+ 
+ clean:
+       rm -f *.o Makefile.bak

diff --git a/rox-base/rox/rox-2.5.ebuild b/rox-base/rox/rox-2.5.ebuild
index bed06b93f88f02fa2f5df500455bd2754e978504..4e5fcfb7be1adb109c893912280c083b769c974a 100644 (file)
--- a/rox-base/rox/rox-2.5.ebuild
+++ b/rox-base/rox/rox-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.5.ebuild,v 1.3 2006/11/13 17:25:59 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.5.ebuild,v 1.4 2006/11/16 16:30:30 lack Exp $
 
 inherit eutils
 
@@ -34,6 +34,12 @@ ROXAPPDIR="/usr/lib/rox"
 MIMEDIR="/usr/share/mime"
 MIMECONFDIR="/etc/xdg/rox.sourceforge.net"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch "${FILESDIR}"/${P}-nostrip.patch
+}
+
 src_compile() {
 
        cd ROX-Filer
@@ -45,7 +51,12 @@ src_compile() {
 
        ./AppRun --compile || die "make failed"
        (cd src; make clean) > /dev/null
-       # don't need this directory anymore
+       # don't need these directories anymore
+       if [ -n "${KEEP_SRC}" ]; then
+               (cd src; make clean) > /dev/null
+       else
+               rm -rf src
+       fi
        rm -fr build
 
        # Restore the original AppRun