sparc64-multilib support

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9dc4c957b46096ecb8e4d6c596d3625034978b3a..a28b6fef63887182d345b2d40a509620d951dbe3 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
+MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
 MD5 792bf823d26f12bc03b4c9c7a370374c portage-2.0.51-r3.ebuild 12546
 MD5 45d685c485d82a914b924ba6ace963e1 portage-2.0.51_rc7.ebuild 11767
 MD5 45cd332af1ba186c050ec9eeafe9e915 portage-2.0.51-r7.ebuild 12278
-MD5 379ad174e3720dad6ddd8deb352afa5b portage-2.0.51-r8.ebuild 12285
+MD5 167e7d5cdfc499ae08f5ce2604b94f50 portage-2.0.51-r8.ebuild 12728
 MD5 2200865f3cd8ee0f4bfbd91c3de84181 portage-2.0.51-r2.ebuild 12263
 MD5 63cadb5f6ef798aaa8b95a899fdea82f portage-2.0.50-r11.ebuild 11572
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70
 MD5 3da3469e2b40b9a6b37fd54b2e6c7b98 files/digest-portage-2.0.51_rc7 71
-MD5 d2608171176cc00a43ead2ed136ed328 files/digest-portage-2.0.51-r2 70
 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163
+MD5 d2608171176cc00a43ead2ed136ed328 files/digest-portage-2.0.51-r2 70
 MD5 b002fc7e6251c2417311857ded4ddc11 files/digest-portage-2.0.51-r7 70
-MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
 MD5 30e618b070e4b7e13f3dd9b3f1db6140 files/digest-portage-2.0.51-r8 70
+MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBvis2roRuSHgZdywRAiNeAJ9d6ICjX6vnA/f/g2cyNuZkPhna2wCfXbVd
-xD64jBcz+Gbf+yK9ZTQwKxI=
-=WSBu
+iD8DBQFByf+XArHZZzCEUG0RAr9wAJ98XGQqzEDVFSY/5Xqkr7xgveu/0wCfd+TK
+X6zTa0b8KpBugDi3VGOJutc=
+=RAK/
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.0.51-r8.ebuild b/sys-apps/portage/portage-2.0.51-r8.ebuild
index f6eb88e86945dfc1f151229e9df27744d64a1906..2eadca44386fb573b28dedaba4a441a3491385c2 100644 (file)
--- a/sys-apps/portage/portage-2.0.51-r8.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r8.ebuild,v 1.4 2004/12/13 23:51:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r8.ebuild,v 1.5 2004/12/22 23:13:06 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -67,6 +67,14 @@ src_compile() {
                        check_multilib
                        make CFLAGS="-O1 -pipe" HAVE_64BIT_ARCH="${MULTILIB}" || die
                        ;;
+               "sparc")
+                       if [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then
+                               check_multilib
+                               make CFLAGS="-O1 -pipe" HAVE_64BIT_ARCH="${MULTILIB}" || die
+                       else
+                               make CFLAGS="-O1 -pipe" || die
+                       fi
+                       ;;
                *)
                        if useq ppc-macos || useq x86-fbsd; then
                                ewarn "NOT BUILDING SANDBOX ON $ARCH"
@@ -126,7 +134,7 @@ src_install() {
        else
                #install sandbox
                cd ${S}/src/sandbox-1.1
-               if [ "$ARCH" == "amd64" ]; then
+               if [ "$ARCH" == "amd64" -o "${PROFILE_ARCH}" = "sparc64-multilib" ]; then
                        check_multilib
                        make DESTDIR="${D}" HAVE_64BIT_ARCH="${MULTILIB}" install || \
                        die "Failed to compile sandbox"
@@ -173,6 +181,13 @@ src_install() {
 
        #documentation
        dodoc ${S}/ChangeLog
+
+       # Fix dumb placement of libsandbox
+       if [ "${PROFILE_ARCH}" = "sparc64-multilib" -a "${MULTILIB}" = "1" ]; then
+               dodir /lib64
+               mv ${D}/lib/lib* ${D}/lib64
+               mv ${D}/lib32/lib* ${D}/lib
+       fi
 }