| 1 |
commit: 1d4dc6f51762e22882f591fe251a115e5209cc7d |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 15:11:10 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 15:33:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4dc6f5 |
| 7 |
|
| 8 |
sys-fs/lvm2: [QA] Punt removed cman/clvm support |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/arch/alpha/use.mask | 5 ----- |
| 13 |
profiles/arch/arm/use.mask | 5 ----- |
| 14 |
profiles/arch/arm64/use.mask | 5 ----- |
| 15 |
profiles/arch/ia64/use.mask | 5 ----- |
| 16 |
profiles/arch/m68k/use.mask | 5 ----- |
| 17 |
profiles/arch/mips/use.mask | 5 ----- |
| 18 |
profiles/arch/powerpc/use.mask | 5 ----- |
| 19 |
profiles/arch/s390/use.mask | 5 ----- |
| 20 |
profiles/arch/sh/use.mask | 5 ----- |
| 21 |
profiles/arch/sparc/use.mask | 5 ----- |
| 22 |
profiles/base/package.use.mask | 4 ---- |
| 23 |
profiles/prefix/aix/use.mask | 2 -- |
| 24 |
profiles/prefix/darwin/use.mask | 2 -- |
| 25 |
profiles/prefix/mint/use.mask | 2 -- |
| 26 |
profiles/prefix/sunos/use.mask | 2 -- |
| 27 |
sys-fs/lvm2/lvm2-2.02.116.ebuild | 34 ++++------------------------ |
| 28 |
sys-fs/lvm2/lvm2-2.02.145-r2.ebuild | 44 ++++--------------------------------- |
| 29 |
sys-fs/lvm2/lvm2-2.02.181.ebuild | 44 ++++--------------------------------- |
| 30 |
sys-fs/lvm2/metadata.xml | 4 ---- |
| 31 |
19 files changed, 12 insertions(+), 176 deletions(-) |
| 32 |
|
| 33 |
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask |
| 34 |
index 007d05cb443..ff35f503954 100644 |
| 35 |
--- a/profiles/arch/alpha/use.mask |
| 36 |
+++ b/profiles/arch/alpha/use.mask |
| 37 |
@@ -167,11 +167,6 @@ entropy |
| 38 |
# media-libs/xine-lib is not keyworded |
| 39 |
xine |
| 40 |
|
| 41 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 42 |
-# libdlm and cman are not keyworded |
| 43 |
-cman |
| 44 |
-clvm |
| 45 |
- |
| 46 |
template_haskell |
| 47 |
|
| 48 |
# nvidia cg toolkit for binary drivers |
| 49 |
|
| 50 |
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask |
| 51 |
index 21512a6fcc7..fdcce322d47 100644 |
| 52 |
--- a/profiles/arch/arm/use.mask |
| 53 |
+++ b/profiles/arch/arm/use.mask |
| 54 |
@@ -141,11 +141,6 @@ audit |
| 55 |
# media-libs/xine-lib is not keyworded |
| 56 |
xine |
| 57 |
|
| 58 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 59 |
-# libdlm and cman are not keyworded |
| 60 |
-cman |
| 61 |
-clvm |
| 62 |
- |
| 63 |
# Michał Górny <mgorny@g.o> (4 May 2013) |
| 64 |
# Unmask systemd since it is keyworded here. |
| 65 |
-systemd |
| 66 |
|
| 67 |
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask |
| 68 |
index 67dc0c017e2..814305d3b52 100644 |
| 69 |
--- a/profiles/arch/arm64/use.mask |
| 70 |
+++ b/profiles/arch/arm64/use.mask |
| 71 |
@@ -231,8 +231,3 @@ audit |
| 72 |
# Alexandre Rostovtsev <tetromino@g.o> (31 Dec 2012) |
| 73 |
# media-libs/xine-lib is not keyworded |
| 74 |
xine |
| 75 |
- |
| 76 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 77 |
-# libdlm and cman are not keyworded |
| 78 |
-cman |
| 79 |
-clvm |
| 80 |
|
| 81 |
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask |
| 82 |
index b1d086ed1a6..99163c25200 100644 |
| 83 |
--- a/profiles/arch/ia64/use.mask |
| 84 |
+++ b/profiles/arch/ia64/use.mask |
| 85 |
@@ -171,11 +171,6 @@ connman |
| 86 |
# media-libs/xine-lib is not keyworded |
| 87 |
xine |
| 88 |
|
| 89 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 90 |
-# libdlm and cman are not keyworded |
| 91 |
-cman |
| 92 |
-clvm |
| 93 |
- |
| 94 |
template_haskell |
| 95 |
|
| 96 |
# toolkit for nvidia binary drivers |
| 97 |
|
| 98 |
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask |
| 99 |
index 5bd683cd03f..18076f80ec2 100644 |
| 100 |
--- a/profiles/arch/m68k/use.mask |
| 101 |
+++ b/profiles/arch/m68k/use.mask |
| 102 |
@@ -81,11 +81,6 @@ pango |
| 103 |
avahi |
| 104 |
zeroconf |
| 105 |
|
| 106 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 107 |
-# libdlm and cman are not keyworded |
| 108 |
-cman |
| 109 |
-clvm |
| 110 |
- |
| 111 |
# Chí-Thanh Christopher Nguyễn <chithanh@g.o> (22 Aug 2013) |
| 112 |
# virtual/opencl is not keyworded |
| 113 |
opencl |
| 114 |
|
| 115 |
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask |
| 116 |
index 412f5c7d5e6..38ab80768db 100644 |
| 117 |
--- a/profiles/arch/mips/use.mask |
| 118 |
+++ b/profiles/arch/mips/use.mask |
| 119 |
@@ -299,11 +299,6 @@ fluidsynth |
| 120 |
-fixed-point |
| 121 |
-loongson2f |
| 122 |
|
| 123 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 124 |
-# libdlm and cman are not keyworded |
| 125 |
-cman |
| 126 |
-clvm |
| 127 |
- |
| 128 |
# Chí-Thanh Christopher Nguyễn <chithanh@g.o> (22 Aug 2013) |
| 129 |
# virtual/opencl is not keyworded |
| 130 |
opencl |
| 131 |
|
| 132 |
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask |
| 133 |
index a934f5e54a2..04daf4e5cf2 100644 |
| 134 |
--- a/profiles/arch/powerpc/use.mask |
| 135 |
+++ b/profiles/arch/powerpc/use.mask |
| 136 |
@@ -145,11 +145,6 @@ nvtt |
| 137 |
# fdk-aac is already keyworded here |
| 138 |
-fdk |
| 139 |
|
| 140 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 141 |
-# libdlm and cman are not keyworded |
| 142 |
-cman |
| 143 |
-clvm |
| 144 |
- |
| 145 |
# Pacho Ramos <pacho@g.o> (08 Jan 2014) |
| 146 |
# Unmask systemd since it is keyworded here. |
| 147 |
-systemd |
| 148 |
|
| 149 |
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask |
| 150 |
index 087b0c6aeb4..e69c27dbeca 100644 |
| 151 |
--- a/profiles/arch/s390/use.mask |
| 152 |
+++ b/profiles/arch/s390/use.mask |
| 153 |
@@ -84,11 +84,6 @@ sdl |
| 154 |
lm_sensors |
| 155 |
wxwidgets |
| 156 |
|
| 157 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 158 |
-# libdlm and cman are not keyworded |
| 159 |
-cman |
| 160 |
-clvm |
| 161 |
- |
| 162 |
# Many X drivers make no sense on this platform. |
| 163 |
input_devices_elographics |
| 164 |
input_devices_evdev |
| 165 |
|
| 166 |
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask |
| 167 |
index 30d6147d1ed..edb70c15d02 100644 |
| 168 |
--- a/profiles/arch/sh/use.mask |
| 169 |
+++ b/profiles/arch/sh/use.mask |
| 170 |
@@ -112,11 +112,6 @@ nss |
| 171 |
# Robin H. Johnson <robbat2@g.o> |
| 172 |
audit |
| 173 |
|
| 174 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 175 |
-# libdlm and cman are not keyworded |
| 176 |
-cman |
| 177 |
-clvm |
| 178 |
- |
| 179 |
# Chí-Thanh Christopher Nguyễn <chithanh@g.o> (22 Aug 2013) |
| 180 |
# virtual/opencl is not keyworded |
| 181 |
opencl |
| 182 |
|
| 183 |
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask |
| 184 |
index 9522e450c04..650933834e8 100644 |
| 185 |
--- a/profiles/arch/sparc/use.mask |
| 186 |
+++ b/profiles/arch/sparc/use.mask |
| 187 |
@@ -222,11 +222,6 @@ multilib |
| 188 |
# Both dev-qt/qtphonon and media-sound/phonon are unkeyworded |
| 189 |
phonon |
| 190 |
|
| 191 |
-# Samuli Suominen <ssuominen@g.o> (18 Jan 2013) |
| 192 |
-# libdlm and cman are not keyworded |
| 193 |
-cman |
| 194 |
-clvm |
| 195 |
- |
| 196 |
# nvidia toolkit for binary drivers |
| 197 |
cg |
| 198 |
|
| 199 |
|
| 200 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 201 |
index 5ec2c69b9cc..d33cbb7da2f 100644 |
| 202 |
--- a/profiles/base/package.use.mask |
| 203 |
+++ b/profiles/base/package.use.mask |
| 204 |
@@ -48,10 +48,6 @@ sci-libs/ceres-solver sparse |
| 205 |
# upower-pm-utils will be removed (#596988) |
| 206 |
mate-extra/mate-power-manager pm-utils |
| 207 |
|
| 208 |
-# Pacho Ramos <pacho@×××××.org> (01 Nov 2018) |
| 209 |
-# cman and co. are going to be removed (#650738) |
| 210 |
-sys-fs/lvm2 cman clvm |
| 211 |
- |
| 212 |
# Alfredo Tupone <tupone@g.o> (24 Oct 2018) |
| 213 |
# jit brokes build of gnat-gpl |
| 214 |
dev-lang/gnat-gpl jit |
| 215 |
|
| 216 |
diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask |
| 217 |
index 4317ed36e08..988318c1980 100644 |
| 218 |
--- a/profiles/prefix/aix/use.mask |
| 219 |
+++ b/profiles/prefix/aix/use.mask |
| 220 |
@@ -11,8 +11,6 @@ acpi |
| 221 |
alsa |
| 222 |
apm |
| 223 |
caps |
| 224 |
-cman |
| 225 |
-clvm |
| 226 |
directfb |
| 227 |
djbfft |
| 228 |
fbcon |
| 229 |
|
| 230 |
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask |
| 231 |
index deba9cf2594..07d0296ad95 100644 |
| 232 |
--- a/profiles/prefix/darwin/use.mask |
| 233 |
+++ b/profiles/prefix/darwin/use.mask |
| 234 |
@@ -18,8 +18,6 @@ acpi |
| 235 |
alsa |
| 236 |
apm |
| 237 |
caps |
| 238 |
-cman |
| 239 |
-clvm |
| 240 |
directfb |
| 241 |
djbfft |
| 242 |
fbcon |
| 243 |
|
| 244 |
diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask |
| 245 |
index f937794bef2..9cd2e1e0623 100644 |
| 246 |
--- a/profiles/prefix/mint/use.mask |
| 247 |
+++ b/profiles/prefix/mint/use.mask |
| 248 |
@@ -11,8 +11,6 @@ acpi |
| 249 |
alsa |
| 250 |
apm |
| 251 |
caps |
| 252 |
-cman |
| 253 |
-clvm |
| 254 |
directfb |
| 255 |
djbfft |
| 256 |
fbcon |
| 257 |
|
| 258 |
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask |
| 259 |
index 940968ee8e6..70fa7e47f4c 100644 |
| 260 |
--- a/profiles/prefix/sunos/use.mask |
| 261 |
+++ b/profiles/prefix/sunos/use.mask |
| 262 |
@@ -11,8 +11,6 @@ acpi |
| 263 |
alsa |
| 264 |
apm |
| 265 |
caps |
| 266 |
-cman |
| 267 |
-clvm |
| 268 |
directfb |
| 269 |
djbfft |
| 270 |
fbcon |
| 271 |
|
| 272 |
diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild |
| 273 |
index 474f90a6f30..60b6cfda577 100644 |
| 274 |
--- a/sys-fs/lvm2/lvm2-2.02.116.ebuild |
| 275 |
+++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild |
| 276 |
@@ -12,12 +12,12 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
| 277 |
LICENSE="GPL-2" |
| 278 |
SLOT="0" |
| 279 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" |
| 280 |
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" |
| 281 |
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) |
| 282 |
+IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" |
| 283 |
+REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin ) |
| 284 |
systemd? ( udev ) |
| 285 |
static? ( !udev )" #520450 |
| 286 |
|
| 287 |
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) |
| 288 |
+DEPEND_COMMON=" |
| 289 |
readline? ( sys-libs/readline:0= ) |
| 290 |
udev? ( >=virtual/libudev-208:=[static-libs?] )" |
| 291 |
# /run is now required for locking during early boot. /var cannot be assumed to |
| 292 |
@@ -27,7 +27,6 @@ RDEPEND="${DEPEND_COMMON} |
| 293 |
>=sys-apps/baselayout-2.2 |
| 294 |
!<sys-apps/openrc-0.11 |
| 295 |
!<sys-fs/cryptsetup-1.1.2 |
| 296 |
- !!sys-fs/clvm |
| 297 |
!!sys-fs/lvm-user |
| 298 |
>=sys-apps/util-linux-2.16 |
| 299 |
lvm2create_initrd? ( sys-apps/makedev ) |
| 300 |
@@ -152,27 +151,7 @@ src_configure() { |
| 301 |
# disable O_DIRECT support on hppa, breaks pv detection (#99532) |
| 302 |
use hppa && myconf="${myconf} --disable-o_direct" |
| 303 |
|
| 304 |
- if use clvm; then |
| 305 |
- myconf="${myconf} --with-cluster=${buildmode}" |
| 306 |
- # 4-state! Make sure we get it right, per bug 210879 |
| 307 |
- # Valid options are: none, cman, gulm, all |
| 308 |
- # |
| 309 |
- # 2009/02: |
| 310 |
- # gulm is removed now, now dual-state: |
| 311 |
- # cman, none |
| 312 |
- # all still exists, but is not needed |
| 313 |
- # |
| 314 |
- # 2009/07: |
| 315 |
- # TODO: add corosync and re-enable ALL |
| 316 |
- local clvmd="" |
| 317 |
- use cman && clvmd="cman" |
| 318 |
- #clvmd="${clvmd/cmangulm/all}" |
| 319 |
- [ -z "${clvmd}" ] && clvmd="none" |
| 320 |
- myconf="${myconf} --with-clvmd=${clvmd}" |
| 321 |
- myconf="${myconf} --with-pool=${buildmode}" |
| 322 |
- else |
| 323 |
- myconf="${myconf} --with-clvmd=none --with-cluster=none" |
| 324 |
- fi |
| 325 |
+ myconf="${myconf} --with-clvmd=none --with-cluster=none" |
| 326 |
|
| 327 |
econf \ |
| 328 |
$(use_enable readline) \ |
| 329 |
@@ -230,11 +209,6 @@ src_install() { |
| 330 |
newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad |
| 331 |
fi |
| 332 |
|
| 333 |
- if use clvm; then |
| 334 |
- newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd |
| 335 |
- newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd |
| 336 |
- fi |
| 337 |
- |
| 338 |
if use static-libs; then |
| 339 |
dolib.a libdm/ioctl/libdevmapper.a |
| 340 |
dolib.a libdaemon/client/libdaemonclient.a #462908 |
| 341 |
|
| 342 |
diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild |
| 343 |
index ca67d8edf57..2890ca59239 100644 |
| 344 |
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild |
| 345 |
+++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild |
| 346 |
@@ -12,19 +12,11 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
| 347 |
LICENSE="GPL-2" |
| 348 |
SLOT="0" |
| 349 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" |
| 350 |
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only" |
| 351 |
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) |
| 352 |
- systemd? ( udev ) |
| 353 |
- clvm? ( !systemd )" |
| 354 |
+IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" |
| 355 |
+REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin ) |
| 356 |
+ systemd? ( udev )" |
| 357 |
|
| 358 |
DEPEND_COMMON=" |
| 359 |
- clvm? ( |
| 360 |
- cman? ( =sys-cluster/cman-3* ) |
| 361 |
- corosync? ( sys-cluster/corosync ) |
| 362 |
- openais? ( sys-cluster/openais ) |
| 363 |
- =sys-cluster/libdlm-3* |
| 364 |
- ) |
| 365 |
- |
| 366 |
readline? ( sys-libs/readline:0= ) |
| 367 |
systemd? ( >=sys-apps/systemd-205:0= ) |
| 368 |
udev? ( >=virtual/libudev-208:=[static-libs?] )" |
| 369 |
@@ -35,7 +27,6 @@ RDEPEND="${DEPEND_COMMON} |
| 370 |
>=sys-apps/baselayout-2.2 |
| 371 |
!<sys-apps/openrc-0.11 |
| 372 |
!<sys-fs/cryptsetup-1.1.2 |
| 373 |
- !!sys-fs/clvm |
| 374 |
!!sys-fs/lvm-user |
| 375 |
>=sys-apps/util-linux-2.16 |
| 376 |
lvm2create_initrd? ( sys-apps/makedev ) |
| 377 |
@@ -167,29 +158,7 @@ src_configure() { |
| 378 |
# disable O_DIRECT support on hppa, breaks pv detection (#99532) |
| 379 |
use hppa && myconf+=( --disable-o_direct ) |
| 380 |
|
| 381 |
- if use clvm; then |
| 382 |
- myconf+=( --with-cluster=${buildmode} ) |
| 383 |
- # 4-state! Make sure we get it right, per bug 210879 |
| 384 |
- # Valid options are: none, cman, gulm, all |
| 385 |
- # |
| 386 |
- # 2009/02: |
| 387 |
- # gulm is removed now, now dual-state: |
| 388 |
- # cman, none |
| 389 |
- # all still exists, but is not needed |
| 390 |
- # |
| 391 |
- # 2009/07: |
| 392 |
- # TODO: add corosync and re-enable ALL |
| 393 |
- local clvmd="" |
| 394 |
- use cman && clvmd="cman" |
| 395 |
- #clvmd="${clvmd/cmangulm/all}" |
| 396 |
- use corosync && clvmd="${clvmd:+$clvmd,}corosync" |
| 397 |
- use openais && clvmd="${clvmd:+$clvmd,}openais" |
| 398 |
- [ -z "${clvmd}" ] && clvmd="none" |
| 399 |
- myconf+=( --with-clvmd=${clvmd} ) |
| 400 |
- myconf+=( --with-pool=${buildmode} ) |
| 401 |
- else |
| 402 |
- myconf+=( --with-clvmd=none --with-cluster=none ) |
| 403 |
- fi |
| 404 |
+ myconf+=( --with-clvmd=none --with-cluster=none ) |
| 405 |
|
| 406 |
econf \ |
| 407 |
$(use_enable readline) \ |
| 408 |
@@ -249,11 +218,6 @@ src_install() { |
| 409 |
newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad |
| 410 |
fi |
| 411 |
|
| 412 |
- if use clvm; then |
| 413 |
- newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd |
| 414 |
- newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd |
| 415 |
- fi |
| 416 |
- |
| 417 |
if use static-libs; then |
| 418 |
dolib.a libdm/ioctl/libdevmapper.a |
| 419 |
if use !device-mapper-only ; then |
| 420 |
|
| 421 |
diff --git a/sys-fs/lvm2/lvm2-2.02.181.ebuild b/sys-fs/lvm2/lvm2-2.02.181.ebuild |
| 422 |
index 749cef8bdd5..ea67d28a6d8 100644 |
| 423 |
--- a/sys-fs/lvm2/lvm2-2.02.181.ebuild |
| 424 |
+++ b/sys-fs/lvm2/lvm2-2.02.181.ebuild |
| 425 |
@@ -12,19 +12,11 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
| 426 |
LICENSE="GPL-2" |
| 427 |
SLOT="0" |
| 428 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 429 |
-IUSE="readline static static-libs systemd clvm cman corosync lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only" |
| 430 |
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm2create_initrd !openais !sanlock !thin ) |
| 431 |
- systemd? ( udev ) |
| 432 |
- clvm? ( !systemd )" |
| 433 |
+IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
| 434 |
+REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
| 435 |
+ systemd? ( udev )" |
| 436 |
|
| 437 |
DEPEND_COMMON=" |
| 438 |
- clvm? ( |
| 439 |
- cman? ( =sys-cluster/cman-3* ) |
| 440 |
- corosync? ( sys-cluster/corosync ) |
| 441 |
- openais? ( sys-cluster/openais ) |
| 442 |
- =sys-cluster/libdlm-3* |
| 443 |
- ) |
| 444 |
- |
| 445 |
dev-libs/libaio[static-libs?] |
| 446 |
static? ( dev-libs/libaio[static-libs] ) |
| 447 |
!static? ( dev-libs/libaio[static-libs?] ) |
| 448 |
@@ -39,7 +31,6 @@ RDEPEND="${DEPEND_COMMON} |
| 449 |
>=sys-apps/baselayout-2.2 |
| 450 |
!<sys-apps/openrc-0.11 |
| 451 |
!<sys-fs/cryptsetup-1.1.2 |
| 452 |
- !!sys-fs/clvm |
| 453 |
!!sys-fs/lvm-user |
| 454 |
>=sys-apps/util-linux-2.16 |
| 455 |
lvm2create_initrd? ( sys-apps/makedev ) |
| 456 |
@@ -165,29 +156,7 @@ src_configure() { |
| 457 |
myeconfargs+=( --with-thin=none --with-cache=none ) |
| 458 |
fi |
| 459 |
|
| 460 |
- if use clvm; then |
| 461 |
- myeconfargs+=( --with-cluster="$(usex static internal shared)" ) |
| 462 |
- # 4-state! Make sure we get it right, per bug 210879 |
| 463 |
- # Valid options are: none, cman, gulm, all |
| 464 |
- # |
| 465 |
- # 2009/02: |
| 466 |
- # gulm is removed now, now dual-state: |
| 467 |
- # cman, none |
| 468 |
- # all still exists, but is not needed |
| 469 |
- # |
| 470 |
- # 2009/07: |
| 471 |
- # TODO: add corosync and re-enable ALL |
| 472 |
- local clvmd="" |
| 473 |
- use cman && clvmd="cman" |
| 474 |
- #clvmd="${clvmd/cmangulm/all}" |
| 475 |
- use corosync && clvmd="${clvmd:+$clvmd,}corosync" |
| 476 |
- use openais && clvmd="${clvmd:+$clvmd,}openais" |
| 477 |
- [ -z "${clvmd}" ] && clvmd="none" |
| 478 |
- myeconfargs+=( --with-clvmd=${clvmd} ) |
| 479 |
- myeconfargs+=( --enable-lvmlockd-dlm ) |
| 480 |
- else |
| 481 |
- myeconfargs+=( --with-clvmd=none --with-cluster=none ) |
| 482 |
- fi |
| 483 |
+ myeconfargs+=( --with-clvmd=none --with-cluster=none ) |
| 484 |
|
| 485 |
myeconfargs+=( |
| 486 |
$(use_enable readline) |
| 487 |
@@ -253,11 +222,6 @@ src_install() { |
| 488 |
newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd |
| 489 |
fi |
| 490 |
|
| 491 |
- if use clvm; then |
| 492 |
- newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd |
| 493 |
- newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd |
| 494 |
- fi |
| 495 |
- |
| 496 |
if use static-libs; then |
| 497 |
dolib.a libdm/ioctl/libdevmapper.a |
| 498 |
dolib.a libdaemon/client/libdaemonclient.a #462908 |
| 499 |
|
| 500 |
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml |
| 501 |
index cca547ca5c2..c1a65d74e23 100644 |
| 502 |
--- a/sys-fs/lvm2/metadata.xml |
| 503 |
+++ b/sys-fs/lvm2/metadata.xml |
| 504 |
@@ -16,12 +16,8 @@ |
| 505 |
<description>Backup to Robin. Please CC on bugs.</description> |
| 506 |
</maintainer> |
| 507 |
<use> |
| 508 |
- <flag name="clvm">Allow users to build clustered lvm2</flag> |
| 509 |
- <flag name="cman">Cman support for clustered lvm</flag> |
| 510 |
- <flag name="corosync">Corosync support for clustered lvm</flag> |
| 511 |
<flag name="lvm1">Allow users to build lvm2 with lvm1 support</flag> |
| 512 |
<flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag> |
| 513 |
- <flag name="openais">Openais support for clustered lvm</flag> |
| 514 |
<flag name="thin">Support for thin volumes</flag> |
| 515 |
<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag> |
| 516 |
<flag name="sanlock">Enable lvmlockd with support for sanlock</flag> |
Archives