Trim lots of old versions. Trim of files/ to come later.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)

17 files changed, 9 insertions, 4222 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 771548048ad0..155ebe098c8a 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,14 @@
 # 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.285 2012/12/11 21:48:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.286 2012/12/11 22:24:40 robbat2 Exp $
+
+  11 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> -lvm2-2.02.67-r1.ebuild,
+  -lvm2-2.02.67.ebuild, -lvm2-2.02.70-r1.ebuild, -lvm2-2.02.70.ebuild,
+  -lvm2-2.02.72.ebuild, -lvm2-2.02.74.ebuild, -lvm2-2.02.83.ebuild,
+  -lvm2-2.02.84.ebuild, -lvm2-2.02.85.ebuild, -lvm2-2.02.92.ebuild,
+  -lvm2-2.02.93-r1.ebuild, -lvm2-2.02.93.ebuild, -lvm2-2.02.95-r1.ebuild,
+  -lvm2-2.02.95-r2.ebuild, -lvm2-2.02.95-r3.ebuild, -lvm2-2.02.95.ebuild:
+  Trim lots of old versions. Trim of files/ to come later.
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.67.ebuild,
   lvm2-2.02.67-r1.ebuild, lvm2-2.02.67-r2.ebuild, lvm2-2.02.70.ebuild,
diff --git a/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild
deleted file mode 100644
index 086073f3b86f..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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.67-r1.ebuild,v 1.7 2012/12/11 21:48:10 ssuominen 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* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/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
-
-	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=/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"
-
-	# 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
-	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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.67.ebuild b/sys-fs/lvm2/lvm2-2.02.67.ebuild
deleted file mode 100644
index 00aa56edfede..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.67.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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.67.ebuild,v 1.8 2012/12/11 21:48:10 ssuominen 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* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/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
-
-	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=/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"
-
-	# 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
deleted file mode 100644
index fa07a65ce776..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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.70-r1.ebuild,v 1.8 2012/12/11 21:48:10 ssuominen 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* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/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
-	# bug 330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-locale-muck.patch
-	# --as-needed
-	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=/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"
-
-	# 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.70.ebuild b/sys-fs/lvm2/lvm2-2.02.70.ebuild
deleted file mode 100644
index b3aa80745854..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.70.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# 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.70.ebuild,v 1.8 2012/12/11 21:48:10 ssuominen 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* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/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
-	# bug 330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-locale-muck.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=/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"
-
-	# 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.72.ebuild b/sys-fs/lvm2/lvm2-2.02.72.ebuild
deleted file mode 100644
index 3222bf4da67a..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.72.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# 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.72.ebuild,v 1.10 2012/12/11 21:48:10 ssuominen 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* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/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
-	# bug 330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.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=/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"
-
-	# 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.74.ebuild b/sys-fs/lvm2/lvm2-2.02.74.ebuild
deleted file mode 100644
index 336308aa1ad3..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.74.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# 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.74.ebuild,v 1.7 2012/12/11 21:48:10 ssuominen 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
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1"
-
-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
-	# bug 330373
-	epatch "${FILESDIR}"/${PN}-2.02.73-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
-
-	epatch "${FILESDIR}"/${PN}-2.02.73-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=/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"
-
-	# 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.83.ebuild b/sys-fs/lvm2/lvm2-2.02.83.ebuild
deleted file mode 100644
index d25ce6e5a24c..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.83.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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.83.ebuild,v 1.7 2012/12/11 21:48:10 ssuominen 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
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1"
-
-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
-	# bug 330373
-	epatch "${FILESDIR}"/${PN}-2.02.73-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
-
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-2.02.73-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=/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"
-
-	# 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.84.ebuild b/sys-fs/lvm2/lvm2-2.02.84.ebuild
deleted file mode 100644
index 5aa1636bdcaa..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.84.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# 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.84.ebuild,v 1.8 2012/12/11 21:48:10 ssuominen 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
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1"
-
-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
-	# bug 330373
-	epatch "${FILESDIR}"/${PN}-2.02.73-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
-	# bug 361429
-	epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
-
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-2.02.73-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=/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"
-
-	# 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.85.ebuild b/sys-fs/lvm2/lvm2-2.02.85.ebuild
deleted file mode 100644
index e3cf8ddf4344..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.85.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# 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.85.ebuild,v 1.8 2012/12/10 20:41:45 axs 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 clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1"
-
-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
-	# bug 330373
-	epatch "${FILESDIR}"/${PN}-2.02.73-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-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
-
-	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}
-			--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)" \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-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"
-
-	# 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 "${ED}"/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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.92.ebuild b/sys-fs/lvm2/lvm2-2.02.92.ebuild
deleted file mode 100644
index 72f7f1e79cf1..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.92.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# 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.92.ebuild,v 1.5 2012/11/28 10:55:33 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 ~x86-linux"
-
-IUSE="readline +static +static-libs clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	virtual/udev"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1
-		static? ( virtual/udev[static-libs] )"
-
-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 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
-	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" # Not ready yet
-
-	# 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)" \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${ED}"/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 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild
deleted file mode 100644
index 4f23de5bc1a9..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# 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.93-r1.ebuild,v 1.4 2012/11/28 10:55:33 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 ~x86-linux"
-
-IUSE="readline static static-libs clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	virtual/udev"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1
-		static? ( virtual/udev[static-libs] )"
-
-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 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
-	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" # still broken
-
-	# 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)" \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.93.ebuild b/sys-fs/lvm2/lvm2-2.02.93.ebuild
deleted file mode 100644
index c1ed2f89dc36..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.93.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# 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.93.ebuild,v 1.6 2012/11/28 10:55:33 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 ~x86-linux"
-
-IUSE="readline +static +static-libs clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	virtual/udev"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1
-		static? ( virtual/udev[static-libs] )"
-
-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 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
-	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" # still broken
-
-	# 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)" \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r1.ebuild
deleted file mode 100644
index 2f6095650989..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.95-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# 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-r1.ebuild,v 1.5 2012/11/28 10:55:33 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"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/libdlm-3*
-			cman? ( =sys-cluster/cman-3* ) )
-	udev? ( virtual/udev )"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1
-		static? ( virtual/udev[static-libs] )"
-
-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
-
-	# Upstream bug of LVM path
-	epatch "${FILESDIR}"/${PN}-2.02.95-lvmpath.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.95 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild
deleted file mode 100644
index 716ed88a626a..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# 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-r2.ebuild,v 1.5 2012/11/28 10:55:33 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? ( virtual/udev )"
-
-# /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? ( virtual/udev[static-libs] )"
-
-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
-
-	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
-
-	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 "${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}
-	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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r3.ebuild
deleted file mode 100644
index 6106d2f9e121..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.95-r3.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# 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-r3.ebuild,v 1.2 2012/11/28 10:55:33 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? ( virtual/udev )"
-
-# /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? ( virtual/udev[static-libs] )"
-
-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
-
-	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 "${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}
-	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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.95.ebuild b/sys-fs/lvm2/lvm2-2.02.95.ebuild
deleted file mode 100644
index 30118750e9d4..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.95.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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.5 2012/11/28 10:55:33 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 ~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? ( virtual/udev )"
-
-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}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1
-		static? ( virtual/udev[static-libs] )"
-
-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.95 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"
-}