version Bump to 2.02.05 per bug #131114.

(Portage version: 2.0.53_rc7)

4 files changed, 116 insertions, 11 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index b1363bafb575..b35f94e736e2 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.63 2006/04/24 13:58:23 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.64 2006/04/24 18:03:58 rocket Exp $
+
+*lvm2-2.02.05 (24 Apr 2006)
+
+  24 Apr 2006; Eric Edgar <rocket@gentoo.org> +lvm2-2.02.05.ebuild:
+  version Bump to 2.02.05 per bug #131114.
 
   24 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   lvm2-2.02.04-r1.ebuild:
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 5220eef80e21..288c2af19c12 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 082f5374fc5e41df87b4810006287053 ChangeLog 10643
 MD5 26327d6617337f8db55913f03d87d19a files/clvmd.rc 3667
 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09 61
@@ -9,6 +6,7 @@ MD5 d1e295db9aa6771cdc6506033bc98f69 files/digest-lvm2-2.01.13 61
 MD5 bd5702de4e53595969129c176cb028dc files/digest-lvm2-2.01.14-r1 61
 MD5 5ae9ef0569741a9c0e43621ca61cc270 files/digest-lvm2-2.02.02-r1 61
 MD5 48c308553f535bb57a58ecef7f0548c5 files/digest-lvm2-2.02.04-r1 61
+MD5 fb3f51b9f1baa5529bc23e279469eee1 files/digest-lvm2-2.02.05 61
 MD5 3216475436df8fbd33aa3ef4e2889ef8 files/lvm2-2.01.14-static.patch 1034
 MD5 3216475436df8fbd33aa3ef4e2889ef8 files/lvm2-2.01.14.patch 1034
 MD5 330a2eaf6e782fcc230e9a5003432076 files/lvm2-2.02.04-vgid.patch 2304
@@ -20,11 +18,5 @@ MD5 bfbb6af0f144e530589562ca3b79c61a lvm2-2.01.13.ebuild 1402
 MD5 68ce8d0c58bc2d71ff72354b5299f359 lvm2-2.01.14-r1.ebuild 1586
 MD5 047fa202065583e7e7cb36a5be0c8c6d lvm2-2.02.02-r1.ebuild 2974
 MD5 07ba746656ac46a3b4c903c4a4c692f3 lvm2-2.02.04-r1.ebuild 3080
+MD5 0e946457c0f13af28e0af1fc210fc73b lvm2-2.02.05.ebuild 3082
 MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFETNmPKRy60XGEcJIRAt9+AKCN+esMLAgFYWCXJ9XAGUaoElKcCQCeIyrd
-8bHcUw7dhXy75k9JxV5Kv1k=
-=BSk4
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/digest-lvm2-2.02.05 b/sys-fs/lvm2/files/digest-lvm2-2.02.05
new file mode 100644
index 000000000000..74fefe4687e4
--- /dev/null
+++ b/sys-fs/lvm2/files/digest-lvm2-2.02.05
@@ -0,0 +1 @@
+MD5 87d8615a655b9a6c1a0e234eab2485bf LVM2.2.02.05.tgz 473621
diff --git a/sys-fs/lvm2/lvm2-2.02.05.ebuild b/sys-fs/lvm2/lvm2-2.02.05.ebuild
new file mode 100644
index 000000000000..91c748f2bf75
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.05.ebuild
@@ -0,0 +1,107 @@
+# 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.05.ebuild,v 1.1 2006/04/24 18:03:58 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}"
+
+inherit eutils
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+	#epatch ${FILESDIR}/lvm2-2.02.04-vgid.patch
+}
+
+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"
+	ewarn ""
+	ewarn "Rebuild your genkernel initramfs if you are using lvm"
+}