Fix installation with USE=client on 64-bits Solaris targets

Package-Manager: portage-2.2.01.20048-prefix/cvs/SunOS i386

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 11305531981607d6655f05e178556ffb806cbeff..3bebca959764ad2239f127f4fe8523dedee03e12 100644 (file)
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.203 2012/01/06 11:30:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.204 2012/01/10 11:33:50 grobian Exp $
+
+  10 Jan 2012; Fabian Groffen <grobian@gentoo.org> gdb-7.3.1-r1.ebuild:
+  Fix installation with USE=client on 64-bits Solaris targets
 
   06 Jan 2012; Fabian Groffen <grobian@gentoo.org> gdb-7.3.1-r1.ebuild:
   Marked ~x64-freebsd

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 78a007e6ef599f8f8f05b18e75d7139f78765781..3820e89c6ec965845540189b4c47766f18be9c46 100644 (file)
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -27,16 +27,16 @@ EBUILD gdb-7.0.1.ebuild 2662 RMD160 b0b28b127070a76420944c4b33bed46f73bf79b3 SHA
 EBUILD gdb-7.1.ebuild 2621 RMD160 11f84a78dbe93023ad5ee5cb726284f84bba8d3b SHA1 288f227938c607bc551e190a80a2e460e2be6e21 SHA256 46ba95a663ac81bfdb61b43f0b19ab05ae6f287fdd49a5174f492fe1cf5aca36
 EBUILD gdb-7.2.50.20101117.4.15.ebuild 3089 RMD160 b6ecd83162d74f5977678a1b48625949a2ef897b SHA1 0b73196b1914b7a4aaebc07f96c20ab293bd80bc SHA256 8f4c0108099ddc82cafd77896a1fa1b07a30f0bfec02909d61a84b9b93b070fc
 EBUILD gdb-7.2.ebuild 3498 RMD160 97d6ae6747660a07b8587d1c9bd92d99fb4261b4 SHA1 60236219e3e25cc8df44735fd45668d0b222e1d1 SHA256 72398724872bd5cd6c5a2b7d5881f8958bcc8958fdbcbb59e2772005cb964817
-EBUILD gdb-7.3.1-r1.ebuild 5077 RMD160 208df70064f81c35ff9131498462e7075b08f115 SHA1 94f4ad4d5db51077ced335a0a28fc4cf5c9e34e2 SHA256 eef8f80e4c2f5f81f88de02f9047b59587b90c4eda3cb621910ba25c9e2879e9
+EBUILD gdb-7.3.1-r1.ebuild 5276 RMD160 23185a1bc25d5c67f3a213f1174000382469b5bd SHA1 0d200d7191158060beebc0e224c87e6a29b36612 SHA256 d0fc67e25af15a028444fc67a8bee05d3601054c59a76ec649bc73c955b8aed7
 EBUILD gdb-7.3.1.ebuild 3893 RMD160 19826cc6db479129f2c35ea812361905a607f47f SHA1 72b23ee81f4c653bad9b1e2640a91774bd6fe483 SHA256 415526fc6a3bac187e9cc00b022d5dfd61ba07d5c56aa758519047f080cc1b32
 EBUILD gdb-7.3.ebuild 3801 RMD160 59f24f3a7276a440fc4162863d52706febadea9b SHA1 a0a4aa9d51c7e5396d53e40536117b6c86277c30 SHA256 69aa29131061561ec60165e2f65e74a897ae2a5f51799ddce2c048a7a6606855
 EBUILD gdb-9999.ebuild 5058 RMD160 cc6ea92417a331461b8f3b4f21e553bc834fc2a0 SHA1 702c2e0652d0507e50e6072aa8466849f41690a8 SHA256 f919c5dbfc58067864e3a50fed27beba76f0ed06732d0eb1e46398f7bbfaf8ce
-MISC ChangeLog 27079 RMD160 15ab3b525c703c42b7f3b0c475b6c23fb60bf6c3 SHA1 2d402ee560db21e30857e77e23dbbb443ae0a415 SHA256 28789e704e0f5d176accb5e36c023944632c90cd5fb95eac9216f7b7f9616eec
+MISC ChangeLog 27214 RMD160 9b739ddd6927f8378fcc950e0db3d1d4c58afa1f SHA1 736c9944c93c940d759249ec8e8959877209dce1 SHA256 eac84bd4b43641b1c616964d1421ee9cb64311520af4ed264f204237d744e373
 MISC metadata.xml 552 RMD160 05c46fb5af7dc382b5977a47dac90f077ddf7b68 SHA1 2aab7d540d4b18a618bf34d962c63ae9f7e18aed SHA256 e86791dadf315a7a079e460854bcc4a28d7c69a93694efc85014b325824b81cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (SunOS)
 
-iEYEARECAAYFAk8G20UACgkQX3X2B8XHTonGuQCfck+LzV+rfJD3sywODampFsKf
-SwIAnjgaiLzL4ELSEpGAzJGnw/RvGZjk
-=PBa8
+iEYEARECAAYFAk8MIiYACgkQX3X2B8XHTokeIwCeO8FtGuQenEgGbbuvQd7zYyG5
+bpUAoKB/XVPdGZOeE5Qz0vPpq5bptf99
+=e2w3
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/gdb/gdb-7.3.1-r1.ebuild b/sys-devel/gdb/gdb-7.3.1-r1.ebuild
index f29a7e3d9d216097d4a127694b064aabc78fb0f7..7e98e87baa756cd0398f4bcf6b38834261fd6605 100644 (file)
--- a/sys-devel/gdb/gdb-7.3.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.4 2012/01/06 11:30:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.5 2012/01/10 11:33:50 grobian Exp $
 
 EAPI="3"
 
@@ -132,7 +132,17 @@ src_test() {
 src_install() {
        use server && ! use client && cd gdb/gdbserver
        emake DESTDIR="${D}" install || die
-       use client && { rm "${ED}"/usr/lib*/libiberty.a || die ; }
+       if use client; then
+               case ${CHOST} in
+                       x86_64-*-solaris*|sparcv9-*-solaris*)
+                               # usr/lib/64 -> usr/lib/{sparcv9,amd64} (no usr/lib64!)
+                               rm "${ED}"/usr/lib/*/libiberty.a || die
+                               ;;
+                       *)
+                               rm "${ED}"/usr/lib*/libiberty.a || die
+                               ;;
+               esac
+       fi
        cd "${S}"
 
        # Don't install docs when building a cross-gdb