removed gulm support, ebuild cleanup, version bump.

Package-Manager: portage-2.1.4.4

6 files changed, 25 insertions, 124 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/Manifest b/sys-fs/clvm/Manifest
index 33056a70a7e8..7e3775d4f200 100644
--- a/sys-fs/clvm/Manifest
+++ b/sys-fs/clvm/Manifest
@@ -11,18 +11,14 @@ AUX lvm2-start.sh 991 RMD160 ef2f8a7b53c51bf690371477efe5889c4bf1060f SHA1 62e9c
 AUX lvm2-start.sh-2.02.33-xm 1182 RMD160 e272346185782bdff09176a6ae74e1a5e381f433 SHA1 7d0e59f226dd181e48e6e9f23e23be8f9d5637b2 SHA256 353fea1fa16ade9768a0d20f36a23816eae55f6fe4600d75bb77c492d843332f
 AUX lvm2-stop.sh 1941 RMD160 6fcb780e95f5434beee7897428847f6652c1f330 SHA1 8d2ff11e09a04594d339fd1f71dd8011b449b3b2 SHA256 e2d20df350495c1178180cda92b8c6059dba048aad319528aa979e19ad07e50f
 AUX lvm2-stop.sh-2.02.33-xm 1952 RMD160 23e34c8d93ca24401d0045a6ca13fb6f4846ee72 SHA1 ccff4d9f744d83da862a11cae72e562ea9164fee SHA256 06521e5f9f88e44b4feedfcbf0179a8da6b74c321a754da0f62f300197707853
-DIST LVM2.2.01.15.tgz 466225 RMD160 3e83eb86b4705212c01d688d4779f9f95007c365 SHA1 115d2ad69d2b0c280578774442c4f669bfb6cf1e SHA256 80b47604ace83db4450f43d94a99fdf2ca317323fde8a591f57290d28ece7d3b
-DIST LVM2.2.02.09.tgz 487599 RMD160 ee56c644c567a24c3de04f1fd733072e21eaea18 SHA1 0fc3e524a19129234141578de17492febfea8ac1 SHA256 d6493169666058ea7514b6782de9985d1df1230fcca072306dbe645bb91ac177
-DIST LVM2.2.02.33.tgz 558820 RMD160 903d72844c4b309f26f9e58c4245b4f7377e23c7 SHA1 eb96a9f0cd90bdb61a8d5d5d44bd0b066420b70a SHA256 f8af333573e37b73ecc17eb0422e2ae9918e1e4f87a72f8e4054663e7d05e4b8
-EBUILD clvm-2.01.15.ebuild 1256 RMD160 1e0c2cc51cfdff5bd566a6c11ad57070e384e6a0 SHA1 52442001b80a7c27f33f2866d82c0998d56a583c SHA256 29f203b7b1e76cb64919eaa122370dc8329bd8ac5c8fd776bc4ce50b13d1ce27
-EBUILD clvm-2.02.09.ebuild 1340 RMD160 ffd70edd09aa722d02d81241552c68d618a2604d SHA1 91136ffb07918a230e5f15b9a36ede15d05321c9 SHA256 0210a1d034f311fca8ccc19dfdeabd6b4ea46cd1166494d94e91b457282cd85b
-EBUILD clvm-2.02.33.ebuild 3565 RMD160 67ff5e01e9b3735c827c39f978e2b10d0cee9abf SHA1 251e8cbc9efc7cd4dd1d8593fba07973bd39ae12 SHA256 dc9c520e7ae8b1605d5834ce0914d3d558e960e3f492641e062e6cf8900447c1
-MISC ChangeLog 3904 RMD160 bc97a8b2dc09b4bd5a6bc333a0adb601c5755b9c SHA1 e07d5be191c4bd53489e66b19c6ea95e9e059306 SHA256 5a119ed89e1087093c25f3382ffe6d7d7800809120ad1032bf59e0769ae66d16
-MISC metadata.xml 341 RMD160 4a37e74b3198dfe380a72491e84d1762b7ccee3e SHA1 5f15c95eb72d5202c422c5ce20c2ef9a24fb2e8e SHA256 37db40854a2cdf1e89d594e5e54d882980875e00ee5d740d3f2cca5c89dd1eea
+DIST LVM2.2.02.36.tgz 568884 RMD160 dae1925160373c9f8e3c58954b394015c654c667 SHA1 29ddaf10a49868fb8d85afd21c8e7f6943846eae SHA256 359000abf276c65a4cab0ac682be3d0891130b75733a09543e340bce22486df7
+EBUILD clvm-2.02.36.ebuild 3642 RMD160 6a580f93e74ccf6c7e30bfa46584bd3c10c358a9 SHA1 80a639b405c496376350a78b30526806a597fe26 SHA256 febc12abe32e4598d0a3429948e3d199449077e266c507325792a316a1b466cb
+MISC ChangeLog 4284 RMD160 45bdf4198e16ca412e9415373035da4f9bd869f0 SHA1 8d9d6000ae0eef6371ce3485ed880b1648ac9ac8 SHA256 3c6111b766beb407fa137e86933e71a42665da3179d048106cd20425731d18ec
+MISC metadata.xml 242 RMD160 bdee469b95fdc095ed18e6620d86fea03f57194d SHA1 36aca1c80fee8d2f302ef9d9e6422cd39f100b7d SHA256 b9e9b228fd97e685c563a2ab1e5fc9ed5524fb6b36e909229f76629a7229865e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkivHrMACgkQoeSe8B0zEfzD2wCfaL0BoOrvWBmA+bgeAXx75Ygj
-SMwAniNfJVJkrv5ymdBC6rdCOU3lQKYI
-=pO7L
+iEYEARECAAYFAkkdTskACgkQgMUyd/cdjWufxgCeJECmHtl4JDuqLuyhUBa7bsyD
+UDUAoIt9l6/rUaSkcswBxTK7HeMIanQs
+=EJUP
 -----END PGP SIGNATURE-----
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>