Version bug, closes bug 157199

4 files changed, 67 insertions, 39 deletions

diff --git a/sys-fs/cloop/ChangeLog b/sys-fs/cloop/ChangeLog
index 34a03f06e036..ec1c9e178843 100644
--- a/sys-fs/cloop/ChangeLog
+++ b/sys-fs/cloop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cloop
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.15 2006/11/10 23:54:37 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.16 2006/12/07 19:41:51 genstef Exp $
+
+*cloop-2.05 (07 Dec 2006)
+
+  07 Dec 2006; Stefan Schweizer <genstef@gentoo.org> cloop-2.04.ebuild,
+  +cloop-2.05.ebuild:
+  Version bug, closes bug 157199
 
   10 Nov 2006; Andrej Kacian <ticho@gentoo.org> cloop-2.04.ebuild:
   Stable on x86, bug #154684.
diff --git a/sys-fs/cloop/Manifest b/sys-fs/cloop/Manifest
index 2cc0aeb41a67..acc6b8ab798a 100644
--- a/sys-fs/cloop/Manifest
+++ b/sys-fs/cloop/Manifest
@@ -1,20 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST cloop_2.02.1+eb.10.tar.gz 348471 RMD160 bf63e46622d4f1289ea1f577fde08f6b5e977ef0 SHA1 403bcd4f874fe8a475439fe61008b6f811b3d163 SHA256 4e6770379a98588ad82f5fd2800454333ba19e33606f239cc44c2e127187f757
 DIST cloop_2.04-1+eb.1-7.tar.gz 302314 RMD160 d2556d86301ce5c98535daa0a2ccf4412e0476ad SHA1 5427dba752bf883409555715a1218a9b547a8705 SHA256 f5b3c2120a3620cbbef2f26b9dbcc78224681a9f25d80090fc30f940301500e0
+DIST cloop_2.05~20060829-1.tar.gz 303063 RMD160 57d0c6df7e2de844faba8fc146d1ce4939c04c27 SHA1 a6466872dacfcc2cbb90b9c0889ff9625c4230e5 SHA256 61884370b33cde74e9a0a5f67f778b8744b4e201bd65c13d1b7e398488cd2282
 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
-EBUILD cloop-2.04.ebuild 1543 RMD160 1f5c546c674b7db15ff62192a27968321c15b84c SHA1 123c9fe30f66112f888ad4c375559f69b492a078 SHA256 30a1c178bf21de35ad98397175e08a7dd140a3eae2ae216066667a3634bac550
-MD5 c3c2845811ff3812b4bf376e5a02db1a cloop-2.04.ebuild 1543
-RMD160 1f5c546c674b7db15ff62192a27968321c15b84c cloop-2.04.ebuild 1543
-SHA256 30a1c178bf21de35ad98397175e08a7dd140a3eae2ae216066667a3634bac550 cloop-2.04.ebuild 1543
-MISC ChangeLog 4729 RMD160 56858013b89cafd80aed3878b632eeaeea7ae8f1 SHA1 633e1709d0d6f9b60d2cf083b2fcd276960e8d22 SHA256 40b84aec2de1392493b970027b2a8e1c9da11a6bbd1c0287de2a82a4e9321063
-MD5 322895a1827409454b07fef48d5fa5f3 ChangeLog 4729
-RMD160 56858013b89cafd80aed3878b632eeaeea7ae8f1 ChangeLog 4729
-SHA256 40b84aec2de1392493b970027b2a8e1c9da11a6bbd1c0287de2a82a4e9321063 ChangeLog 4729
+EBUILD cloop-2.04.ebuild 1225 RMD160 cb2d5be6134cbbdb61d9a5ec582555c72186232f SHA1 20e1fdc7a69d2d4cde7c09193033777ef564ab44 SHA256 d47cba1d2451e262c84ee848a02ac14ba000fe05b23a2b1d2b9ebf6370a11670
+MD5 66b6e0caa1835579d8f987c0dc03afb3 cloop-2.04.ebuild 1225
+RMD160 cb2d5be6134cbbdb61d9a5ec582555c72186232f cloop-2.04.ebuild 1225
+SHA256 d47cba1d2451e262c84ee848a02ac14ba000fe05b23a2b1d2b9ebf6370a11670 cloop-2.04.ebuild 1225
+EBUILD cloop-2.05.ebuild 1015 RMD160 4463696a6494d8d676e5359d8a99e9f76dd5904b SHA1 99e5f44f618f812d050738d73cab7add0fe32add SHA256 cd827058f3095641d6b8ff683c746b803a8df3c34776c13381f73dd141575ba6
+MD5 cccc68d41eab772349b46491d62120ee cloop-2.05.ebuild 1015
+RMD160 4463696a6494d8d676e5359d8a99e9f76dd5904b cloop-2.05.ebuild 1015
+SHA256 cd827058f3095641d6b8ff683c746b803a8df3c34776c13381f73dd141575ba6 cloop-2.05.ebuild 1015
+MISC .#ChangeLog.1.14 4739 RMD160 d5edc363d34cd2dad43901155e136349b1513eb3 SHA1 5370c89c6140ac11dba8b436e4df259f43d23e69 SHA256 196b1f9d807f4a4e33c3e07691e6741bdc073725d7d0b537f597cd5aee798630
+MD5 ac54188ec1e1a4b289f043457123dde5 .#ChangeLog.1.14 4739
+RMD160 d5edc363d34cd2dad43901155e136349b1513eb3 .#ChangeLog.1.14 4739
+SHA256 196b1f9d807f4a4e33c3e07691e6741bdc073725d7d0b537f597cd5aee798630 .#ChangeLog.1.14 4739
+MISC .#cloop-2.04.ebuild.1.1 1228 RMD160 4ffd1202ccd04a625fb1e28c2b123a2e45f990db SHA1 76224595d161d777e7100d3c5455ba3e8aa67f61 SHA256 9cfa89fe6a1e380fcceb34169f64d00c35b51b72b3f3286662a960a679e670e8
+MD5 72147e6df168cc12b7f56fbb6b2e0773 .#cloop-2.04.ebuild.1.1 1228
+RMD160 4ffd1202ccd04a625fb1e28c2b123a2e45f990db .#cloop-2.04.ebuild.1.1 1228
+SHA256 9cfa89fe6a1e380fcceb34169f64d00c35b51b72b3f3286662a960a679e670e8 .#cloop-2.04.ebuild.1.1 1228
+MISC ChangeLog 4884 RMD160 c4d072dc6c188e922569ed5454201156481e8a08 SHA1 4800bc3893195451f733454f11b6f1f56007c6d4 SHA256 3c63223a3b40b2443c9e3339234cf7d9a7c09240f8cda90eb1c513dfd840c201
+MD5 ace3b7d084fddb72dc9f5c6a1c874460 ChangeLog 4884
+RMD160 c4d072dc6c188e922569ed5454201156481e8a08 ChangeLog 4884
+SHA256 3c63223a3b40b2443c9e3339234cf7d9a7c09240f8cda90eb1c513dfd840c201 ChangeLog 4884
 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
@@ -25,10 +35,6 @@ SHA256 e867f4602ee5a808ec3e317a4b9bdbd360248e06f79fc2d9d5b229a1df06a560 files/di
 MD5 6a8f62061bd8025c31abe2e9de17aece files/digest-cloop-2.04 259
 RMD160 141ec9e4f7f7b40a41370e230fc5ccca4df2ce8f files/digest-cloop-2.04 259
 SHA256 e7580920390049773924b19c29d39f9f918126321b2c4626c7f03c5e2da68885 files/digest-cloop-2.04 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFVRFHQlM6RnzZP+IRAm3+AJ9KyGrohX934MWAgnX/qzp06aCFDQCeItVM
-tcl2p9LVekt614oIdNd4i14=
-=jbN3
------END PGP SIGNATURE-----
+MD5 3b64a4a775b25585cb6e4aae4da65cb0 files/digest-cloop-2.05 265
+RMD160 dd0ce587e21c6616972142b0cb2e385fb7235c10 files/digest-cloop-2.05 265
+SHA256 f9d735781b8dcdeb56a020b79ae8e3024942f3e0a544903bb84bb8f56180ac2f files/digest-cloop-2.05 265
diff --git a/sys-fs/cloop/cloop-2.04.ebuild b/sys-fs/cloop/cloop-2.04.ebuild
index eda5079450b8..cefa65e142d5 100644
--- a/sys-fs/cloop/cloop-2.04.ebuild
+++ b/sys-fs/cloop/cloop-2.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.04.ebuild,v 1.2 2006/11/10 23:54:37 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.04.ebuild,v 1.3 2006/12/07 19:41:51 genstef Exp $
 
 inherit linux-mod eutils
 
@@ -18,7 +18,7 @@ pkg_setup() {
 	CONFIG_CHECK="ZLIB_INFLATE"
 	if kernel_is 2 4
 	then
-		CONFIG_CHECK="${CONFIG_CHECK} ZLIB_DEFLATE"
+		die "kernel 2.4 is not supported"
 	fi
 	MODULE_NAMES="cloop(fs:)"
 	BUILD_TARGETS="all"
@@ -29,7 +29,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	kernel_is 2 4 || sed -i 's:MODULE_PARM(\([^,]*\), "s");:module_param(\1, charp, 0);:' compressed_loop.c
+	sed -i 's:MODULE_PARM(\([^,]*\), "s");:module_param(\1, charp, 0);:' compressed_loop.c
 	sed -i -e 's:__stringify(KBUILD_MODNAME):"cloop":' compressed_loop.c
 }
 
@@ -41,20 +41,3 @@ src_install() {
 	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.05.ebuild b/sys-fs/cloop/cloop-2.05.ebuild
new file mode 100644
index 000000000000..0bcffc2837ec
--- /dev/null
+++ b/sys-fs/cloop/cloop-2.05.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.05.ebuild,v 1.1 2006/12/07 19:41:51 genstef Exp $
+
+inherit linux-mod
+
+DESCRIPTION="Compressed filesystem loopback kernel module"
+HOMEPAGE="http://packages.debian.org/unstable/source/cloop http://www.knopper.net/knoppix"
+SRC_URI="mirror://debian/pool/main/c/cloop/${PN}_${PV}~20060829-1.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${P}~20060829
+
+pkg_setup() {
+	kernel_is 2 4 && die "kernel 2.4 is not supported"
+	CONFIG_CHECK="ZLIB_INFLATE"
+	MODULE_NAMES="cloop(fs:)"
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KVERSION=${KV_FULL} KERNEL_DIR=${KV_DIR}"
+	linux-mod_pkg_setup
+}
+
+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
+}