added cowmerge thanks to bug #101159. cleanout old versions

Package-Manager: portage-2.0.51.22-r2

6 files changed, 23 insertions, 54 deletions

diff --git a/sys-fs/cowloop/ChangeLog b/sys-fs/cowloop/ChangeLog
index ed9060106b3c..321260230525 100644
--- a/sys-fs/cowloop/ChangeLog
+++ b/sys-fs/cowloop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cowloop
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.7 2005/06/26 09:23:58 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/ChangeLog,v 1.8 2005/08/04 08:56:41 dragonheart Exp $
+
+*cowloop-2.15-r1 (04 Aug 2005)
+
+  04 Aug 2005; Daniel Black <dragonheart@gentoo.org> -cowloop-2.11.ebuild,
+  -cowloop-2.15.ebuild, +cowloop-2.15-r1.ebuild:
+  added cowmerge thanks to bug #101159 by Jérôme Poulin
 
   26 Jun 2005; David Holm <dholm@gentoo.org> cowloop-2.15.ebuild:
   Added to ~ppc.
diff --git a/sys-fs/cowloop/Manifest b/sys-fs/cowloop/Manifest
index 0a26c33eef00..f418040cbabc 100644
--- a/sys-fs/cowloop/Manifest
+++ b/sys-fs/cowloop/Manifest
@@ -1,10 +1,18 @@
-MD5 07b8a06a34bf08185af772d3ff5f3ddd ChangeLog 1207
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f7795d438fd180afa232d6fc88d3204d cowloop-1.4.ebuild 1175
-MD5 42d3e1916a47fc25061e2709c9c6e249 cowloop-2.11.ebuild 1109
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+MD5 0db6f9ed0e5eb96991ffba6873f8d892 ChangeLog 1426
 MD5 2f48a1eac2e672a5b651efe97de1b57a cowloop-2.14.ebuild 1127
-MD5 92ae877c3cc618bbc5c7af83ccf20dbf cowloop-2.15.ebuild 1127
+MD5 6666a2b3c915782174580b554535853a cowloop-2.15-r1.ebuild 1154
 MD5 c1f4e8a9d7f7054d5560717155944ba1 files/digest-cowloop-1.4 62
-MD5 5b1d181cd462a69063fe74fd3179a116 files/digest-cowloop-2.11 63
 MD5 30d42e2ee9dff210d34c789b62d48387 files/digest-cowloop-2.14 63
-MD5 0bb7bf2d5fe9317514e09af6dd0335fc files/digest-cowloop-2.15 63
+MD5 0bb7bf2d5fe9317514e09af6dd0335fc files/digest-cowloop-2.15-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC8dhemdTrptrqvGERArNUAJ9tBT9kht3KR2YGz1PnD7ptQxoZqACePEwl
+Gx0dI4AQP8m77rvqyi3W/Bg=
+=/Wiz
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/cowloop/cowloop-2.11.ebuild b/sys-fs/cowloop/cowloop-2.11.ebuild
deleted file mode 100644
index 9f31e30ae5f6..000000000000
--- a/sys-fs/cowloop/cowloop-2.11.ebuild
+++ /dev/null
@@ -1,44 +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/cowloop/cowloop-2.11.ebuild,v 1.2 2005/01/01 21:51:36 dragonheart Exp $
-
-inherit linux-mod
-
-DESCRIPTION="A copy-on-write loop driver (block device) to be used on top of any other block driver"
-HOMEPAGE="http://www.atconsultancy.nl/cowloop/"
-SRC_URI="http://www.atconsultancy.nl/cowloop/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-# get-version
-# SLOT="${KV_MAJOR}.${MINOR}"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="virtual/libc
-	virtual/linux-sources"
-
-MODULE_NAMES="cowloop(fs:)"
-BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} -I."
-BUILD_TARGETS="modules"
-
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	einfo "Linux kernel ${KV_FULL}"
-	if kernel_is lt 2 6
-	then
-		eerror "This version only works with 2.6 kernels"
-		eerror "For 2.4 kernel support, use version 1.4"
-		die "No compatible kernel detected!"
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-	emake cowcopy cowrepair cowsync cowlist
-}
-
-src_install() {
-	linux-mod_src_install
-	dosbin cowcopy cowrepair cowsync cowlist
-	doman man/*
-}
diff --git a/sys-fs/cowloop/cowloop-2.15.ebuild b/sys-fs/cowloop/cowloop-2.15-r1.ebuild
index 27dc9dffef70..84c038024d18 100644
--- a/sys-fs/cowloop/cowloop-2.15.ebuild
+++ b/sys-fs/cowloop/cowloop-2.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-2.15.ebuild,v 1.2 2005/06/26 09:23:58 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cowloop/cowloop-2.15-r1.ebuild,v 1.1 2005/08/04 08:56:41 dragonheart Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -32,11 +32,11 @@ pkg_setup() {
 
 src_compile() {
 	linux-mod_src_compile
-	CC="$(tc-getCC) ${CFLAGS}" emake cowdev cowrepair cowsync cowlist || die "make failed"
+	CC="$(tc-getCC) ${CFLAGS}" emake cowdev cowrepair cowsync cowlist cowmerge || die "make failed"
 }
 
 src_install() {
 	linux-mod_src_install
-	dosbin cowdev cowrepair cowsync cowlist
+	dosbin cowdev cowrepair cowsync cowlist cowmerge
 	doman man/*
 }
diff --git a/sys-fs/cowloop/files/digest-cowloop-2.11 b/sys-fs/cowloop/files/digest-cowloop-2.11
deleted file mode 100644
index 08815d649e22..000000000000
--- a/sys-fs/cowloop/files/digest-cowloop-2.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d5f25e2f57392620f68a4dfa5ede8ac cowloop-2.11.tar.gz 19971
diff --git a/sys-fs/cowloop/files/digest-cowloop-2.15 b/sys-fs/cowloop/files/digest-cowloop-2.15-r1
index cb71e63c71d4..cb71e63c71d4 100644
--- a/sys-fs/cowloop/files/digest-cowloop-2.15
+++ b/sys-fs/cowloop/files/digest-cowloop-2.15-r1