fix with 2.4 thanks to Christophe Garault <gentoo@garault.org> in bug 140375, remove old

(Portage version: 2.1.1_pre2-r8)
 (Unsigned Manifest commit)

11 files changed, 8 insertions, 388 deletions

diff --git a/sys-fs/cloop/Manifest b/sys-fs/cloop/Manifest
index ee451e90db67..4fb89d7ad364 100644
--- a/sys-fs/cloop/Manifest
+++ b/sys-fs/cloop/Manifest
@@ -1,66 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX cloop-2.01.5-netinet-gentoo.patch 535 RMD160 b115bc77cbb454e86e05777a612c7c0406470f10 SHA1 a0f753fc34a32a833913c46d1cb09037aad47291 SHA256 4c21c78717c8c51fbc1d7d4a9f9a48f63c7f1cd55bd321c6c32dba8050861a55
-MD5 a4ba7f6242034c7d6253cb26c32c1dc1 files/cloop-2.01.5-netinet-gentoo.patch 535
-RMD160 b115bc77cbb454e86e05777a612c7c0406470f10 files/cloop-2.01.5-netinet-gentoo.patch 535
-SHA256 4c21c78717c8c51fbc1d7d4a9f9a48f63c7f1cd55bd321c6c32dba8050861a55 files/cloop-2.01.5-netinet-gentoo.patch 535
-AUX cloop-2.02.1-netinet-gentoo.patch 538 RMD160 847494273d2a1a5e128ae17e09a2d981a14acb18 SHA1 518de891119df1bec4646122776a0fbd4ffcb9df SHA256 5db49be233041ce801508448d25d1adf601de4181b09786a87eb095f43d26d5b
-MD5 d5cbfe4d18b529a9dfb5fc67675cfa09 files/cloop-2.02.1-netinet-gentoo.patch 538
-RMD160 847494273d2a1a5e128ae17e09a2d981a14acb18 files/cloop-2.02.1-netinet-gentoo.patch 538
-SHA256 5db49be233041ce801508448d25d1adf601de4181b09786a87eb095f43d26d5b files/cloop-2.02.1-netinet-gentoo.patch 538
-AUX cloop.fix-7z-syntax-for-gcc-3.4.patch 2071 RMD160 f32cb29f89a3aab27d32f7a74d072692a34acaee SHA1 2c2af7276d015078ea2a6cc82ab4d1f112408315 SHA256 45d5aca91b98185ce9c90dacee026479ccef7fcff35f4c2d3a96bb4e5bb023c4
-MD5 4666ce65a6ce33f0a2c449fcec7e0488 files/cloop.fix-7z-syntax-for-gcc-3.4.patch 2071
-RMD160 f32cb29f89a3aab27d32f7a74d072692a34acaee files/cloop.fix-7z-syntax-for-gcc-3.4.patch 2071
-SHA256 45d5aca91b98185ce9c90dacee026479ccef7fcff35f4c2d3a96bb4e5bb023c4 files/cloop.fix-7z-syntax-for-gcc-3.4.patch 2071
-AUX cloop.fix-Makefile-for-kernel-2.6-and-amd64.patch 2121 RMD160 42c38152b54bcf3d0e133e9723470e630d437bb6 SHA1 cc952a426655f876320a5dbb41af2a488c043c0e SHA256 a2e646f368d07dd9f589754461c4e4dba0f03e88ac11fd5e455480f3e87ea0dd
-MD5 ab48f2b1094c297eaa04e42906bf652b files/cloop.fix-Makefile-for-kernel-2.6-and-amd64.patch 2121
-RMD160 42c38152b54bcf3d0e133e9723470e630d437bb6 files/cloop.fix-Makefile-for-kernel-2.6-and-amd64.patch 2121
-SHA256 a2e646f368d07dd9f589754461c4e4dba0f03e88ac11fd5e455480f3e87ea0dd files/cloop.fix-Makefile-for-kernel-2.6-and-amd64.patch 2121
-AUX cloop.fix-create_compressed_fs-segfault-on-amd64.patch 1091 RMD160 45e4c7f743355bf18aad2eb8f3e0b072cc347135 SHA1 37663c85d4e3042b5e5f04c7c9c566fa0c5f133e SHA256 935d3d4f36337ab63ac23df71739d19c75b68b4b1353261cdc38325129aa4f76
-MD5 a2d63d27b9964865fe89d44549587504 files/cloop.fix-create_compressed_fs-segfault-on-amd64.patch 1091
-RMD160 45e4c7f743355bf18aad2eb8f3e0b072cc347135 files/cloop.fix-create_compressed_fs-segfault-on-amd64.patch 1091
-SHA256 935d3d4f36337ab63ac23df71739d19c75b68b4b1353261cdc38325129aa4f76 files/cloop.fix-create_compressed_fs-segfault-on-amd64.patch 1091
-AUX cloop.fix-incompatible-kernel-2.6.7-and-later.patch 995 RMD160 4110d932952db7e6f180ac27316675d34c684157 SHA1 71391846b42ac90105c02409104810fbb86b014b SHA256 1adef8bd51ad49ffbf4b752eaa254f932ac01d2915c004584fa56b95d5695c82
-MD5 6ae2fe661ad5deb5e98a50537d06b43f files/cloop.fix-incompatible-kernel-2.6.7-and-later.patch 995
-RMD160 4110d932952db7e6f180ac27316675d34c684157 files/cloop.fix-incompatible-kernel-2.6.7-and-later.patch 995
-SHA256 1adef8bd51ad49ffbf4b752eaa254f932ac01d2915c004584fa56b95d5695c82 files/cloop.fix-incompatible-kernel-2.6.7-and-later.patch 995
-DIST cloop_2.01-5.tar.gz 428324
-DIST cloop_2.02-1.tar.gz 428919 RMD160 9d80010ac817f488a9f0c67b74e59aadb670490a SHA1 6ddd254413b2c1fb292a5f90890a823ff1a26732 SHA256 cfb243a5301e452bbe67fb6f84d5accf1a72f858037cc628046522fa1f212c06
 DIST cloop_2.02.1+eb.10.tar.gz 348471 RMD160 bf63e46622d4f1289ea1f577fde08f6b5e977ef0 SHA1 403bcd4f874fe8a475439fe61008b6f811b3d163 SHA256 4e6770379a98588ad82f5fd2800454333ba19e33606f239cc44c2e127187f757
-EBUILD cloop-2.01.5-r1.ebuild 1811 RMD160 6530bb57bd18e7b84187cfa4080ce631a65ad186 SHA1 e3e05cf40086928e20d5c3b41398720204b619d3 SHA256 71e79407f1cb042e7fa3211da961f3610af32d2dff32613769052065e8d80644
-MD5 06f22b38961cce2906d9f50a3992c260 cloop-2.01.5-r1.ebuild 1811
-RMD160 6530bb57bd18e7b84187cfa4080ce631a65ad186 cloop-2.01.5-r1.ebuild 1811
-SHA256 71e79407f1cb042e7fa3211da961f3610af32d2dff32613769052065e8d80644 cloop-2.01.5-r1.ebuild 1811
-EBUILD cloop-2.02.1-r1.ebuild 1480 RMD160 064252e4036e9ea73a3b9937e4caba2f6aa91aee SHA1 c3608395f8d5946ec2fb60de30cd9a028b8b6f38 SHA256 85985465d721ff1979424aae736a7a0bd81651110fee8ec05c8d4d5dff36b9ad
-MD5 90204b3c512fa792b00f6364d14210a1 cloop-2.02.1-r1.ebuild 1480
-RMD160 064252e4036e9ea73a3b9937e4caba2f6aa91aee cloop-2.02.1-r1.ebuild 1480
-SHA256 85985465d721ff1979424aae736a7a0bd81651110fee8ec05c8d4d5dff36b9ad cloop-2.02.1-r1.ebuild 1480
-EBUILD cloop-2.02.1.ebuild 1511 RMD160 95a15bbfddedd218fc5d698285f4c3b4a7ab874e SHA1 9f67bcf414cd8ebaf1163e19784d970422c8b5a1 SHA256 d8862fc485ecc6707f6fa0b290fe206705373c1f8eae33aeeed2445dcc434663
-MD5 655c4fd3a42a5910b561e23a5b4fc0dc cloop-2.02.1.ebuild 1511
-RMD160 95a15bbfddedd218fc5d698285f4c3b4a7ab874e cloop-2.02.1.ebuild 1511
-SHA256 d8862fc485ecc6707f6fa0b290fe206705373c1f8eae33aeeed2445dcc434663 cloop-2.02.1.ebuild 1511
-MISC ChangeLog 3902 RMD160 cf61802e5f6ad51ed5e8bda6d070737d831a2f76 SHA1 4db0117037665ad39854d7eb77ccdad19b68f9a0 SHA256 34148c542919102b31e1200e5e6efe8f27cc4c2aa15978b8bc3d4d0ec1f04811
-MD5 84646b14028600a4d81b70001a74ac6f ChangeLog 3902
-RMD160 cf61802e5f6ad51ed5e8bda6d070737d831a2f76 ChangeLog 3902
-SHA256 34148c542919102b31e1200e5e6efe8f27cc4c2aa15978b8bc3d4d0ec1f04811 ChangeLog 3902
+EBUILD cloop-2.02.1-r1.ebuild 1546 RMD160 093bdbf91f6d0f05f53842d8b6c457355248b8cb SHA1 bde254c30323ed7c713fef928a5db5ce0d6f1280 SHA256 3df6beca449812d4037b2bb1643b21825376736117f76074b05de5b0b35c1d68
+MD5 b9a6bdb816d809f0837a8f23f08c38a6 cloop-2.02.1-r1.ebuild 1546
+RMD160 093bdbf91f6d0f05f53842d8b6c457355248b8cb cloop-2.02.1-r1.ebuild 1546
+SHA256 3df6beca449812d4037b2bb1643b21825376736117f76074b05de5b0b35c1d68 cloop-2.02.1-r1.ebuild 1546
+MISC ChangeLog 4446 RMD160 16e62f53275b7c8a7de9be75ebe58dcbbc8d3a20 SHA1 94c6ca8e64c28f11aa01171b2a74cdd271cc5e89 SHA256 28051fec42904de03684809ca0f162d4dec333d40801ed976d1ea007f63e9afb
+MD5 49eb35c8402c2a9298f1c3e83988faa0 ChangeLog 4446
+RMD160 16e62f53275b7c8a7de9be75ebe58dcbbc8d3a20 ChangeLog 4446
+SHA256 28051fec42904de03684809ca0f162d4dec333d40801ed976d1ea007f63e9afb ChangeLog 4446
 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata.xml 264
-MD5 eba344b1fcf93c086a762d9f059adf84 files/digest-cloop-2.01.5-r1 64
-RMD160 17d91551fafcd554154024dee217c0d8a5eda35b files/digest-cloop-2.01.5-r1 64
-SHA256 85be80d1951d14a26bf8c5647bca932281cf8a3a410c6670c612a029c8d60958 files/digest-cloop-2.01.5-r1 64
-MD5 9d7297ac63d9c6eddd6e0aaf51d70253 files/digest-cloop-2.02.1 238
-RMD160 05a51db2fbcb7e253c2d37c0ded6a39a0ea2a593 files/digest-cloop-2.02.1 238
-SHA256 2e831ab345ab6b39d59270fa28c2059c992b8b80e3c2e2cd18c6a5862d3f4649 files/digest-cloop-2.02.1 238
 MD5 1937f415be76d41a9cca4fccd67495ef files/digest-cloop-2.02.1-r1 256
 RMD160 8c3eab6a46ce47053f1b636ed21fe34ed1467b41 files/digest-cloop-2.02.1-r1 256
 SHA256 e867f4602ee5a808ec3e317a4b9bdbd360248e06f79fc2d9d5b229a1df06a560 files/digest-cloop-2.02.1-r1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEsxm+2ZWR0Jhg/EsRAuoXAJ0WORvmITJP0QbnYNkJnsAYmhDZNwCdGzeq
-j0R0xsKl8FPyxKNROzUN8sQ=
-=+Q7B
------END PGP SIGNATURE-----
diff --git a/sys-fs/cloop/cloop-2.01.5-r1.ebuild b/sys-fs/cloop/cloop-2.01.5-r1.ebuild
deleted file mode 100644
index 8616bae2c8c1..000000000000
--- a/sys-fs/cloop/cloop-2.01.5-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.01.5-r1.ebuild,v 1.3 2005/05/17 19:30:17 dsd Exp $
-
-inherit linux-mod eutils versionator
-
-DESCRIPTION="Compressed filesystem loopback kernel module"
-HOMEPAGE="http://www.knopper.net/knoppix/"
-SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_$(replace_version_separator 2 '-').tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-pkg_setup() {
-	CONFIG_CHECK="ZLIB_INFLATE"
-	if kernel_is 2 4
-	then
-		CONFIG_CHECK="${CONFIG_CHECK} ZLIB_DEFLATE"
-	fi
-	MODULE_NAMES="cloop(fs:)"
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="KVERSION=${KV_FULL} KERNEL_DIR=${KV_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/cloop.fix-Makefile-for-kernel-2.6-and-amd64.patch
-	epatch ${FILESDIR}/cloop.fix-incompatible-kernel-2.6.7-and-later.patch
-	cd ${S}
-	epatch ${FILESDIR}/cloop.fix-7z-syntax-for-gcc-3.4.patch
-	epatch ${FILESDIR}/cloop.fix-create_compressed_fs-segfault-on-amd64.patch
-	epatch ${FILESDIR}/${P}-netinet-gentoo.patch
-
-	# Debian uses conf.vars, everyone else uses .config
-	sed -i "s:conf.vars:.config:" Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin create_compressed_fs extract_compressed_fs
-	cp debian/create_compressed_fs.1 debian/extract_compressed_fs.1
-	doman debian/create_compressed_fs.1 debian/extract_compressed_fs.1
-	dodoc CHANGELOG README
-}
-
-pkg_postinst () {
-	if kernel_is 2 4
-	then
-		einfo "Adding /dev/cloop devices"
-		if [ -e /dev/cloop ] ; then
-			rm -f /dev/cloop
-		fi
-		mknod /dev/cloop b 240 0 || die
-		if [ -e /dev/cloop1 ] ; then
-			rm -f /dev/cloop1
-		fi
-		mknod /dev/cloop1 b 240 1 || die
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/cloop/cloop-2.02.1.ebuild b/sys-fs/cloop/cloop-2.02.1.ebuild
deleted file mode 100644
index e2e20918b358..000000000000
--- a/sys-fs/cloop/cloop-2.02.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.02.1.ebuild,v 1.1 2005/08/15 09:43:33 genstef Exp $
-
-inherit linux-mod eutils versionator
-
-DESCRIPTION="Compressed filesystem loopback kernel module"
-HOMEPAGE="http://www.knopper.net/knoppix/"
-SRC_URI="http://knopper.net/${PN}_$(replace_version_separator 2 '-').tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-pkg_setup() {
-	CONFIG_CHECK="ZLIB_INFLATE"
-	if kernel_is 2 4
-	then
-		CONFIG_CHECK="${CONFIG_CHECK} ZLIB_DEFLATE"
-	fi
-	MODULE_NAMES="cloop(fs:)"
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="KVERSION=${KV_FULL} KERNEL_DIR=${KV_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-netinet-gentoo.patch
-
-	# Debian uses conf.vars, everyone else uses .config
-	sed -i "s:conf.vars:.config:" Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin create_compressed_fs extract_compressed_fs
-	cp debian/create_compressed_fs.1 debian/extract_compressed_fs.1
-	doman debian/create_compressed_fs.1 debian/extract_compressed_fs.1
-	dodoc CHANGELOG README
-}
-
-pkg_postinst () {
-	if kernel_is 2 4
-	then
-		einfo "Adding /dev/cloop devices"
-		if [ -e /dev/cloop ] ; then
-			rm -f /dev/cloop
-		fi
-		mknod /dev/cloop b 240 0 || die
-		if [ -e /dev/cloop1 ] ; then
-			rm -f /dev/cloop1
-		fi
-		mknod /dev/cloop1 b 240 1 || die
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/cloop/files/cloop-2.01.5-netinet-gentoo.patch b/sys-fs/cloop/files/cloop-2.01.5-netinet-gentoo.patch
deleted file mode 100644
index 4d7d73c8c334..000000000000
--- a/sys-fs/cloop/files/cloop-2.01.5-netinet-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc.orig	2005-05-17 20:19:15.000000000 +0100
-+++ cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc	2005-05-17 20:19:36.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <netinet/in.h>
- #include <asm/byteorder.h>
- #include <fcntl.h>
- #include <zlib.h>
-@@ -31,7 +32,6 @@
- #include "compress.h"
- #include "siglock.h"
- #define __OPTIMIZE__
--#include <netinet/in.h>
- 
- #include "lib/mng.h"
- #include "lib/endianrw.h"
diff --git a/sys-fs/cloop/files/cloop-2.02.1-netinet-gentoo.patch b/sys-fs/cloop/files/cloop-2.02.1-netinet-gentoo.patch
deleted file mode 100644
index 1da68aa8c8f8..000000000000
--- a/sys-fs/cloop/files/cloop-2.02.1-netinet-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cloop-2.02/advancecomp-1.9_create_compressed_fs/advfs.cc.orig	2005-08-15 11:36:42.000000000 +0200
-+++ cloop-2.02/advancecomp-1.9_create_compressed_fs/advfs.cc	2005-08-15 11:37:05.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <netinet/in.h>
- #include <fcntl.h>
- #include <zlib.h>
- #include "compressed_loop.h"
-@@ -30,7 +31,6 @@
- #include "compress.h"
- #include "siglock.h"
- #define __OPTIMIZE__
--#include <netinet/in.h>
- #include <asm/byteorder.h>
- 
- #include "lib/mng.h"
diff --git a/sys-fs/cloop/files/cloop.fix-7z-syntax-for-gcc-3.4.patch b/sys-fs/cloop/files/cloop.fix-7z-syntax-for-gcc-3.4.patch
deleted file mode 100644
index 7b92064eaefe..000000000000
--- a/sys-fs/cloop/files/cloop.fix-7z-syntax-for-gcc-3.4.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urN ../tmp-orig/cloop-2.01.4/advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h ./advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h
---- ../tmp-orig/cloop-2.01.4/advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h	2003-02-10 20:25:06.000000000 +0100
-+++ ./advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h	2004-07-10 15:27:58.225214667 +0200
-@@ -51,13 +51,13 @@
- public:
-   void Encode(CRangeEncoder *aRangeEncoder, UINT32 aSymbol)
-   {
--    aRangeEncoder->EncodeBit(m_Probability, kNumBitModelTotalBits, aSymbol);
--    UpdateModel(aSymbol);
-+    aRangeEncoder->EncodeBit(this->m_Probability, kNumBitModelTotalBits, aSymbol);
-+    this->UpdateModel(aSymbol);
-   }
-   UINT32 GetPrice(UINT32 aSymbol) const
-   {
-     return g_PriceTables.m_StatePrices[
--      (((m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
-+      (((this->m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
-   }
- };
- 
-@@ -68,11 +68,11 @@
- public:
-   UINT32 Decode(CRangeDecoder *aRangeDecoder)
-   {
--    UINT32 aNewBound = (aRangeDecoder->m_Range >> kNumBitModelTotalBits) * m_Probability;
-+    UINT32 aNewBound = (aRangeDecoder->m_Range >> kNumBitModelTotalBits) * this->m_Probability;
-     if (aRangeDecoder->m_Code < aNewBound)
-     {
-       aRangeDecoder->m_Range = aNewBound;
--      m_Probability += (kBitModelTotal - m_Probability) >> aNumMoveBits;
-+      this->m_Probability += (kBitModelTotal - this->m_Probability) >> aNumMoveBits;
-       if (aRangeDecoder->m_Range < kTopValue)
-       {
-         aRangeDecoder->m_Code = (aRangeDecoder->m_Code << 8) | aRangeDecoder->m_Stream.ReadByte();
-@@ -84,7 +84,7 @@
-     {
-       aRangeDecoder->m_Range -= aNewBound;
-       aRangeDecoder->m_Code -= aNewBound;
--      m_Probability -= (m_Probability) >> aNumMoveBits;
-+      this->m_Probability -= (this->m_Probability) >> aNumMoveBits;
-       if (aRangeDecoder->m_Range < kTopValue)
-       {
-         aRangeDecoder->m_Code = (aRangeDecoder->m_Code << 8) | aRangeDecoder->m_Stream.ReadByte();
diff --git a/sys-fs/cloop/files/cloop.fix-Makefile-for-kernel-2.6-and-amd64.patch b/sys-fs/cloop/files/cloop.fix-Makefile-for-kernel-2.6-and-amd64.patch
deleted file mode 100644
index 464915ae5e49..000000000000
--- a/sys-fs/cloop/files/cloop.fix-Makefile-for-kernel-2.6-and-amd64.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ru cloop-2.01/Makefile cloop-2.01.new/Makefile
---- cloop-2.01/Makefile	2004-05-14 14:17:51.000000000 -0500
-+++ cloop-2.01.new/Makefile	2004-07-21 16:26:59.167257880 -0500
-@@ -1,18 +1,51 @@
- #!/usr/bin/make
- 
--KERNEL_DIR=/usr/src/linux
-+KVERSION=$(shell uname -r)
-+MACHINE=$(shell uname -m)
-+KERNEL_DIR=/lib/modules/$(KVERSION)/build
-+KERNEL_INCLUDE=$(KERNEL_DIR)/include
-+INCLUDE_26:=-include $(KERNEL_INCLUDE)/config/modversions.h -include $(KERNEL_INCLUDE)/linux/version.h
-+INCLUDE_24:=-include $(KERNEL_INCLUDE)/linux/modversions.h
-+
-+file_exist=$(shell test -f $(1) && echo yes || echo no)
-+
-+# test for 2.6 or 2.4 kernel
-+ifeq ($(call file_exist,$(KERNEL_DIR)/Rules.make), yes)
-+PATCHLEVEL:=4
-+else
-+PATCHLEVEL:=6
-+endif
- 
- ifdef APPSONLY
- CFLAGS:=-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -s -I. -fno-strict-aliasing -fno-common -fomit-frame-pointer 
- else
--include $(KERNEL_DIR)/.config
-+ifeq ($(PATCHLEVEL),4)
- include $(KERNEL_DIR)/conf.vars
-+else
-+include $(KERNEL_DIR)/.config
-+endif
- endif
- 
- CKERNOPS:=-D__KERNEL__ -DMODULE -fno-builtin -nostdlib -DKBUILD_MODNAME="cloop" -DKBUILD_BASENAME="cloop"
- 
-+# I needed this for my amd64 system running 2.6.7
-+# it maybe required for 2.6, so I add it here
-+ifeq ($(PATCHLEVEL),6)
-+CKERNOPS+= -D__OPTIMIZE__
-+endif
-+
-+# check for amd64
-+ifeq ($(MACHINE),x86_64)
-+CKERNOPS+=-mno-red-zone -mcmodel=kernel
-+endif
-+
- ifdef CONFIG_MODVERSIONS
--MODVERSIONS:= -DMODVERSIONS -include $(KERNEL_DIR)/include/linux/modversions.h
-+MODVERSIONS:= -DMODVERSIONS
-+ifeq ($(PATCHLEVEL),4)
-+MODVERSIONS+=$(INCLUDE_24)
-+else
-+MODVERSIONS+=$(INCLUDE_26)
-+endif
- CKERNOPS += $(MODVERSIONS)
- endif
- 
-diff -ru cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc cloop-2.01.new/advancecomp-1.9_create_compressed_fs/advfs.cc
---- cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc	2004-04-18 15:33:29.000000000 -0500
-+++ cloop-2.01.new/advancecomp-1.9_create_compressed_fs/advfs.cc	2004-07-20 11:55:28.000000000 -0500
-@@ -30,6 +30,7 @@
- #include "utility.h"
- #include "compress.h"
- #include "siglock.h"
-+#define __OPTIMIZE__
- #include <netinet/in.h>
- 
- #include "lib/mng.h"
diff --git a/sys-fs/cloop/files/cloop.fix-create_compressed_fs-segfault-on-amd64.patch b/sys-fs/cloop/files/cloop.fix-create_compressed_fs-segfault-on-amd64.patch
deleted file mode 100644
index f6f024556ea1..000000000000
--- a/sys-fs/cloop/files/cloop.fix-create_compressed_fs-segfault-on-amd64.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc	2004-04-18 16:33:29.000000000 -0400
-+++ cloop-2.01.new/advancecomp-1.9_create_compressed_fs/advfs.cc	2004-11-23 18:04:49.859941344 -0500
-@@ -81,7 +81,7 @@
-   {
-    int z_error;
-    unsigned long total=0;
--   unsigned len[maxalg];
-+   uLong len[maxalg];
-    unsigned int best;
-    //memset(compressed,0,len); memset(uncompressed,0,blocksize);
-    for(j=0; j<maxalg; j++) memset(compressed[j],0,maxlen), len[j]=maxlen;
-@@ -111,7 +111,8 @@
-       }
- 
-      /* Try 7ZIP compression now. */
--     if(!compress_zlib(shrink_extreme, (unsigned char *)compressed[maxalg-1], len[maxalg-1], (unsigned char *)uncompressed, blocksize))
-+     unsigned zlib_length=(unsigned int)len[maxalg-1];
-+     if(!compress_zlib(shrink_extreme, (unsigned char *)compressed[maxalg-1], zlib_length, (unsigned char *)uncompressed, blocksize))
-       {
-        fprintf(stderr, "*** Error %d compressing block %lu! (compressed=%p, len=%lu, uncompressed=%p, blocksize=%lu)\n", z_error, i, compressed,len,uncompressed,blocksize);
-        goto error_free_cb_list;
diff --git a/sys-fs/cloop/files/cloop.fix-incompatible-kernel-2.6.7-and-later.patch b/sys-fs/cloop/files/cloop.fix-incompatible-kernel-2.6.7-and-later.patch
deleted file mode 100644
index 980e1595a8af..000000000000
--- a/sys-fs/cloop/files/cloop.fix-incompatible-kernel-2.6.7-and-later.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-This patch is taken from debian and fixes some incompatible kernel changes
-in 2.6.7 and later linux-kernels.
-
---- cloop-2.01/compressed_loop.c.orig	2004-05-14 15:22:47.000000000 -0400
-+++ cloop-2.01/compressed_loop.c	2004-11-22 11:32:45.772837000 -0500
-@@ -202,7 +202,11 @@
-                           unsigned long offset, unsigned long size)
- {
-  char *kaddr;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
-+ struct clo_read_data *p = (struct clo_read_data*)desc->arg.buf;
-+#else
-  struct clo_read_data *p = (struct clo_read_data*)desc->buf;
-+#endif
-  unsigned long count = desc->count;
-  if (size > count) size = count;
-  kaddr = kmap(page);
-@@ -228,7 +232,11 @@
-    read_descriptor_t desc;
-    desc.written = 0;
-    desc.count   = size;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
-+   desc.arg.buf = (char*)&cd;
-+#else
-    desc.buf     = (char*)&cd;
-+#endif
-    desc.error   = 0;
- #ifdef REDHAT_KERNEL /* Greenshoe Linux */
-    do_generic_file_read(f, &pos, &desc, clo_read_actor, 0);
diff --git a/sys-fs/cloop/files/digest-cloop-2.01.5-r1 b/sys-fs/cloop/files/digest-cloop-2.01.5-r1
deleted file mode 100644
index cc0eb187161d..000000000000
--- a/sys-fs/cloop/files/digest-cloop-2.01.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38daf7faba0427fed469137bca917c1c cloop_2.01-5.tar.gz 428324
diff --git a/sys-fs/cloop/files/digest-cloop-2.02.1 b/sys-fs/cloop/files/digest-cloop-2.02.1
deleted file mode 100644
index 7117037007dd..000000000000
--- a/sys-fs/cloop/files/digest-cloop-2.02.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7cf51aeafbd38de5a26c9ab8addc154b cloop_2.02-1.tar.gz 428919
-RMD160 9d80010ac817f488a9f0c67b74e59aadb670490a cloop_2.02-1.tar.gz 428919
-SHA256 cfb243a5301e452bbe67fb6f84d5accf1a72f858037cc628046522fa1f212c06 cloop_2.02-1.tar.gz 428919