Version bump. Include bug #409769: ability to disable udev support. Bug #403263, #382939: updated clvm dependencies.

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

3 files changed, 271 insertions, 22 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 578f563d5869..90dffc2d4305 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.264 2012/03/26 21:22:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.265 2012/03/27 02:33:37 robbat2 Exp $
+
+*lvm2-2.02.95 (27 Mar 2012)
+
+  27 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> +lvm2-2.02.95.ebuild:
+  Version bump. Include bug #409769: ability to disable udev support. Bug
+  #403263, #382939: updated clvm dependencies.
 
   26 Mar 2012; Mike Frysinger <vapier@gentoo.org> lvm2-2.02.88.ebuild,
   +files/lvm2-2.02.88-respect-cc.patch, lvm2-2.02.92.ebuild,
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 98910acc63e5..afa75be8f733 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191
 AUX clvmd.confd-2.02.39 213 RMD160 d23f8acd6a844e05a3e0da83939513ef0dfab0d8 SHA1 546bfd48a7cfd7e7ffff07861f90e2b8ee29d436 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a
 AUX clvmd.rc-2.02.39 3682 RMD160 891e8f770a5566fc9102cc02db8ff81174791aca SHA1 411670cedc62709e00ff2c0b5d883433f02ef9df SHA256 d60d88202589899e0856ac819cef1599103b7d5dc412afe5e0e38fc224aa79a8
@@ -46,6 +43,7 @@ DIST LVM2.2.02.85.tgz 1000194 RMD160 720db32d0b1c3d3803075b543f3ffd09aef54ff1 SH
 DIST LVM2.2.02.88.tgz 1029151 RMD160 a5918c6dfef8300b8ad9ab53e913ab487a051436 SHA1 05a4fb09cb5e3d680ad1b268c941968853fb1979 SHA256 a129d1d3949524da7d6d2a67218254baea02df06a6744faa5808a4182b2fb432
 DIST LVM2.2.02.92.tgz 1120013 RMD160 e1d469cefbdd8cfaf4aecd03ed334d546b240996 SHA1 3550e585456a7b9d1789cab8fea998863c69e9ff SHA256 6203ac8e7713d085d6051d72b858f1a86902dea9379cff3edaf13c2adf3a5143
 DIST LVM2.2.02.93.tgz 1121289 RMD160 f69e5b0b6828716ec3f3f7bb5fcd4bc95147f3bf SHA1 82e282e8d95652ac308ddb73cb8f3425b9019fd3 SHA256 51bc2a74ef973eb0103fc81a5ab6f9151b271111d857642b1437d8d6659a9bb5
+DIST LVM2.2.02.95.tgz 1156414 RMD160 0a9785fd52029240a069cbb40910fbdf3de7ad65 SHA1 f61dfbd8e9219291d11de3d70f0b3d20a29fae85 SHA256 0335af36a151dafe5778da55a684546bfb98e7d3193834915b5efe95dbed9125
 EBUILD lvm2-2.01.13.ebuild 1470 RMD160 125ecf8a32609d67876e16afa155aa256bdc22ee SHA1 95c96a2158c40bc325da6eeaded050e9e426a0e5 SHA256 b3ee4c923da035604cdf69673c12824c7b74a1716550496ce38d9281d39fa6ef
 EBUILD lvm2-2.02.67-r1.ebuild 8258 RMD160 7d74055508cbbbc0f520efd3f1439ecdbde1d3fb SHA1 c88ba5d5710d8a892b9adea3e628911c928826b4 SHA256 30f308896f9ec401b6a1f673837e2d9159d4f49c56795c1461af1b2daab0eb47
 EBUILD lvm2-2.02.67-r2.ebuild 8326 RMD160 a3a00d56f47f28938efbd16c77b44a509449c391 SHA1 b77471826447f673e7026d4a4db2de9db2b6f59b SHA256 4f5c660e507baa800950a5643df9f4e016657e8285ef8288096c2c11840c021b
@@ -63,22 +61,6 @@ EBUILD lvm2-2.02.88.ebuild 8090 RMD160 91253ec4d9e358ba10345fa8423e53cfcff8a3c1
 EBUILD lvm2-2.02.92.ebuild 8264 RMD160 c372906c947bc9e4e7af6d3aa4171a0bcdf976a9 SHA1 aacd98646d26454759463adf5939c5bd912a926b SHA256 26163b3024b90f3d936ce4376fa42381a0d31e85231b1b615fed61e744abce49
 EBUILD lvm2-2.02.93-r1.ebuild 8279 RMD160 7ba04100a4035b25097626cbcdd12f49080fb425 SHA1 25eff1a536d5d89b7552c28164f297dd79c18b88 SHA256 e037e5f5804eddc1df3d228e3c9c5f761d5491f106cf96cd742c0d1c1d78b167
 EBUILD lvm2-2.02.93.ebuild 8278 RMD160 c1fac06425b62951f276c104c4d0dcb31490acd6 SHA1 53071267503f23946ce007b374a7d91500785782 SHA256 928999e940218606414af49aa36b6f9af87548dff4fb520d6ab3aa7e18a0d730
-MISC ChangeLog 48229 RMD160 a2a1aaed9dad0ae746c29e39e89e925a7e684f6c SHA1 18db037b1fb0b6b2e56c98576ba39769f37cab31 SHA256 9068153c694f2558839d162e0b9724e4ec7167fcb1457627d2bc98940c056205
+EBUILD lvm2-2.02.95.ebuild 8346 RMD160 6c7792a47ca0fbe4b0a71789dff01ce96f105a63 SHA1 cf49be7cfdfc340a7c7728481eb9c02ef2258310 SHA256 91324b26cc35fab744065c5db0e47270bf96dc3c5da3b8d56e760039bc4f6714
+MISC ChangeLog 48456 RMD160 4886e954380f94a318d3fbaf425e649006359538 SHA1 4f158306c0b29cdb736e2c62fd0fe5dabc6e6dbe SHA256 196cf0237d54ef03f5d2aab4a253e4319f59f4e0347c6cea5a3b50a071f213d5
 MISC metadata.xml 770 RMD160 10cadeecb8b77288ca9ae9dec2b485f5c1a33ba1 SHA1 950857278b8208a02b256f317a6687b446279a8d SHA256 b0994914cb1d6028fd0d0545c4e6d534797d20e7a40eea5d827afa836e0ea1eb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPcN40AAoJELEHsLL7fEFWNMwQAMJlyvwu5REmNm2Lap4CFt93
-cDfu9zeJhPFYgTSYifQeV7CKvjVEficzEOwOpWGlMneWf8m5Q69OD49y/Dg0rP5c
-l56i+bbG4mTZ70KkpS9knGIjKJxXa2wsyoxiCTSViHCZPnuSHujj0PcKAyzy3KeQ
-Bubbi3BxuTsybjmyk82tQNeKxGuGogK+e7T6t/QuXqk0vSH0BsJeTupBSfd/rf47
-IuSebhtUdFw4eelwOUXqDcasiYBGBW5TVRBCHYn6Q5P98QoxIEERzV645sY3046m
-J1S1rnzdWbjCOCL9v2/ZRrLdmf2yRYpY+rtvpdmTpPKrin4oISE8G3W1nSYWZg2i
-CK3K5wfTifLhbKg8J8uKP4TDMT28/mWC1Y9+nV5xjsQfSq6ZWsIybz1wboo67UX/
-E+wy/oMY25AXruChY8ge/cAmnLiCTpHGk71gFy7ua5KLoLaRCxjaEDce4lDvkjka
-tdLyqz5SsR9Gc7GuTZielpo/G4sQ2uT6IaDLSPFXvbH+Fc0DUBDIJi60qVs1JBpa
-whx8J3DBDkmxKes0KP1X5swGIClu5vRZSCRYD/sOfMXOMJTE8aWmW9lpV2xKbRpq
-4BJYh8LHqjxQtUyDFWEdd1O7J7ECariO+ig/Znt6Zraf4Ea6nq4li7ZR32J1KHmg
-aJbF0ux/3TCih1loPoGd
-=bvX5
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.95.ebuild b/sys-fs/lvm2/lvm2-2.02.95.ebuild
new file mode 100644
index 000000000000..46534979cb16
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.95.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.95.ebuild,v 1.1 2012/03/27 02:33:37 robbat2 Exp $
+
+EAPI=3
+inherit eutils multilib toolchain-funcs autotools linux-info
+
+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
+		 ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+
+IUSE="readline static static-libs clvm cman +lvm1 selinux +udev"
+
+DEPEND_COMMON="!!sys-fs/device-mapper
+	readline? ( sys-libs/readline )
+	clvm? ( =sys-cluster/libdlm-3*
+			cman? ( =sys-cluster/cman-3* ) )
+	udev? ( >=sys-fs/udev-151-r4 )"
+
+RDEPEND="${DEPEND_COMMON}
+	!<sys-apps/openrc-0.4
+	!!sys-fs/lvm-user
+	!!sys-fs/clvm
+	>=sys-apps/util-linux-2.16"
+
+# Upgrading to this LVM will break older cryptsetup
+RDEPEND="${RDEPEND}
+		!<sys-fs/cryptsetup-1.1.2"
+
+DEPEND="${DEPEND_COMMON}
+		dev-util/pkgconfig
+		>=sys-devel/binutils-2.20.1-r1
+		static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) )"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	use udev && local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+	check_extra_config
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	# 2. There are no longer any linking deps in /usr.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/lvm.conf-2.02.67.patch
+
+	# Should not be needed due to upstream re-arrangement of build
+	#epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch
+	# Should not be need with new upstream udev rules
+	#epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch
+
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
+	# Fixed differently upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch
+	# bug 318513 - merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
+	# bug 301331
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
+	# bug 330373
+	epatch "${FILESDIR}"/${PN}-2.02.92-locale-muck.patch
+	# --as-needed
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
+	# bug 332905
+	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch
+	# bug 361429 - merged upstream in .85
+	#epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
+
+	# Merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
+	
+	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local buildmode
+
+	myconf="${myconf} --enable-dmeventd"
+	myconf="${myconf} --enable-cmdlib"
+	myconf="${myconf} --enable-applib"
+	myconf="${myconf} --enable-fsadm"
+	myconf="${myconf} --enable-lvmetad"
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static ; then
+		einfo "Building static LVM, for usage inside genkernel"
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		# For recent systems, there are no linkages against anything in /usr anyway.
+		# We explicitly provide the .static versions so that they can be included in
+		# initramfs environments.
+		myconf="${myconf} --enable-static_link"
+	else
+		ewarn "Building shared LVM, it will not work inside genkernel!"
+		buildmode="shared"
+	fi
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=internal"
+	myconf="${myconf} --with-snapshots=internal"
+	myconf="${myconf} --with-thin=internal"
+
+	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"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable ALL
+		local clvmd=""
+		use cman && clvmd="cman"
+		#clvmd="${clvmd/cmangulm/all}"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	myconf="${myconf}
+			--with-dmeventd-path=/sbin/dmeventd"
+	econf \
+		$(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--with-confdir="${EPREFIX}/etc" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}/sbin" \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable udev udev_rules) \
+		$(use_enable udev udev_sync) \
+		$(use_with udev udevdir "${EPREFIX}/lib/udev/rules.d/") \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+	einfo "Doing symlinks"
+	pushd include
+	emake || die "Failed to prepare symlinks"
+	popd
+
+	einfo "Starting main build"
+	emake || die "compile fail"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Failed to emake install"
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{conf,c,txt}
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
+	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
+	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 lvm || die
+	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring || die
+	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die
+	fi
+
+	# move shared libs to /lib(64)
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+		#gen_usr_ldscript libdevmapper.so
+	fi
+
+	dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd
+	doman  "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8
+	newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /$(get_libdir)/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	# Device mapper stuff
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die
+	if use static-libs; then
+		dolib.a daemons/dmeventd/libdevmapper-event.a \
+		|| die "dolib.a libdevmapper-event.a"
+		#gen_usr_ldscript libdevmapper-event.so
+	fi
+
+	use static-libs || \
+	rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+
+	#insinto /etc/udev/rules.d/
+	#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die
+
+	# do not rely on /lib -> /libXX link
+	sed -i \
+		-e "s|/lib/rcscripts/|/$(get_libdir)/rcscripts/|" \
+		"${ED}"/etc/init.d/* || die
+
+	elog "USE flag nocman is deprecated and replaced"
+	elog "with the cman USE flag."
+	elog ""
+	elog "USE flags clvm and cman are masked"
+	elog "by default and need to be unmasked to be used"
+	elog ""
+	elog "If you are using genkernel and root-on-LVM, rebuild the initramfs."
+}
+
+pkg_postinst() {
+	elog "lvm volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add lvm boot"
+	elog "Do NOT add it if you are still using baselayout-1."
+}
+
+src_test() {
+	einfo "Testcases disabled because of device-node mucking"
+	einfo "If you want them, compile the package and see ${S}/tests"
+}