diff options
| -rw-r--r-- | profiles/arch/alpha/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/arm/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/arm64/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/ia64/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/m68k/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/mips/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/powerpc/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/s390/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/sh/use.mask | 5 | ||||
| -rw-r--r-- | profiles/arch/sparc/use.mask | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 4 | ||||
| -rw-r--r-- | profiles/prefix/aix/use.mask | 2 | ||||
| -rw-r--r-- | profiles/prefix/darwin/use.mask | 2 | ||||
| -rw-r--r-- | profiles/prefix/mint/use.mask | 2 | ||||
| -rw-r--r-- | profiles/prefix/sunos/use.mask | 2 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.116.ebuild | 34 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.145-r2.ebuild | 44 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.181.ebuild | 44 | ||||
| -rw-r--r-- | sys-fs/lvm2/metadata.xml | 4 |
19 files changed, 12 insertions, 176 deletions
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask index 007d05cb443e..ff35f503954d 100644 --- a/profiles/arch/alpha/use.mask +++ b/profiles/arch/alpha/use.mask @@ -167,11 +167,6 @@ entropy # media-libs/xine-lib is not keyworded xine -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - template_haskell # nvidia cg toolkit for binary drivers diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask index 21512a6fcc73..fdcce322d47f 100644 --- a/profiles/arch/arm/use.mask +++ b/profiles/arch/arm/use.mask @@ -141,11 +141,6 @@ audit # media-libs/xine-lib is not keyworded xine -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - # Michał Górny <mgorny@gentoo.org> (4 May 2013) # Unmask systemd since it is keyworded here. -systemd diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask index 67dc0c017e23..814305d3b526 100644 --- a/profiles/arch/arm64/use.mask +++ b/profiles/arch/arm64/use.mask @@ -231,8 +231,3 @@ audit # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Dec 2012) # media-libs/xine-lib is not keyworded xine - -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask index b1d086ed1a61..99163c252009 100644 --- a/profiles/arch/ia64/use.mask +++ b/profiles/arch/ia64/use.mask @@ -171,11 +171,6 @@ connman # media-libs/xine-lib is not keyworded xine -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - template_haskell # toolkit for nvidia binary drivers diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask index 5bd683cd03f5..18076f80ec2c 100644 --- a/profiles/arch/m68k/use.mask +++ b/profiles/arch/m68k/use.mask @@ -81,11 +81,6 @@ pango avahi zeroconf -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # virtual/opencl is not keyworded opencl diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask index 412f5c7d5e6c..38ab80768db1 100644 --- a/profiles/arch/mips/use.mask +++ b/profiles/arch/mips/use.mask @@ -299,11 +299,6 @@ fluidsynth -fixed-point -loongson2f -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # virtual/opencl is not keyworded opencl diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask index a934f5e54a23..04daf4e5cf28 100644 --- a/profiles/arch/powerpc/use.mask +++ b/profiles/arch/powerpc/use.mask @@ -145,11 +145,6 @@ nvtt # fdk-aac is already keyworded here -fdk -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - # Pacho Ramos <pacho@gentoo.org> (08 Jan 2014) # Unmask systemd since it is keyworded here. -systemd diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask index 087b0c6aeb4a..e69c27dbeca8 100644 --- a/profiles/arch/s390/use.mask +++ b/profiles/arch/s390/use.mask @@ -84,11 +84,6 @@ sdl lm_sensors wxwidgets -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - # Many X drivers make no sense on this platform. input_devices_elographics input_devices_evdev diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask index 30d6147d1eda..edb70c15d028 100644 --- a/profiles/arch/sh/use.mask +++ b/profiles/arch/sh/use.mask @@ -112,11 +112,6 @@ nss # Robin H. Johnson <robbat2@gentoo.org> audit -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # virtual/opencl is not keyworded opencl diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask index 9522e450c04f..650933834e8f 100644 --- a/profiles/arch/sparc/use.mask +++ b/profiles/arch/sparc/use.mask @@ -222,11 +222,6 @@ multilib # Both dev-qt/qtphonon and media-sound/phonon are unkeyworded phonon -# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013) -# libdlm and cman are not keyworded -cman -clvm - # nvidia toolkit for binary drivers cg diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 5ec2c69b9cc5..d33cbb7da2f2 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -48,10 +48,6 @@ sci-libs/ceres-solver sparse # upower-pm-utils will be removed (#596988) mate-extra/mate-power-manager pm-utils -# Pacho Ramos <pacho@gento.org> (01 Nov 2018) -# cman and co. are going to be removed (#650738) -sys-fs/lvm2 cman clvm - # Alfredo Tupone <tupone@gentoo.org> (24 Oct 2018) # jit brokes build of gnat-gpl dev-lang/gnat-gpl jit diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask index 4317ed36e081..988318c1980c 100644 --- a/profiles/prefix/aix/use.mask +++ b/profiles/prefix/aix/use.mask @@ -11,8 +11,6 @@ acpi alsa apm caps -cman -clvm directfb djbfft fbcon diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask index deba9cf25949..07d0296ad950 100644 --- a/profiles/prefix/darwin/use.mask +++ b/profiles/prefix/darwin/use.mask @@ -18,8 +18,6 @@ acpi alsa apm caps -cman -clvm directfb djbfft fbcon diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask index f937794bef2e..9cd2e1e0623a 100644 --- a/profiles/prefix/mint/use.mask +++ b/profiles/prefix/mint/use.mask @@ -11,8 +11,6 @@ acpi alsa apm caps -cman -clvm directfb djbfft fbcon diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask index 940968ee8e62..70fa7e47f4cd 100644 --- a/profiles/prefix/sunos/use.mask +++ b/profiles/prefix/sunos/use.mask @@ -11,8 +11,6 @@ acpi alsa apm caps -cman -clvm directfb djbfft fbcon diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild index 474f90a6f309..60b6cfda5775 100644 --- a/sys-fs/lvm2/lvm2-2.02.116.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild @@ -12,12 +12,12 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" -REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) +IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" +REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) static? ( !udev )" #520450 -DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) +DEPEND_COMMON=" readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] )" # /run is now required for locking during early boot. /var cannot be assumed to @@ -27,7 +27,6 @@ RDEPEND="${DEPEND_COMMON} >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 - !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) @@ -152,27 +151,7 @@ src_configure() { # 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-clvmd=none --with-cluster=none" econf \ $(use_enable readline) \ @@ -230,11 +209,6 @@ src_install() { newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad fi - if use clvm; then - newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd - newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd - fi - if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a dolib.a libdaemon/client/libdaemonclient.a #462908 diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild index ca67d8edf577..2890ca59239e 100644 --- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild @@ -12,19 +12,11 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only" -REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) - systemd? ( udev ) - clvm? ( !systemd )" +IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" +REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin ) + systemd? ( udev )" DEPEND_COMMON=" - clvm? ( - cman? ( =sys-cluster/cman-3* ) - corosync? ( sys-cluster/corosync ) - openais? ( sys-cluster/openais ) - =sys-cluster/libdlm-3* - ) - readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] )" @@ -35,7 +27,6 @@ RDEPEND="${DEPEND_COMMON} >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 - !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) @@ -167,29 +158,7 @@ src_configure() { # disable O_DIRECT support on hppa, breaks pv detection (#99532) use hppa && myconf+=( --disable-o_direct ) - if use clvm; then - 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}" - use corosync && clvmd="${clvmd:+$clvmd,}corosync" - use openais && clvmd="${clvmd:+$clvmd,}openais" - [ -z "${clvmd}" ] && clvmd="none" - myconf+=( --with-clvmd=${clvmd} ) - myconf+=( --with-pool=${buildmode} ) - else - myconf+=( --with-clvmd=none --with-cluster=none ) - fi + myconf+=( --with-clvmd=none --with-cluster=none ) econf \ $(use_enable readline) \ @@ -249,11 +218,6 @@ src_install() { newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad fi - if use clvm; then - newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd - newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd - fi - if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a if use !device-mapper-only ; then diff --git a/sys-fs/lvm2/lvm2-2.02.181.ebuild b/sys-fs/lvm2/lvm2-2.02.181.ebuild index 749cef8bdd56..ea67d28a6d8c 100644 --- a/sys-fs/lvm2/lvm2-2.02.181.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.181.ebuild @@ -12,19 +12,11 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="readline static static-libs systemd clvm cman corosync lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only" -REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm2create_initrd !openais !sanlock !thin ) - systemd? ( udev ) - clvm? ( !systemd )" +IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" +REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) + systemd? ( udev )" DEPEND_COMMON=" - clvm? ( - cman? ( =sys-cluster/cman-3* ) - corosync? ( sys-cluster/corosync ) - openais? ( sys-cluster/openais ) - =sys-cluster/libdlm-3* - ) - dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) @@ -39,7 +31,6 @@ RDEPEND="${DEPEND_COMMON} >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 - !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) @@ -165,29 +156,7 @@ src_configure() { myeconfargs+=( --with-thin=none --with-cache=none ) fi - if use clvm; then - myeconfargs+=( --with-cluster="$(usex static internal shared)" ) - # 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}" - use corosync && clvmd="${clvmd:+$clvmd,}corosync" - use openais && clvmd="${clvmd:+$clvmd,}openais" - [ -z "${clvmd}" ] && clvmd="none" - myeconfargs+=( --with-clvmd=${clvmd} ) - myeconfargs+=( --enable-lvmlockd-dlm ) - else - myeconfargs+=( --with-clvmd=none --with-cluster=none ) - fi + myeconfargs+=( --with-clvmd=none --with-cluster=none ) myeconfargs+=( $(use_enable readline) @@ -253,11 +222,6 @@ src_install() { newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd fi - if use clvm; then - newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd - newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd - fi - if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a dolib.a libdaemon/client/libdaemonclient.a #462908 diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml index cca547ca5c2c..c1a65d74e23d 100644 --- a/sys-fs/lvm2/metadata.xml +++ b/sys-fs/lvm2/metadata.xml @@ -16,12 +16,8 @@ <description>Backup to Robin. Please CC on bugs.</description> </maintainer> <use> - <flag name="clvm">Allow users to build clustered lvm2</flag> - <flag name="cman">Cman support for clustered lvm</flag> - <flag name="corosync">Corosync support for clustered lvm</flag> <flag name="lvm1">Allow users to build lvm2 with lvm1 support</flag> <flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag> - <flag name="openais">Openais support for clustered lvm</flag> <flag name="thin">Support for thin volumes</flag> <flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag> <flag name="sanlock">Enable lvmlockd with support for sanlock</flag> |