4 files changed, 52 insertions, 5 deletions
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 1530d04f02c1..1f361835f9f0 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/squashfs-tools
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.23 2005/09/12 14:39:36 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.24 2006/03/17 16:02:22 wolf31o2 Exp $
+
+*squashfs-tools-3.0 (17 Mar 2006)
+
+  17 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  squashfs-tools-2.2_p2.ebuild, +squashfs-tools-3.0.ebuild:
+  Added squashfs-tools-3.0 and marking 2.2_p2 stable on amd64/x86 wrt bug
+  #126542.
 
   12 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   -squashfs-tools-2.2.ebuild:
diff --git a/sys-fs/squashfs-tools/files/digest-squashfs-tools-3.0 b/sys-fs/squashfs-tools/files/digest-squashfs-tools-3.0
new file mode 100644
index 000000000000..ada02df9d904
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/digest-squashfs-tools-3.0
@@ -0,0 +1,3 @@
+MD5 9fd05d0bfbb712f5fb95edafea5bc733 squashfs3.0.tar.gz 384917
+RMD160 5850bf0a02297c5174481f819dc033b277ac914c squashfs3.0.tar.gz 384917
+SHA256 39dbda43cf118536deb746c7730b468702d514a19f4cfab73b710e32908ddf20 squashfs3.0.tar.gz 384917
diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.2_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.2_p2.ebuild
index 7820d92ba4b1..2ffbdf73a070 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-2.2_p2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-2.2_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.2_p2.ebuild,v 1.1 2005/09/09 12:58:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.2_p2.ebuild,v 1.2 2006/03/17 16:02:22 wolf31o2 Exp $
 
 inherit toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.0.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.0.ebuild
new file mode 100644
index 000000000000..fda36205bc68
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.0.ebuild,v 1.1 2006/03/17 16:02:22 wolf31o2 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libc
+	sys-libs/zlib"
+
+S=${WORKDIR}/squashfs${PV/_p/-r}/squashfs-tools
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "s:-O2:${CFLAGS}:" Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin mksquashfs || die
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES README-2.{0,1} README-AMD64 \
+		PERFORMANCE.README README-3.0
+}