Version bump. Bug #330375: CONFIG_SYSVIPC is required for udev sync code.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

8 files changed, 304 insertions, 17 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 4486152043cc..61701e294cc9 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.219 2010/08/03 06:51:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.220 2010/08/03 18:00:50 robbat2 Exp $
+
+*lvm2-2.02.72 (03 Aug 2010)
+
+  03 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.67.ebuild,
+  lvm2-2.02.67-r1.ebuild, lvm2-2.02.67-r2.ebuild, lvm2-2.02.70.ebuild,
+  lvm2-2.02.70-r1.ebuild, +lvm2-2.02.72.ebuild:
+  Version bump. Bug #330375: CONFIG_SYSVIPC is required for udev sync code.
 
 *lvm2-2.02.70-r1 (03 Aug 2010)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 0241aac723c6..973f03ddc9ef 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -68,6 +68,7 @@ DIST LVM2.2.02.63.tgz 862513 RMD160 49f005520ec92013d8dcb246e82236429aa09869 SHA
 DIST LVM2.2.02.64.tgz 870110 RMD160 998e67cd4766cf743468c664e8a8bed969425613 SHA1 033a317f1ca8baa3b30e10cf4095f0491a10db7f SHA256 a01255feeaee33cb4690705bb12652455823a6a854d1a9323446009a147a1e8c
 DIST LVM2.2.02.67.tgz 893643 RMD160 ccaedf2bf7c56901b9ff15b204620934e626dd34 SHA1 511605f31e637cb34f4c73403ae079aa0f65daaa SHA256 6cf217d26eddec1a33cdb06958f0ae1a191e7bd9d42f63646a1c93ceeb47c702
 DIST LVM2.2.02.70.tgz 909516 RMD160 0f1911a46283898164299a7dd2d5264eb1eb5b16 SHA1 6f88114e72204feee491befd5f0e203036b90f11 SHA256 61a2bafce16d58200ca066cbfe4f8650cfae547369d1c722c3a3680a1f2284e7
+DIST LVM2.2.02.72.tgz 931612 RMD160 1f537b305f51838a157fdedbdbffb95e566ff4ca SHA1 a594980f7a6dad8f26572fd1fcd9341184837094 SHA256 112e8a1bccc21c6d4d3095f2b26c38535cb2c88fe0087fbbce9b521e587d80b9
 EBUILD lvm2-2.01.13.ebuild 1470 RMD160 125ecf8a32609d67876e16afa155aa256bdc22ee SHA1 95c96a2158c40bc325da6eeaded050e9e426a0e5 SHA256 b3ee4c923da035604cdf69673c12824c7b74a1716550496ce38d9281d39fa6ef
 EBUILD lvm2-2.02.33-r1.ebuild 4571 RMD160 88ca4fa1c0ce0cc8618785bda4e36a9781294838 SHA1 6cd2a106efd2397e1e500455c71d7ec2a27fdf79 SHA256 235e5590b154d17fc8f3839936ed8ee3ceb43df182c506f1a73082eb842a04f7
 EBUILD lvm2-2.02.33.ebuild 4542 RMD160 b803cbf71bf828503a5d82cb5f4c6294e99fab71 SHA1 4fd433145e8582c9ff7b5682e996e55661397628 SHA256 22ebc15aace1cfce6259aa20162114a9639215763d39ef2b5d3ba657c9bea2d1
@@ -96,10 +97,15 @@ EBUILD lvm2-2.02.56.ebuild 6519 RMD160 15073500bde596fe5c5705f16809e62053b69b2b
 EBUILD lvm2-2.02.63-r1.ebuild 7570 RMD160 14640b0ec48c6906085c14b58357d02864f6fab6 SHA1 6fe1f1158d35e2f37e4594bf2b52a6515fd40d14 SHA256 574ba667ebadee7ff5c694bf99181f5180e99191740965cac7bf9f7f7849d5c4
 EBUILD lvm2-2.02.63-r2.ebuild 7708 RMD160 5e0176e9d4cdceba012dab3c6f9a929a8363dc91 SHA1 0f097f2822fb8ce1fe8b60d6f5c8870ff89af1ef SHA256 0aea1f557449094375ad26e6215f5b26beeef444c54fbfb07183729c4a04a5fd
 EBUILD lvm2-2.02.64.ebuild 7926 RMD160 ad843ab85e71c5752096d60446c8db5061e6b681 SHA1 cbc495d15de2b1ffa333ed2dce01835f6a1147d1 SHA256 a4a2ba51fa1d46a423cb1ae8adf942c0b2c7ff7f12298b4dc89c11367744bf00
-EBUILD lvm2-2.02.67-r1.ebuild 8116 RMD160 e364ae957d7644b8db1145c8bbe021c084eabd61 SHA1 f3ab30befa52fe8775ac1e11dbbe0e67559fbcd3 SHA256 db68e52639f4509bbd24bb4a8fd97be82be54be3caa7e94f06fbd020e2cc0b64
-EBUILD lvm2-2.02.67-r2.ebuild 8189 RMD160 269d6cb4a5384d7af4f085303fd584aad3fb3308 SHA1 cf671d108a456a2ac54c5f6d90d2ef868c46debb SHA256 d18f075a072fd5adad786a76ef727776bf5a08347b38d4cbceba1f44861ba40d
-EBUILD lvm2-2.02.67.ebuild 8110 RMD160 aaf4a019266f6f63091e3fbb8de92bc5ce26f99a SHA1 0ba61b30d452f19563d186df511828de3d08a06b SHA256 85f7d288549b04e66f2a6cdb0db85e4f787bd331e819312a6a69729f206cd801
-EBUILD lvm2-2.02.70-r1.ebuild 8248 RMD160 6adfd6a0f9fdeefa60900c694a8f194e10f2358b SHA1 3f14c6970509840fadae9b10dc57ca88133c408f SHA256 5b9fb06d6a7c9d32c35fd4115cf21c46638e42a293c5db2049d63e03c65578f6
-EBUILD lvm2-2.02.70.ebuild 8191 RMD160 ba0d3dde9ee6e4bdfa364067d55ed0eb89cdaff4 SHA1 a81dcb981ff2bc762c0f867a710712a465ac545b SHA256 e8d57b3aabac66e950f07da49f66a9ebc0599e7cb8b023341a1253700041c08d
-MISC ChangeLog 39475 RMD160 93274ca7e4c18e11c5e1596b04d5a62b5bbc7003 SHA1 bfb68acb06e6c530cd7918f85086f9e98199b554 SHA256 68c03585b26808025d9e4a5dfdcb9990eea53ff7b03946d3cdbe202ce1fecff4
+EBUILD lvm2-2.02.67-r1.ebuild 8258 RMD160 7d74055508cbbbc0f520efd3f1439ecdbde1d3fb SHA1 c88ba5d5710d8a892b9adea3e628911c928826b4 SHA256 30f308896f9ec401b6a1f673837e2d9159d4f49c56795c1461af1b2daab0eb47
+EBUILD lvm2-2.02.67-r2.ebuild 8333 RMD160 33c46a1219980bcee972d630d1ce5dd5a4cbd155 SHA1 216af9c7f86e0051fa4836d1e905cf8213bfa43c SHA256 16d9845292a9d52f9f7aceb8efeccbbe50bafd1a6d142bfaf601bcc008391d72
+EBUILD lvm2-2.02.67.ebuild 8252 RMD160 9da463656087e984efe4adecdc6649ba05068d5f SHA1 bac7dbfc373755a7ff3e1ac99196e0088f2e3901 SHA256 3d6d8b185354003c610216cdfd0390b8b951387e9ab31b6c6a2b1dd37c857730
+EBUILD lvm2-2.02.70-r1.ebuild 8388 RMD160 c8a7b8ecef2dee4bb5cbd41450deb8d6af3a64c3 SHA1 cb20558f6f5b3746286a557e56f797cbc77882a2 SHA256 29bed331fcf2f6a8a7ebba091a3006352fee478d525e0c43939f527336ed5feb
+EBUILD lvm2-2.02.70.ebuild 8333 RMD160 c8aba640d2b0459c0925b10e847feed73b8feac3 SHA1 651cf96b401c3ea0321088c4847f0c3025d26113 SHA256 e08c967261235d0a14f447c426b1c34a3e9417b35e8acf582092ea7582952519
+EBUILD lvm2-2.02.72.ebuild 8385 RMD160 1a6df70db717d8fdcd9a3ec3baca327382596b0e SHA1 c50c7f040e11492a05c7f265379d2ae07210d280 SHA256 517ffcb71d1d0ca1a16d7c8bfa3c500985712c2f4392e53ea7584635d2b7c5fd
+MISC ChangeLog 39772 RMD160 3518847273e5f91cac636fdca2fad836d3a8180d SHA1 55f3a044197d650b23d19e0001a09b1a644fe416 SHA256 d2c866aea0ba728f178b099c3c4d5fdb9cb515783fd57db8bf2eed40a43067d8
+MISC lvm2-2.02.67-r1.ebuild.orig 8116 RMD160 e364ae957d7644b8db1145c8bbe021c084eabd61 SHA1 f3ab30befa52fe8775ac1e11dbbe0e67559fbcd3 SHA256 db68e52639f4509bbd24bb4a8fd97be82be54be3caa7e94f06fbd020e2cc0b64
+MISC lvm2-2.02.67-r2.ebuild.orig 8189 RMD160 269d6cb4a5384d7af4f085303fd584aad3fb3308 SHA1 cf671d108a456a2ac54c5f6d90d2ef868c46debb SHA256 d18f075a072fd5adad786a76ef727776bf5a08347b38d4cbceba1f44861ba40d
+MISC lvm2-2.02.67.ebuild.orig 8110 RMD160 aaf4a019266f6f63091e3fbb8de92bc5ce26f99a SHA1 0ba61b30d452f19563d186df511828de3d08a06b SHA256 85f7d288549b04e66f2a6cdb0db85e4f787bd331e819312a6a69729f206cd801
+MISC lvm2-2.02.70.ebuild.orig 8191 RMD160 ba0d3dde9ee6e4bdfa364067d55ed0eb89cdaff4 SHA1 a81dcb981ff2bc762c0f867a710712a465ac545b SHA256 e8d57b3aabac66e950f07da49f66a9ebc0599e7cb8b023341a1253700041c08d
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild
index 93b5c8c9d18a..c79a5506d85e 100644
--- a/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild,v 1.1 2010/06/09 22:41:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild,v 1.2 2010/08/03 18:00:50 robbat2 Exp $
 
 EAPI=2
-inherit eutils multilib toolchain-funcs autotools
+inherit eutils multilib toolchain-funcs autotools linux-info
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
@@ -33,6 +33,9 @@ DEPEND="${DEPEND_COMMON}
 S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
 
 pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	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
diff --git a/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild
index 35ce159a33ea..d78f50ad19ac 100644
--- a/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild,v 1.4 2010/07/27 18:43:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.67-r2.ebuild,v 1.5 2010/08/03 18:00:50 robbat2 Exp $
 
 EAPI=2
-inherit eutils multilib toolchain-funcs autotools
+inherit eutils multilib toolchain-funcs autotools linux-info
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
@@ -33,6 +33,9 @@ DEPEND="${DEPEND_COMMON}
 S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
 
 pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	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
diff --git a/sys-fs/lvm2/lvm2-2.02.67.ebuild b/sys-fs/lvm2/lvm2-2.02.67.ebuild
index 07796bca5324..a9b81ecb5fb5 100644
--- a/sys-fs/lvm2/lvm2-2.02.67.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.67.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.67.ebuild,v 1.2 2010/06/07 22:39:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.67.ebuild,v 1.3 2010/08/03 18:00:50 robbat2 Exp $
 
 EAPI=2
-inherit eutils multilib toolchain-funcs autotools
+inherit eutils multilib toolchain-funcs autotools linux-info
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
@@ -33,6 +33,9 @@ DEPEND="${DEPEND_COMMON}
 S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
 
 pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	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
diff --git a/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
index cfb088742519..8eab67fe4de1 100644
--- a/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild,v 1.1 2010/08/03 06:51:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild,v 1.2 2010/08/03 18:00:51 robbat2 Exp $
 
 EAPI=2
-inherit eutils multilib toolchain-funcs autotools
+inherit eutils multilib toolchain-funcs autotools linux-info
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
@@ -33,6 +33,9 @@ DEPEND="${DEPEND_COMMON}
 S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
 
 pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	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
diff --git a/sys-fs/lvm2/lvm2-2.02.70.ebuild b/sys-fs/lvm2/lvm2-2.02.70.ebuild
index f155b9ead19b..3ccedd89f0cc 100644
--- a/sys-fs/lvm2/lvm2-2.02.70.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.70.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.70.ebuild,v 1.1 2010/07/21 19:16:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.70.ebuild,v 1.2 2010/08/03 18:00:51 robbat2 Exp $
 
 EAPI=2
-inherit eutils multilib toolchain-funcs autotools
+inherit eutils multilib toolchain-funcs autotools linux-info
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
@@ -33,6 +33,9 @@ DEPEND="${DEPEND_COMMON}
 S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
 
 pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	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
diff --git a/sys-fs/lvm2/lvm2-2.02.72.ebuild b/sys-fs/lvm2/lvm2-2.02.72.ebuild
new file mode 100644
index 000000000000..3ffc9cdb81f6
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.72.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.72.ebuild,v 1.1 2010/08/03 18:00:51 robbat2 Exp $
+
+EAPI=2
+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"
+
+IUSE="readline +static clvm cman +lvm1 selinux"
+
+DEPEND_COMMON="!!sys-fs/device-mapper
+	clvm? ( =sys-cluster/dlm-2*
+			cman? ( =sys-cluster/cman-2* ) )
+	|| ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 )"
+
+RDEPEND="${DEPEND_COMMON}
+	!<sys-apps/openrc-0.4
+	!!sys-fs/lvm-user
+	!!sys-fs/clvm
+	>=sys-apps/util-linux-2.16"
+
+DEPEND="${DEPEND_COMMON}
+		dev-util/pkgconfig"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	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 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
+	epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
+	# bug 301331
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local buildmode
+
+	myconf="${myconf} --enable-dmeventd"
+	myconf="${myconf} --enable-cmdlib"
+	myconf="${myconf} --enable-applib"
+	myconf="${myconf} --enable-fsadm"
+
+	# 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"
+
+	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}
+			--sbindir=/sbin
+			--with-staticdir=/sbin
+			--with-dmeventd-path=/sbin/dmeventd"
+	econf $(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--libdir=/$(get_libdir) \
+		--with-usrlibdir=/usr/$(get_libdir) \
+		--enable-udev_rules \
+		--enable-udev_sync \
+		--with-udevdir=/$(get_libdir)/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"
+
+	# All of this was change by upstream, and if we don't get any problems, we
+	# can probably drop it in .65
+	#X## Revamp all of our library handling for bug #316571
+	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
+	#X## libdir variable.
+	#X#dodir /$(get_libdir)
+	#X## .so -> /$(get_libdir)
+	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
+	#X#[[ "$(get_libdir)" != "lib" ]] && \
+	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
+	#X## .a -> /usr/$(get_libdir)
+	#X#[[ "$(get_libdir)" != "lib" ]] && \
+	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
+	#X## The upstream symlinks are borked. lets rebuild them instead.
+	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
+	#X#	| xargs rm -f 2>/dev/null
+	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
+	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
+	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
+	#X#done
+	#X## Now enable building properly
+	#X#for i in \
+	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
+	#X#	libdevmapper \
+	#X#	liblvm2{format1,snapshot,cmd,app} \
+	#X#	; do
+	#X#	gen_usr_ldscript ${i}.so || die
+	#X#done
+
+	dodoc README VERSION WHATS_NEW 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)
+	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+	#gen_usr_ldscript libdevmapper.so
+
+	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
+	dolib.a daemons/dmeventd/libdevmapper-event.a \
+	|| die "dolib.a libdevmapper-event.a"
+	#gen_usr_ldscript libdevmapper-event.so
+
+	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
+
+	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 use them"
+	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 using baselayout-1 still."
+}
+
+src_test() {
+	einfo "Testcases disabled because of device-node mucking"
+	einfo "If you want them, compile the package and see ${S}/tests"
+}