Add archwrap, bump kernel, form-history-control. Cleanup old

5 files changed, 6 insertions, 105 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 7900451b..50f33c89 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sys-fs/squashfs-tools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  29 Jan 2012; Martin Väth <martin@mvath.de>
+  Remove old.
+
   31 Mar 2011; Martin Väth <martin@mvath.de>
   Bump 4.2 from tree.
 
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index a9af3662..3e575ecf 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,5 +1,3 @@
 DIST squashfs3.2-r2.tar.gz 314764 RMD160 6f21ad0ee90e4b5c6ad2b0b92c96d24af8e19531 SHA1 e38c16c09435291b2c97aa0a321c29da442ff686 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7
 DIST squashfs3.4.tar.gz 352660 RMD160 e75c9a9e5220e80a8e321536f8fe8372bfe5d830 SHA1 6933a8f3098d94f93ec4002a54026b15a6e11640 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339
-DIST squashfs4.0.tar.gz 103979 RMD160 b67dd14ff7255d245617466566ac29d9a08aff68 SHA1 3efe764ac27c507ee4a549fc6507bc86ea0660dd SHA256 18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21
-DIST squashfs4.1.tar.gz 122769 RMD160 7768e9680a640af851ece8eaa0ae443a69fc2283 SHA1 7f9b1f9839b3638882f636fd170fd817d650f856 SHA256 3a870d065a25b3f5467bc6d9ed34340befab51a3f9e4b7e3792ea0ff4e06046a
 DIST squashfs4.2.tar.gz 133173 RMD160 e23a273c91c1d676b72f68d72610c03c430395ec SHA1 e0944471ff68e215d3fecd464f30ea6ceb635fd7 SHA256 d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild
deleted file mode 100644
index a88f887e..00000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-EAPI="4"
-inherit toolchain-funcs eutils
-
-MY_PV=${PV}
-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 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="+progress-redirect"
-
-RDEPEND="sys-libs/zlib"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-src_prepare() {
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die "sed failed"
-	use progress-redirect && \
-		epatch "${FILESDIR}/${P}-progress-stderr.patch"
-	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README
-}
-
-pkg_postinst() {
-	ewarn "This version of mksquashfs requires a 2.6.29 kernel or better."
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.1-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.1-r1.ebuild
deleted file mode 100644
index 2b7d6bf9..00000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-EAPI="4"
-inherit toolchain-funcs eutils
-
-MY_PV=${PV}
-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="+gzip +lzma lzo +progress-redirect xattr"
-
-RDEPEND="gzip? ( sys-libs/zlib )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	!lzma? ( !lzo? ( sys-libs/zlib ) )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-src_prepare() {
-	use progress-redirect && \
-		epatch "${FILESDIR}/${PN}-4.0-progress-stderr.patch"
-	sed -i \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e '/^LIBS =/s:$: $(LDFLAGS):' \
-		Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-	local def=`usev gzip || usev lzma || usev lzo || echo gzip`
-	sed -i -r \
-		-e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \
-		-e "/^#?GZIP_SUPPORT =/`use gzip && echo s:.*:GZIP_SUPPORT=1: || echo d`" \
-		-e "/^#?XZ_SUPPORT =/`use lzma && echo s:.*:XZ_SUPPORT=1: || echo d`" \
-		-e "/^#?LZO_SUPPORT =/`use lzo && echo s:.*:LZO_SUPPORT=1 :|| echo d`" \
-		-e "/^#?XATTR_SUPPORT =/`use xattr && echo s:.*:XATTR_SUPPORT=1 :|| echo d`" \
-		Makefile || die
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README
-}
-
-pkg_postinst() {
-	ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
index 0e2f7367..e1bb2f34 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header $
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
 IUSE="+gzip +lzma lzo +progress-redirect xattr"
 
 RDEPEND="