version bump to 2.02.04

(Portage version: 2.0.53_rc7)

4 files changed, 107 insertions, 1 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 9456e0de5bc9..2715b5ad4794 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # 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.57 2006/04/19 22:01:35 rocket Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.58 2006/04/20 19:12:15 rocket Exp $
+
+*lvm2-2.02.04 (20 Apr 2006)
+
+  20 Apr 2006; Eric Edgar <rocket@gentoo.org> +lvm2-2.02.04.ebuild:
+  version bump lvm2-2.02.04
 
 *lvm2-2.02.03 (19 Apr 2006)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 6691f5bd1e50..1f7ff2621723 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -5,6 +5,7 @@ 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 75bc19619bdb87793f11cf26faaaf7a6 files/digest-lvm2-2.02.03 61
+MD5 48c308553f535bb57a58ecef7f0548c5 files/digest-lvm2-2.02.04 61
 MD5 3216475436df8fbd33aa3ef4e2889ef8 files/lvm2-2.01.14.patch 1034
 MD5 bb8fbbf10fb41b8538aba9cafb65094b files/lvm2-start.sh 990
 MD5 00655aa59deac8796636fc54ede221ed files/lvm2-stop.sh 1940
@@ -13,4 +14,5 @@ MD5 97aaa43ef70e84140f8d1b940eb73025 lvm2-2.01.09.ebuild 1277
 MD5 bfbb6af0f144e530589562ca3b79c61a lvm2-2.01.13.ebuild 1402
 MD5 68ce8d0c58bc2d71ff72354b5299f359 lvm2-2.01.14-r1.ebuild 1586
 MD5 8358870ee2d16f243988e0049dadb1ae lvm2-2.02.03.ebuild 2898
+MD5 8358870ee2d16f243988e0049dadb1ae lvm2-2.02.04.ebuild 2898
 MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250
diff --git a/sys-fs/lvm2/files/digest-lvm2-2.02.04 b/sys-fs/lvm2/files/digest-lvm2-2.02.04
new file mode 100644
index 000000000000..8a8c57a1a014
--- /dev/null
+++ b/sys-fs/lvm2/files/digest-lvm2-2.02.04
@@ -0,0 +1 @@
+MD5 954c41c42d3cfa50f12562f197bdd1a0 LVM2.2.02.04.tgz 473585
diff --git a/sys-fs/lvm2/lvm2-2.02.04.ebuild b/sys-fs/lvm2/lvm2-2.02.04.ebuild
new file mode 100644
index 000000000000..d02de2b68fc6
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.04.ebuild
@@ -0,0 +1,98 @@
+# 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.04.ebuild,v 1.1 2006/04/20 19:12:15 rocket 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="~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
+			cman? ( >=sys-cluster/cman-1.01.00 )
+			gulm? ( >=sys-cluster/gulm-1.00.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 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
+	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
+
+	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"
+}