remove old lvm2 ebuilds and add 2.02.03 ebuild, Clustering disabled by default

Package-Manager: portage-2.0.53_rc7

8 files changed, 37 insertions, 98 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 8b099919e92d..9456e0de5bc9 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.56 2006/03/29 18:48:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.57 2006/04/19 22:01:35 rocket Exp $
+
+*lvm2-2.02.03 (19 Apr 2006)
+
+  19 Apr 2006; Eric Edgar <rocket@gentoo.org> lvm2-2.01.14-r1.ebuild,
+  -lvm2-2.02.01.ebuild, -lvm2-2.02.02.ebuild, +lvm2-2.02.03.ebuild:
+  Add lvm2-2.02.03.ebuild to fix cluster issues
 
   29 Mar 2006; Markus Rothe <corsair@gentoo.org> lvm2-2.02.02.ebuild:
   Added ~ppc64
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 46030c8a16cc..30024f100909 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -4,15 +4,20 @@ MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09 61
 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09-r1 61
 MD5 d1e295db9aa6771cdc6506033bc98f69 files/digest-lvm2-2.01.13 61
 MD5 bd5702de4e53595969129c176cb028dc files/digest-lvm2-2.01.14-r1 61
+MD5 bd5702de4e53595969129c176cb028dc files/digest-lvm2-2.01.14-r2 61
 MD5 6feb5524aca57cd709e859dc99df98d8 files/digest-lvm2-2.02.01 61
 MD5 1eadb2bd898a5a7f38ee46afacfe1ec0 files/digest-lvm2-2.02.02 229
+MD5 75bc19619bdb87793f11cf26faaaf7a6 files/digest-lvm2-2.02.03 61
+MD5 3216475436df8fbd33aa3ef4e2889ef8 files/lvm2-2.01.14-static.patch 1034
 MD5 3216475436df8fbd33aa3ef4e2889ef8 files/lvm2-2.01.14.patch 1034
 MD5 bb8fbbf10fb41b8538aba9cafb65094b files/lvm2-start.sh 990
 MD5 00655aa59deac8796636fc54ede221ed files/lvm2-stop.sh 1940
 MD5 03b3cb1f6d49f4b6fe96c6ad3a9c47f0 lvm2-2.01.09-r1.ebuild 1399
 MD5 97aaa43ef70e84140f8d1b940eb73025 lvm2-2.01.09.ebuild 1277
 MD5 bfbb6af0f144e530589562ca3b79c61a lvm2-2.01.13.ebuild 1402
-MD5 a14e31292b2dc04c8800086d7abce3e3 lvm2-2.01.14-r1.ebuild 1540
+MD5 57d20bee1bb79e2d966453da71bd66bf lvm2-2.01.14-r1.ebuild 1586
+MD5 57d20bee1bb79e2d966453da71bd66bf lvm2-2.01.14-r2.ebuild 1586
 MD5 129ab860af1224a5ea0ba3764fde6684 lvm2-2.02.01.ebuild 2406
 MD5 c1439f4b25f5ee42ea83e5614010c573 lvm2-2.02.02.ebuild 2423
+MD5 ab0ab7661cad9b6bd1cf0d59d7393082 lvm2-2.02.03.ebuild 2577
 MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250
diff --git a/sys-fs/lvm2/files/digest-lvm2-2.02.01 b/sys-fs/lvm2/files/digest-lvm2-2.02.01
deleted file mode 100644
index 6f126659fd45..000000000000
--- a/sys-fs/lvm2/files/digest-lvm2-2.02.01
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5514514bd7992fa0597406ca2f80d0e5 LVM2.2.02.01.tgz 459543
diff --git a/sys-fs/lvm2/files/digest-lvm2-2.02.02 b/sys-fs/lvm2/files/digest-lvm2-2.02.02
deleted file mode 100644
index d2f87c10a0b5..000000000000
--- a/sys-fs/lvm2/files/digest-lvm2-2.02.02
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c80ccdf621090bf85aa4e9102eb47099 LVM2.2.02.02.tgz 466054
-RMD160 0b5440feece630fa290d2bd9aa166e3b9ec5fa12 LVM2.2.02.02.tgz 466054
-SHA256 f1e27abed3acec22cb1bca238c4af73e7aa3247f363c67e09ec34a89820fce16 LVM2.2.02.02.tgz 466054
diff --git a/sys-fs/lvm2/files/digest-lvm2-2.02.03 b/sys-fs/lvm2/files/digest-lvm2-2.02.03
new file mode 100644
index 000000000000..3a42d699c704
--- /dev/null
+++ b/sys-fs/lvm2/files/digest-lvm2-2.02.03
@@ -0,0 +1 @@
+MD5 91b0b812be4cee2daf63acb725080038 LVM2.2.02.03.tgz 469971
diff --git a/sys-fs/lvm2/lvm2-2.01.14-r1.ebuild b/sys-fs/lvm2/lvm2-2.01.14-r1.ebuild
index 45555ac6d431..db2364fddd15 100644
--- a/sys-fs/lvm2/lvm2-2.01.14-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.01.14-r1.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/lvm2/lvm2-2.01.14-r1.ebuild,v 1.1 2006/01/31 23:27:59 rocket Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.01.14-r1.ebuild,v 1.2 2006/04/19 22:01:35 rocket Exp $
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S} || die
 	epatch ${FILESDIR}/lvm2-2.01.14.patch
+	epatch ${FILESDIR}/lvm2-2.01.14-static.patch
 }
 src_compile() {
 	# Static compile of lvm2 so that the install described in the handbook works
diff --git a/sys-fs/lvm2/lvm2-2.02.01.ebuild b/sys-fs/lvm2/lvm2-2.02.01.ebuild
deleted file mode 100644
index 4599648daf61..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.01.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.01.ebuild,v 1.4 2006/03/22 09:07:25 pauldv Exp $
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
-HOMEPAGE="http://sources.redhat.com/lvm2/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="readline nolvmstatic clvm nocman nolvm1 nosnapshots nomirrors selinux"
-
-DEPEND=">=sys-fs/device-mapper-1.02
-		clvm? ( >=sys-cluster/dlm-1.01.00
-			!nocman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-
-	if ! use nolvmstatic
-	then
-		myconf="${myconf} --enable-static_link"
-		use nosnapshots || myconf="${myconf} --with-snapshots=internal"
-		use nomirrors || myconf="${myconf} --with-mirrors=internal"
-		if use nolvm1
-		then
-			myconf="${myconf} --with-lvm1=none"
-		else
-			myconf="${myconf} --with-lvm1=internal"
-		fi
-	else
-		use nosnapshots || myconf="${myconf} --with-snapshots=shared"
-		use nomirrors || myconf="${myconf} --with-mirrors=shared"
-		if use nolvm1
-		then
-			myconf="${myconf} --with-lvm1=none"
-		else
-			myconf="${myconf} --with-lvm1=shared"
-		fi
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		if use nolvmstatic
-		then
-			myconf="${myconf} --with-cluster=shared"
-		else
-			myconf="${myconf} --with-cluster=internal"
-		fi
-		if use nocman; then
-			myconf="${myconf} --with-clvmd=gulm"
-		else
-			myconf="${myconf} --with-clvmd=cman"
-		fi
-	fi
-
-	econf $(use_enable readline) $(use_enable selinux) ${myconf} || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall sbindir="${D}/sbin" staticdir="${D}/sbin" confdir="${D}/etc/lvm"
-	mv -f "${D}/sbin/lvm.static" "${D}/sbin/lvm"
-
-	dodoc COPYING* INSTALL README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins ${FILESDIR}/lvm2-start.sh lvm-start.sh || die
-	newins ${FILESDIR}/lvm2-stop.sh lvm-stop.sh || die
-	if use clvm; then
-		newinitd ${FILESDIR}/clvmd.rc clvmd || die
-	fi
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.02.ebuild b/sys-fs/lvm2/lvm2-2.02.03.ebuild
index 90a3f1cdbf42..aa4d768aac01 100644
--- a/sys-fs/lvm2/lvm2-2.02.02.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.03.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/lvm2/lvm2-2.02.02.ebuild,v 1.3 2006/03/29 18:48:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.03.ebuild,v 1.1 2006/04/19 22:01:35 rocket Exp $
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
@@ -8,12 +8,13 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="readline nolvmstatic clvm nocman nolvm1 nosnapshots nomirrors selinux"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="readline nolvmstatic clvm cman gulm nolvm1 nosnapshots nomirrors selinux"
 
 DEPEND=">=sys-fs/device-mapper-1.02.03
 		clvm? ( >=sys-cluster/dlm-1.01.00
-			!nocman? ( >=sys-cluster/cman-1.01.00 ) )"
+			cman? ( >=sys-cluster/cman-1.01.00 )
+			gulm? ( >=sys-cluster/gulm-1.00.00 ) )"
 
 RDEPEND="${DEPEND}
 	!sys-fs/lvm-user
@@ -59,11 +60,18 @@ src_compile() {
 		else
 			myconf="${myconf} --with-cluster=internal"
 		fi
-		if use nocman; then
-			myconf="${myconf} --with-clvmd=gulm"
-		else
+		if useq cman && useq gulm; then
+			myconf="${myconf} --with-clvmd=all"
+		fi
+		if useq cman && ! useq gulm; then
 			myconf="${myconf} --with-clvmd=cman"
 		fi
+		if useq gulm && ! useq cman; then
+			myconf="${myconf} --with-clvmd=gulm"
+		fi
+		if ! useq gulm && ! useq cman; then
+			myconf="${myconf} --with-clvmd=none"
+		fi
 	fi
 
 	econf $(use_enable readline) $(use_enable selinux) ${myconf} || die
@@ -81,4 +89,10 @@ src_install() {
 	if use clvm; then
 		newinitd ${FILESDIR}/clvmd.rc clvmd || die
 	fi
+
+	ewarn "use flag nocman is deprecated and replaced"
+	ewarn "with cman and gulm use flags."
+	ewarn ""
+	ewarn "use flags clvm,cman and gulm are masked"
+	ewarn "by default and need to be unmasked to use them"
 }