- get rid of compiler warning when using mcpu with newer gcc. no need to force linking with mcheck when not using valgrind which fixes building with uclibc

Package-Manager: portage-2604-svn

3 files changed, 28 insertions, 13 deletions

diff --git a/app-arch/upx-ucl/ChangeLog b/app-arch/upx-ucl/ChangeLog
index 2f8e143bc0b8..a1dc1129635e 100644
--- a/app-arch/upx-ucl/ChangeLog
+++ b/app-arch/upx-ucl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/upx-ucl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/ChangeLog,v 1.7 2006/01/31 02:33:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/ChangeLog,v 1.8 2006/01/31 05:44:55 solar Exp $
+
+  31 Jan 2006; <solar@gentoo.org> upx-ucl-1.25-r1.ebuild:
+  - get rid of compiler warning when using mcpu with newer gcc. no need to force
+  linking with mcheck when not using valgrind which fixes building with uclibc
 
 *upx-ucl-1.25-r1 (30 Jan 2006)
 
diff --git a/app-arch/upx-ucl/Manifest b/app-arch/upx-ucl/Manifest
index b81d8b1fc985..8333cdd4f1df 100644
--- a/app-arch/upx-ucl/Manifest
+++ b/app-arch/upx-ucl/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 918db1157fc41b55c7045be3130607d3 ChangeLog 903
-RMD160 9b2361dd649cff0c5fc7ba9e8ee9816cd7956138 ChangeLog 903
-SHA256 c45bf094f5dcc2d3d683ece8f1b91931fe88f4634dfe44352ad59eb0e137a435 ChangeLog 903
+MD5 84260d1f113c1ee21c9b12841ab850ce ChangeLog 1122
+RMD160 582b8e5d82e3081e80884932cdbe6d098f788ffd ChangeLog 1122
+SHA256 6ce5af2fc5d17150b837ef83cff925720e97bafd4334058b0e277769dce2f364 ChangeLog 1122
 MD5 7321411d8b47a0a94a230b0a338ca0d2 files/digest-upx-ucl-1.24 64
 RMD160 265e8fb15376284bdd40b3ea409bae67fb887f90 files/digest-upx-ucl-1.24 64
 SHA256 e63aa93365dae8011e285f45d3791de2c9b9fdee53b59643f7c0e1562482b608 files/digest-upx-ucl-1.24 64
@@ -22,18 +22,18 @@ SHA256 6d7bbf68b3c6b4f1376b55f09c57f15361152d288e698ee99715d116b3582977 metadata
 MD5 ce8dfac9dddfd014d8971414b1f15c7f upx-ucl-1.24.ebuild 858
 RMD160 5407fe7da45043c183f6f6b5c772a77d9007b032 upx-ucl-1.24.ebuild 858
 SHA256 c345cf38a35b480f552ad7bddd281f7d900669cc695fca5a4ea0149fbfc5929c upx-ucl-1.24.ebuild 858
-MD5 e8cf347b50cbcae3b1bf3580ff704e2e upx-ucl-1.25-r1.ebuild 966
-RMD160 ec7a831e2a44cd02bf7b597cde9b248f8a76e0bd upx-ucl-1.25-r1.ebuild 966
-SHA256 a5a53725f7f1791b8bbcce70d058bde9c88a15e382b572932e4d901ff345149d upx-ucl-1.25-r1.ebuild 966
+MD5 b429bf5b6ca981b0e3dd902ac4dfd4db upx-ucl-1.25-r1.ebuild 1225
+RMD160 1a96da36c9d96e76b49ecf79089ad7683dea0c4f upx-ucl-1.25-r1.ebuild 1225
+SHA256 f2bced54b20298652ee3e5423d6cde6d210fa853fe54facb3dccd13463bbc373 upx-ucl-1.25-r1.ebuild 1225
 MD5 7426ca754de6b7239506586747c1b052 upx-ucl-1.25.ebuild 834
 RMD160 c6d067d38e0d72a615e6d2838a319e8af1a11dcc upx-ucl-1.25.ebuild 834
 SHA256 a27ff25747f93510c7c23cd96dfc61fbfceb05a594da596642316a34225716c0 upx-ucl-1.25.ebuild 834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iQCVAwUBQ97MbZ4WFLgrx1GWAQJldgP+Oo4Uh+Q7PsyC+wc366m/ratMYshN3QOz
-DhsiNH7XcHatW1Ge6QtzIu2JkghE71HVASsYQJxo9DuyWbgL3EEptQ2gfLHRkhZp
-MwDJSi4EmaSqdRRaJi7OiDV181DW4O5vjk3zZeRO84pxnJ14xhWxDRzgK3oxwf6U
-UJPQX0vHFP0=
-=QYpT
+iQCVAwUBQ975Y54WFLgrx1GWAQJ+ewP/V13MDBOildvNeOkWLF6LNSunNy44wstO
+NoQyHdSS0EwjCU5+Uf7ZYABkTnkZyEGLwbiHgtLLbhaEnQUHmQtkHboNIaRxJC1x
+aw7SIFYWqqbtrHoxiSVAbjfz7UGPSl38/tlZCtCquaewbG4Xh1lWqrzJoWtXNqZS
+JyYXQiwmtes=
+=YhFS
 -----END PGP SIGNATURE-----
diff --git a/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild b/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild
index 3496e9597bb4..76008a379882 100644
--- a/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild
+++ b/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild,v 1.1 2006/01/31 02:33:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild,v 1.2 2006/01/31 05:44:55 solar Exp $
+
+inherit eutils toolchain-funcs
 
 MY_P=${P/-ucl/}
 S=${WORKDIR}/${MY_P}
@@ -23,7 +25,16 @@ RDEPEND=">=dev-libs/ucl-1.02 !app-arch/upx"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	epatch "${FILESDIR}"/${PN}-${PV}-pie.patch
+
+	# used with valgrind
+	sed -i -e s/-lmcheck//g src/Makefile.bld || die
+
+	# >=gcc-3.4.x
+	if [ "`gcc-major-version`" -ge "3" ] && [ "`gcc-minor-version`" -ge "4" ]; then
+		sed -i -e s/-mcpu/-mtune/g src/Makefile.bld || die
+	fi
 }
 
 src_compile() {