Bug #318037: version bump.

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

3 files changed, 255 insertions, 2 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index df5b92257201..2d4c1721081f 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # 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.205 2010/04/22 19:33:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.206 2010/05/01 21:21:04 robbat2 Exp $
+
+*lvm2-2.02.64 (01 May 2010)
+
+  01 May 2010; Robin H. Johnson <robbat2@gentoo.org> +lvm2-2.02.64.ebuild:
+  Bug #318037: version bump.
 
 *lvm2-2.02.63-r2 (22 Apr 2010)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 4be0546bd273..982d7d1e3968 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -55,6 +55,7 @@ DIST LVM2.2.02.49.tgz 766327 RMD160 e5ef6d165e37c3d2534c612bbfd861f114e6e6aa SHA
 DIST LVM2.2.02.51.tgz 790458 RMD160 7ca55e29c6d780b4b052b07eeabbd731a034721f SHA1 307281dfced6b5ab5904761a41c6a6775a511172 SHA256 7d88ebb1e74e46617f226c1ca987e337aa30c3f637c7a502e8f355096f36a4df
 DIST LVM2.2.02.56.tgz 822318 RMD160 b9bb04df127fe58d2b483035b2c17e2b049695d3 SHA1 1a70cb4d4fe7566aace9d38ee18413c79e91b684 SHA256 9c96ef2cb4a9606cb6a4af795cbb5503b04d676179b0c70a9883593992622f43
 DIST LVM2.2.02.63.tgz 862513 RMD160 49f005520ec92013d8dcb246e82236429aa09869 SHA1 0333d51b33a73cd2f38854557e72577a0523b7c2 SHA256 e41a163ba97de66e0825188311b1f0b4b181943a16e0a04971653baf99ad3036
+DIST LVM2.2.02.64.tgz 870110 RMD160 998e67cd4766cf743468c664e8a8bed969425613 SHA1 033a317f1ca8baa3b30e10cf4095f0491a10db7f SHA256 a01255feeaee33cb4690705bb12652455823a6a854d1a9323446009a147a1e8c
 EBUILD lvm2-2.01.13.ebuild 1470 RMD160 125ecf8a32609d67876e16afa155aa256bdc22ee SHA1 95c96a2158c40bc325da6eeaded050e9e426a0e5 SHA256 b3ee4c923da035604cdf69673c12824c7b74a1716550496ce38d9281d39fa6ef
 EBUILD lvm2-2.02.33-r1.ebuild 4538 RMD160 c754ec3bd1ed9a4e405f72966fef3ec0736c824b SHA1 ef5a5926d943a94f055a6326817e301295e20c48 SHA256 ae0289f37158c00ef8b5c10de351452ed55d7dfa8e9bbf40fa54659adefc947c
 EBUILD lvm2-2.02.33.ebuild 4509 RMD160 c71985cd049d14ae22eea86b2ba742478a2683c1 SHA1 44dbc8c1c4c3f6c9f5e05fd00393233df6309ded SHA256 8fc4a8ae48d6ae2683cd58edd7c978b2b2e30738b3a2f8d747e045be3e7a21c9
@@ -82,5 +83,6 @@ EBUILD lvm2-2.02.56-r3.ebuild 6832 RMD160 f37db7d87ba735470f965654d7f15dea0373c0
 EBUILD lvm2-2.02.56.ebuild 6486 RMD160 3a14e38c19adf2f87e03cf092cb921817e43a029 SHA1 e25b584d20c400c2ad98e0547cdfe907f22ce5ba SHA256 78b5d0ef4ac096bda9926445980582e08ee9b48343720aa5671912c218234a20
 EBUILD lvm2-2.02.63-r1.ebuild 7537 RMD160 7d53615e3e7dc881c46bce8cc7561b7c13fe8694 SHA1 0c040cce770d5f3a01c5ab79f3e85fb388acad25 SHA256 7091615726f6c1f4e5b475781546f502fd49d0ca398833458c4be9e864c90d7f
 EBUILD lvm2-2.02.63-r2.ebuild 7675 RMD160 392d338b555acb6b0357020e5017ea64b123981e SHA1 e0468b7e5e81603dcf1c965dbf734c467c083288 SHA256 d0cf75b52d08f7fa3bd2bbe38ea76ee9ea85dc49be354e8bfbec029e5c594ad5
-MISC ChangeLog 35964 RMD160 c64e226ae0ea874374fb3b2829562c422e3d29ec SHA1 a0968b82e38a4c762ca2e5b2764490e8face1b21 SHA256 b0a66acc87592caf79770545d54c249715198a4b9f1b272e6008d0e8feb8f518
+EBUILD lvm2-2.02.64.ebuild 7893 RMD160 d7721533361b006c0ebe8e98413609e8dbfe4b7a SHA1 a4ac4ef4c32e289856123ef367a36d8dfa72e8fb SHA256 c988859c187f8718f54f38b66387e3ab6f7bf549991c2e3ff253eb860f63b9ff
+MISC ChangeLog 36098 RMD160 3f82329e324c8cf28934c73018a36714b499b5f0 SHA1 c5cf178eb6b78ef96297614ff48a31e256b078ef SHA256 f19864325000fffbbd7b1eac0c3a95a97a284f51ed35b17ad4bdc11f9d552781
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/lvm2-2.02.64.ebuild b/sys-fs/lvm2/lvm2-2.02.64.ebuild
new file mode 100644
index 000000000000..b15a661f5871
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.64.ebuild
@@ -0,0 +1,246 @@
+# 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.64.ebuild,v 1.1 2010/05/01 21:21:04 robbat2 Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs autotools
+
+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-146-r3 >=sys-fs/udev-151-r2 )"
+
+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() {
+	# 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.56.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
+
+	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"
+	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
+
+	# 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.49-r3 lvm-start.sh || die
+	newins "${FILESDIR}"/lvm2-stop.sh-2.02.49-r3 lvm-stop.sh || die
+	newinitd "${FILESDIR}"/lvm.rc-2.02.51-r2 lvm || 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-1.02.51-r2 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd 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"
+}