6 files changed, 10 insertions, 225 deletions
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 1128b4c3236f..1757965c5111 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/squashfs-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.86 2012/04/19 14:37:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.87 2012/04/24 05:42:42 jlec Exp $
+
+  24 Apr 2012; Justin Lecher <jlec@gentoo.org> -squashfs-tools-4.0.ebuild,
+  -squashfs-tools-4.0-r1.ebuild, -squashfs-tools-4.1.ebuild,
+  -squashfs-tools-4.1-r1.ebuild, metadata.xml:
+  Drop old versions, #395201
 
   19 Apr 2012; Brent Baude <ranger@gentoo.org> squashfs-tools-4.2.ebuild:
   Marking squashfs-tools-4.2 ppc64 for bug 400937
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 4bdd2fd59401..8a76920d75bf 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
-<use>
-<flag name="xz">Enable support for XZ (&quot;LZMA2&quot;) compression using <pkg>app-arch/xz-utils</pkg></flag>
-</use>
+	<herd>livecd</herd>
+	<use>
+		<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
+	</use>
 </pkgmetadata>
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 cded1990e86f..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.0-r1.ebuild,v 1.2 2010/11/14 13:49:59 jlec Exp $
-
-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=""
-
-RDEPEND="sys-libs/zlib"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die "sed failed"
-	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
-	epatch "${FILESDIR}"/${P}-read-ret.patch #292011
-	epatch "${FILESDIR}"/${P}-progress-bar.patch #292011
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README || die
-}
-
-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.0.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild
deleted file mode 100644
index 28ae8c0f62f8..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild,v 1.9 2010/11/14 13:49:59 jlec Exp $
-
-inherit toolchain-funcs
-
-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=""
-
-RDEPEND="sys-libs/zlib"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die "sed failed"
-	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 || die
-}
-
-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 7525627cba4f..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.1-r1.ebuild,v 1.1 2011/01/31 02:53:19 jer Exp $
-
-EAPI="2"
-
-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 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() {
-	sed -i \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e '/^LIBS =/s:$: $(LDFLAGS):' \
-		Makefile || die
-}
-
-use_sed() {
-	local u=$1 s="${2:-`echo $1 | tr '[:lower:]' '[:upper:]'`}_SUPPORT"
-	printf '/^#?%s =/%s\n' "${s}" \
-		"$( use $u && echo s:.*:${s} = 1: || echo d )"
-}
-src_configure() {
-	tc-export CC
-	local def
-	if use gzip; then def="gzip"
-		einfo "enabling gzip"
-	elif use lzma; then def="lzma"
-		einfo "enabling lzma"
-	elif use lzo; then def="lzo"
-		einfo "enabling lzo"
-	else
-		die "Please set at least one of the gzip, lzma and lzo USE flags as compression algorithm."
-	fi
-
-	einfo "Using ${def} as compression algorithm."
-
-	sed -i -r \
-		-e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \
-		-e "$(use_sed gzip)" \
-		-e "$(use_sed lzma XZ)" \
-		-e "$(use_sed lzo)" \
-		-e "$(use_sed xattr)" \
-		Makefile || die
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README || die
-}
-
-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.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild
deleted file mode 100644
index 173253b075e2..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild,v 1.3 2010/11/14 13:49:59 jlec Exp $
-
-EAPI="2"
-
-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 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() {
-	sed -i \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e '/^LIBS =/s:$: $(LDFLAGS):' \
-		Makefile || die
-}
-
-use_sed() {
-	local u=$1 s="${2:-`echo $1 | tr '[:lower:]' '[:upper:]'`}_SUPPORT"
-	printf '/^#?%s =/%s\n' "${s}" \
-		"$(use $u && echo s:.*:${s}=1: || echo d)"
-}
-src_configure() {
-	tc-export CC
-	local def=`usev gzip || usev lzma || usev lzo || echo gzip`
-	sed -i -r \
-		-e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \
-		-e "$(use_sed gzip)" \
-		-e "$(use_sed lzma xz)" \
-		-e "$(use_sed lzo)" \
-		-e "$(use_sed xattr)" \
-		Makefile || die
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README || die
-}
-
-pkg_postinst() {
-	ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
-}