removed gulm support, ebuild cleanup, version bump.

(Portage version: 2.1.4.4)

5 files changed, 18 insertions, 113 deletions

diff --git a/sys-fs/clvm/ChangeLog b/sys-fs/clvm/ChangeLog
index 10c752d670c4..2734873aa905 100644
--- a/sys-fs/clvm/ChangeLog
+++ b/sys-fs/clvm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-fs/clvm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/ChangeLog,v 1.24 2008/08/22 20:16:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/ChangeLog,v 1.25 2008/11/14 09:10:43 xmerlin Exp $
+
+*clvm-2.02.36 (14 Nov 2008)
+
+  14 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> metadata.xml,
+  -clvm-2.01.15.ebuild, -clvm-2.02.09.ebuild, -clvm-2.02.33.ebuild,
+  +clvm-2.02.36.ebuild:
+  Ebuild cleanup, version bump.
+
+  14 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org> metadata.xml,
+  clvm-2.01.15.ebuild, clvm-2.02.09.ebuild:
+  Removed gulm support which is deprecated.
 
   22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/sys-fs/clvm/clvm-2.01.15.ebuild b/sys-fs/clvm/clvm-2.01.15.ebuild
deleted file mode 100644
index e8954a0ce138..000000000000
--- a/sys-fs/clvm/clvm-2.01.15.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.01.15.ebuild,v 1.7 2008/03/17 19:15:52 xmerlin Exp $
-
-MY_P="${PN/clvm/LVM2}.${PV}"
-
-DESCRIPTION="User-land utilities for clvm (device-mapper) software."
-HOMEPAGE="http://sources.redhat.com/cluster/clvm/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="readline nocman "
-
-DEPEND=">=sys-fs/device-mapper-1.00.17
-	>=sys-cluster/dlm-1.01.00
-	!nocman? ( >=sys-cluster/cman-1.01.00 )"
-
-RDEPEND="${DEPEND}
-	!sys-fs/lvm-user
-	!sys-fs/lvm2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local myconf=""
-	if use nocman; then
-		myconf="${myconf} --with-clvmd=gulm"
-	else
-		myconf="${myconf} --with-clvmd=cman"
-	fi
-
-	econf \
-		$(use_enable readline) \
-		--with-cluster=shared \
-		${myconf}
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall sbindir="${D}/sbin" confdir="${D}/etc/lvm"
-
-	dodoc COPYING* INSTALL README VERSION WHATS_NEW doc/*.{conf,c,txt}
-
-	newinitd "${FILESDIR}"/clvmd.rc clvmd || die
-
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh lvm-stop.sh || die
-
-}
diff --git a/sys-fs/clvm/clvm-2.02.09.ebuild b/sys-fs/clvm/clvm-2.02.09.ebuild
deleted file mode 100644
index cbef399c9fe4..000000000000
--- a/sys-fs/clvm/clvm-2.02.09.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.02.09.ebuild,v 1.4 2008/03/17 19:15:52 xmerlin Exp $
-
-MY_P="${PN/clvm/LVM2}.${PV}"
-
-DESCRIPTION="User-land utilities for clvm (device-mapper) software."
-HOMEPAGE="http://sources.redhat.com/cluster/clvm/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="readline nocman "
-
-DEPEND=">=sys-fs/device-mapper-1.02.03
-	>=sys-cluster/dlm-1.01.00
-	!nocman? ( >=sys-cluster/cman-1.01.00 )"
-
-RDEPEND="${DEPEND}
-	!sys-fs/lvm-user
-	!sys-fs/lvm2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local myconf=""
-	if use nocman; then
-		myconf="${myconf} --with-clvmd=gulm"
-	else
-		myconf="${myconf} --with-clvmd=cman"
-	fi
-
-	econf \
-		$(use_enable readline) \
-		--with-cluster=shared \
-		--with-pool=shared \
-		--with-snapshots=shared \
-		--with-mirrors=shared \
-		${myconf}
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall sbindir="${D}/sbin" confdir="${D}/etc/lvm"
-
-	dodoc COPYING* INSTALL README VERSION WHATS_NEW doc/*.{conf,c,txt}
-
-	newinitd "${FILESDIR}"/clvmd.rc clvmd || die
-
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh lvm-stop.sh || die
-}
diff --git a/sys-fs/clvm/clvm-2.02.33.ebuild b/sys-fs/clvm/clvm-2.02.36.ebuild
index ec954c91f9dd..46402551bff9 100644
--- a/sys-fs/clvm/clvm-2.02.33.ebuild
+++ b/sys-fs/clvm/clvm-2.02.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.02.33.ebuild,v 1.2 2008/03/29 15:42:27 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.02.36.ebuild,v 1.1 2008/11/14 09:10:43 xmerlin Exp $
 
 inherit eutils multilib
 
@@ -62,7 +62,11 @@ src_compile() {
 	myconf="${myconf} --with-mirrors=internal"
 	myconf="${myconf} --with-snapshots=internal"
 
-	myconf="${myconf} --with-lvm1=none"
+	if use lvm1 ; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
 
 	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
 	use hppa && myconf="${myconf} --disable-o_direct"
diff --git a/sys-fs/clvm/metadata.xml b/sys-fs/clvm/metadata.xml
index d59c1db0eb83..cc30b8b502af 100644
--- a/sys-fs/clvm/metadata.xml
+++ b/sys-fs/clvm/metadata.xml
@@ -6,7 +6,5 @@
   <email>ha-cluster@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='nocman'>Allow users to build clvm without cman support and with
-		gulm support</flag>
 </use>
 </pkgmetadata>