cross-compile fixes

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index d8f3e2a3c4bed70dbf7ceaecea6ce4ef0d82c6f4..6d50e528a1116d6bc5ecc3b53cf4ccd6d89aa797 100644 (file)
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,6 +1,16 @@
-MD5 ba5dab4104c6aa8a855ce8ee59d7ba6f squashfs-tools-2.1_p2.ebuild 1877
-MD5 b00bf438a67cc741581c1839ac6330ff squashfs-tools-2.0_p2.ebuild 1868
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6b6650144e9d2eeb13ffbb371841177e ChangeLog 3076
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 86ce054d32ff035a76b26bbf0bd90fb2 files/digest-squashfs-tools-2.0_p2 66
+MD5 d44efd93a9694093add1b0827739822d squashfs-tools-2.1_p2.ebuild 1903
+MD5 b00bf438a67cc741581c1839ac6330ff squashfs-tools-2.0_p2.ebuild 1868
 MD5 79b98e5d18ebd17486dca6802a1ac7d4 files/digest-squashfs-tools-2.1_p2 66
+MD5 86ce054d32ff035a76b26bbf0bd90fb2 files/digest-squashfs-tools-2.0_p2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB24SSroRuSHgZdywRAjFNAJ9ok/RJDW2eepz21t+XOhk1m65fmACdEozz
+FCAdwDQm3MS402N9wXi4e8s=
+=rMaW
+-----END PGP SIGNATURE-----

diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild
index 9ceb26527fba079c82a9b973f08d7606d57f5767..26dfedffedcb4d8ab0109297aed768f89405426a 100644 (file)
--- a/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild,v 1.1 2004/12/15 19:40:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild,v 1.2 2005/01/05 06:09:08 vapier Exp $
 
+inherit toolchain-funcs
 
 MY_PV=${PV/_p/-r}
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
 HOMEPAGE="http://squashfs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc
-       sys-libs/zlib
-       >=sys-apps/sed-4"
-
 RDEPEND="virtual/libc
        sys-libs/zlib"
+DEPEND="${RDEPEND}
+       >=sys-apps/sed-4"
 
 S=${WORKDIR}/squashfs${PV/_p/-r}/squashfs-tools
 
@@ -28,14 +28,14 @@ src_unpack() {
 }
 
 src_compile() {
-       emake || die
+       emake CC="$(tc-getCC)" || die
 }
 
 src_test() {
-       ./mksquashfs *.c *.h ${T}/squashfs && einfo "sucessfully created filesystem" \
+       ./mksquashfs *.c *.h ${T}/squashfs \
+               && einfo "sucessfully created filesystem" \
                || die "failed to create filesystem"
-       if ! fgrep -q squashfs ${ROOT}/proc/filesystems;
-       then
+       if ! fgrep -q squashfs ${ROOT}/proc/filesystems ; then
                modprobe squashfs || ewarn "no squashfs modules - test not completed"
                touch ${T}/modprobe
                fgrep -q squashfs ${ROOT}/proc/filesystems || \