Use udev.pc pkg-config file to determine correct udevdir for compability with sys-fs/udev >= 187.

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

3 files changed, 287 insertions, 10 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index c0fd2d06c818..01c3d583c1a9 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.274 2012/07/05 08:55:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.275 2012/08/08 07:54:45 ssuominen Exp $
+
+*lvm2-2.02.95-r4 (08 Aug 2012)
+
+  08 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +lvm2-2.02.95-r4.ebuild:
+  Use udev.pc pkg-config file to determine correct udevdir for compability with
+  sys-fs/udev >= 187.
 
 *lvm2-2.02.95-r3 (05 Jul 2012)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index b08ed3c2dd7e..3f6197d62c0d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 1.02.22-dmeventd.initd 536 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191 SHA512 6f5e1ff94c4a89224f30d76821820e8e08952c929418892be623afc8b57cbc2f4e78dc2a293e74ef4fbcc0cdd49ac986cf76eff689f0280c4b3d0c8b96483f0c WHIRLPOOL 0a4647eb42798f0281704a50fc4cf1b0e2e90f11bca2362ee67c8ee50971b4743881e049520519038271b8fd7d6f150ded942832f20cc3705f1d491f71810745
 AUX clvmd.confd-2.02.39 213 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a SHA512 9614c4188c9a5bcf398d1f521b52d7e2281fcdf76265fdaca4acda22be282d8468e82b54a2661d5753f4b9a442ebe93a60daf87c846db4e275a283f71c9fd8e2 WHIRLPOOL b429d06a5200d37f46e72190060bc2fe866575ba441b5f92d12d939bdc5d411ef37e895a7369bbaaf733b1a0d0305a05d499c7ae6c7360fe8767e902d2a3bfc4
@@ -72,17 +72,18 @@ EBUILD lvm2-2.02.93.ebuild 8277 SHA256 6cca39403c10e212e7f7edf0f1f6eb6859fd515a6
 EBUILD lvm2-2.02.95-r1.ebuild 8435 SHA256 741d0030c39f63b1794ebe935e6b6bb4e6f4aa86045ba661f61ccd3bea5cce9c SHA512 14611313ed282a2107e0860f37b40173678b415a1f669c6dc28f532a29d6338c4fd0f88647d51cb06d2cb100c400dfa64491f69d3127ded3f7e989b8b0c58e71 WHIRLPOOL 619647401bb1477475695ea9179dd26415ec0aa4956cfc2804e47f7e194bdc49f7962a787c4b558ac7079e9cecb7411f277eb17a4078fdc312e95e4d9081cf0b
 EBUILD lvm2-2.02.95-r2.ebuild 8362 SHA256 fbe641df066b4b2ab5a8675540890ed9362958ccd1ca2e656ebf45f948114d89 SHA512 1eaa6beaf7df201e0c8821a781fe9422bee1c7157c97641e86531ccd1fb44a4272c06b276559be46919a7dcf8b793b5db7e3bd2ee56663b0299bae0443856f17 WHIRLPOOL 0df44750ddf83b499b68c3c404992b1719b3bc4cfa7c0b8150d71d28821d98ecf7b71577009a2127643d85ccdf5f02dff9dc45beb6530025b19b419608444f36
 EBUILD lvm2-2.02.95-r3.ebuild 8467 SHA256 a8b5a2e583d52bb15870f2dc3263a09bc2e699f226ba8e1201f68bf310033186 SHA512 11d78513738fb76d321f3f275c3890be96d1d6fe8329d2c79d10a569875f8b444738eaf6643af7fe2109306d7b163fc490a1163b34131051db4dd63e7b16ffb6 WHIRLPOOL 942905314fdf153cfc33ba696caddcc3c362f3037ba5a1692e94628ea07b27a876537b6e3ff3f6704ffa14fb8367c199cc33e7c746ab5f99486f61590ded56ac
+EBUILD lvm2-2.02.95-r4.ebuild 8576 SHA256 d37fc774ea63a4e9ed12f9793ba7e8e0fde50a6a5c01826c1ab053233be65c13 SHA512 9443d4f672f7650d69f467d1970fcc77d73b6ff21a9454c629a3a12e684a7842561245058d457188c2177e977fab5923dbac1a2dc56d71cdd100edc3be6a46a7 WHIRLPOOL 3efce3f6687460fc6bb3a057219e8fa41e73322414a803523deb9fe24dcdd64b09dda1cbcb2515df3fa60bb2c1ba4a0c5d7fea0b9e64e977f09247efa4d16992
 EBUILD lvm2-2.02.95.ebuild 8340 SHA256 fbd1b45682794c1567c0ee446732aa82ecd09adb8c9e1302f4abe3bee0cc81d1 SHA512 a248b9965ffa4c61cbd32fd6066ba19c10ac75e825bf09d33acb0990322c2756188b780f48c64ed1e79f8f8530060faaa860652606dcab2dd7499d0f5d38530a WHIRLPOOL 34b71d19dc765cab3c67181d99b5d8d7b4af2e39afdb1bfc525b8d2cc1965d887ab5ea93461793c23c81d241566b2011a9f8bcba8e1dfeb58e25731cbec72713
-MISC ChangeLog 50616 SHA256 853443aa2adc95a16458a28d0f5ffbd104fd5eb7674bfd7615b6d6e1a6c29501 SHA512 3c5689a13288c39b7f6b453f31e9e43b5315cabf80b109c6b974b02a5ff4ccda20b004a425c3b9e42783f923c6bbc7295d84ac0d23d9bf1db6af7b4953557a90 WHIRLPOOL 1ae522a14b38d41fa33048d012458221fcf097872fe4bb468858ddb8fb269d42698dfac04e07c088200080033c5ed85e5a3aa796aa9e862c39267bb4913818d4
+MISC ChangeLog 50830 SHA256 eacdfb56401fb6117243b0484470095eb7943bd55ae708d927f9a88cb8824161 SHA512 659ce5a80309f87e4b8a778e1d8cecc0267fae7f7aeb725d96f2d7f73a364e914937c82a2128730b07381244b7eede395634e3d03928cf0063505899e92844ef WHIRLPOOL a8bff4cebbf879abfc1bb71578eb41faf9c25b833a1dc6be94877f525578bda3437061fb2cb4a2365131d2d1ccf4084c945891ad130d2a0498ccc0f4aaa1dcad
 MISC metadata.xml 822 SHA256 419b6c05e9d710ff09188d6fd97d1d5a2e1f6a40ee04cfb9b8673c4898ea3a5d SHA512 a5a3c4a5a6eec44b451ee78077325e466cb9205ae8dcc5095792b93c0bf9d87fad71d81c04265480708d59a4cf45e2fe863f06fa1650176a5a2e03a1e2ed1098 WHIRLPOOL 111c1c52eda324439850db82ef69a0c5659186db646857ea549963a38b4b76a67bdbdf0a3ff8945ee8ccacf9bdcfd827ce94482d63fee55956eca08ee6d869df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP9VVjAAoJEEdUh39IaPFNDjsH/16C3Uznfu3USja8tnxSzYIq
-EIOEkU1CY76v+3bxDBkCNmkWidT3ze6vgvxFHFbiFMns1lbmfbGjTL2pqwXb9hyc
-Frq6eM358u1OIgnBhgRcX2ft2gt4+NCdkABoko8In5V7qDjzuwZf/TjE7VXDRv5o
-KRf1Nmf9GaZZMf8D07RYmJteIBSH3AAbHTmo7uvBx2eE5K1WxXoh/NRCjFCZTCs2
-gP6LyhWUfrYW9T0QkWyJ4koScueQUoXai6sf/tOP5pv23Ql0vBbc472t1G+DCoLJ
-OGl4KFZhT0oLcIkq7KndB+XQCysWAix5Yht2iC3w2Wruc8uodCmvPaheqUCqzic=
-=5CvY
+iQEcBAEBCAAGBQJQIhs5AAoJEEdUh39IaPFN0SoH/2BMMlbHuDfqnZTNYFUsOX+/
+rJ2ptEiyrKahssUTBHU2WQOnxzflOUlXaB/d5ydQXev5Nugv+d/9dp1r8bPPiqiH
+s41P4cMjK8TQInLYCMRh3whfY6BDheLogio3fVC9iEOCU2UPC4cp+WLx8hq/XFuC
+snomCANflB61Cva2YeLh5ph/DQR15cYOl3ysU/QN58MP8xEER/HwMuzYzI5PnkSN
+aDPRdRwJV0uP+/9yeYAaf9KZP/YwCFSaYHXB5O3OUYt3CgbnrafKWR8aTR7nolOj
+PfTriISmx7Pj9eLhYrc+sZv4VMGWQMLfU8y+eo+iPiU9bkEj1hFRE0sVpF2JvRU=
+=H8YX
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild
new file mode 100644
index 000000000000..e12c3db3b3d2
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild
@@ -0,0 +1,270 @@
+# 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-r4.ebuild,v 1.1 2012/08/08 07:54:45 ssuominen 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 ~amd64-linux ~x86-linux"
+
+IUSE="readline static static-libs clvm cman +lvm1 selinux +udev +thin"
+
+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 )"
+
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available.
+RDEPEND="${DEPEND_COMMON}
+	!<sys-apps/openrc-0.10.1
+	>=sys-apps/baselayout-2.1-r1
+	!!sys-fs/lvm-user
+	!!sys-fs/clvm
+	>=sys-apps/util-linux-2.16
+	thin? ( sys-block/thin-provisioning-tools )"
+
+# Upgrading to this LVM will break older cryptsetup
+RDEPEND="${RDEPEND}
+		!<sys-fs/cryptsetup-1.1.2"
+
+DEPEND="${DEPEND_COMMON}
+		virtual/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.
+	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
+
+	# Upstream bug of LVM path
+	epatch "${FILESDIR}"/${PN}-2.02.95-lvmpath.patch
+
+	# Upstream patch for http://bugs.gentoo.org/424810
+	epatch "${FILESDIR}"/${PN}-2.02.95-udev185.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
+		# 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"
+	use thin \
+		&& myconf="${myconf} --with-thin=internal" \
+		|| myconf="${myconf} --with-thin=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"
+
+	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
+
+	local udevdir="${EPREFIX}/lib/udev/rules.d"
+	use udev && udevdir="${EPREFIX}$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d"
+
+	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)" \
+		--with-default-run-dir=/run/lvm \
+		--with-default-locking-dir=/run/lock/lvm \
+		--with-dmeventd-path=/sbin/dmeventd \
+		$(use_enable udev udev_rules) \
+		$(use_enable udev udev_sync) \
+		$(use_with udev udevdir "${udevdir}") \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}"
+}
+
+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}
+	newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 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
+
+	# Device mapper stuff
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 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"
+}