commit:     ba7e16f85f8a82447c425af037bcc85d9775f80d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 20:12:01 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 20:12:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7e16f8

sys-fs/lvm2: bump per bug #572352.

Package-Manager: portage-2.2.27

 sys-fs/lvm2/Manifest                               |   2 +
 .../lvm2-2.02.139-dynamic-static-ldflags.patch     |  63 +++++
 sys-fs/lvm2/lvm2-2.02.139.ebuild                   | 284 ++++++++++++++++++++
 sys-fs/lvm2/lvm2-2.02.145.ebuild                   | 285 +++++++++++++++++++++
 4 files changed, 634 insertions(+)

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 750b75a..b448852 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -3,3 +3,5 @@ DIST LVM2.2.02.109.tgz 1482167 SHA256 
7bc95ba5209c8aa5bd492167b2e2797f156852ed11
 DIST LVM2.2.02.110.tgz 1487448 SHA256 
3dad1aa04a71b8420b15f44c53f041001436539d3f8073490c2d0c52f6fecd11 SHA512 
5b4dfa5ed877d34efa5b109dc712e8fa9154b4954b267b0243f1925f9d2fa8c67f4ce8da36a85f3bba6c117f6153fdbf150e3753587ab90584a86d2654dc0812
 WHIRLPOOL 
ea221ed3e9d3f79009d7c341a7a75b52eacc5be79e28f2498e7cdc0f4a97c2bebff405b032eb8086d3b5b5aaf79da2f281c5734562355bddbe6004058e114ced
 DIST LVM2.2.02.116.tgz 1538340 SHA256 
2479d6ea61c405efcfcd8a78390d00c1d2e9c92c0262f3ed599f2c0fb6f0b767 SHA512 
992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d
 WHIRLPOOL 
1e89ec941882fddba62c9649be46eb5bc6c9cb899669d4bbe4a4a1023c8bf7d8264c4815ef88bb39dedcb9637815411feb826aa102e629d77b80e45e099e398d
 DIST LVM2.2.02.136.tgz 1891010 SHA256 
c6af90097d8f7cd851d38c4f57bb3ad7039cfa123f1e336dba957814a298bd8c SHA512 
ebda683e7dbeb2c4860a583d47e60756d18127e37a373ab2958af8e54b9bee0d2e3370b7803d88fa4b08564345c88af55bfbac317081160118ce4b3733b69f9d
 WHIRLPOOL 
8020fdddac648e32084801ffaf9b00b8a683870c8dd8dd5969851fd081eb1efd578decd82cd4a7a24fb6150c55afafdd819a76eb7eb6926cdc057455cc1d1618
+DIST LVM2.2.02.139.tgz 1897293 SHA256 
f423b1f2eee70efd671afc0982caa92e9413a582404057244021314172ec3a07 SHA512 
f112207d7447606915026495b931bffc4c0d68d36b9a8792fe4b7abf8b743bc4559da5c79145cb4d457337118e60552f9df511e31f2799001d29d006f7946cc0
 WHIRLPOOL 
8a1ca0bb6946b1f6761223a4a9e7c5e3e5247ff4b85bc08734258f4616fbabb0ea7a3b22b4a245367997ad810b4b304b747d8da0bd128c241fbafe645855b7f9
+DIST LVM2.2.02.145.tgz 1986370 SHA256 
98b7c4c07c485a462c6a86e1a5265757133ceea36289ead8a419af29ef39560b SHA512 
84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27
 WHIRLPOOL 
b8c6f4b737625547d4c2994d055f3334e2954f160d10840f1405b6a78f25fc17ba1d270f574408c151140e2afceb007cbfa1c146ed105bbdeca001a03368d549

diff --git a/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch 
b/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch
new file mode 100644
index 0000000..312e546
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch
@@ -0,0 +1,63 @@
+diff -ur LVM2.2.02.139_O/configure.in LVM2.2.02.139/configure.in
+--- LVM2.2.02.139_O/configure.in       2016-01-19 12:54:33.155187005 +0000
++++ LVM2.2.02.139/configure.in 2016-01-19 12:56:39.487181372 +0000
+@@ -31,6 +31,7 @@
+       linux*)
+               CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+               ELDFLAGS="-Wl,--export-dynamic"
++              STATIC_LDFLAGS="-Wl,--no-export-dynamic"
+               # FIXME Generate list and use --dynamic-list=.dlopen.sym
+               CLDWHOLEARCHIVE="-Wl,-whole-archive"
+               CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+@@ -2009,6 +2010,7 @@
+ AC_SUBST(SELINUX_PC)
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
++AC_SUBST(STATIC_LDFLAGS)
+ AC_SUBST(STATIC_LINK)
+ AC_SUBST(TESTING)
+ AC_SUBST(TESTSUITE_DATA)
+diff -ur LVM2.2.02.139_O/daemons/dmeventd/Makefile.in 
LVM2.2.02.139/daemons/dmeventd/Makefile.in
+--- LVM2.2.02.139_O/daemons/dmeventd/Makefile.in       2016-01-19 
12:54:33.278186999 +0000
++++ LVM2.2.02.139/daemons/dmeventd/Makefile.in 2016-01-19 12:57:44.277178484 
+0000
+@@ -67,7 +67,7 @@
+       $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
+ 
+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
+-      $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. 
-L$(interfacebuilddir) -o $@ \
++      $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. 
-L$(interfacebuilddir) -o $@ \
+       dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
+ 
+ ifeq ("@PKGCONFIG@", "yes")
+diff -ur LVM2.2.02.139_O/make.tmpl.in LVM2.2.02.139/make.tmpl.in
+--- LVM2.2.02.139_O/make.tmpl.in       2016-01-19 12:54:33.529186988 +0000
++++ LVM2.2.02.139/make.tmpl.in 2016-01-19 12:58:31.514176378 +0000
+@@ -49,6 +49,7 @@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+ LDFLAGS ?= @COPTIMISE_FLAG@ @LDFLAGS@
++STATIC_LDFLAGS += @STATIC_LDFLAGS@
+ CLDFLAGS += @CLDFLAGS@
+ ELDFLAGS += @ELDFLAGS@
+ LDDEPS += @LDDEPS@
+diff -ur LVM2.2.02.139_O/tools/Makefile.in LVM2.2.02.139/tools/Makefile.in
+--- LVM2.2.02.139_O/tools/Makefile.in  2016-01-08 18:51:21.000000000 +0000
++++ LVM2.2.02.139/tools/Makefile.in    2016-01-19 13:00:08.349172060 +0000
+@@ -129,7 +129,7 @@
+             -o $@ dmsetup.o -ldevmapper $(LIBS)
+ 
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+-      $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
++      $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static 
-L$(interfacebuilddir) \
+             -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) 
$(STATIC_LIBS) $(LIBS)
+ 
+ all: device-mapper
+@@ -146,7 +146,7 @@
+ endif
+ 
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  
$(interfacebuilddir)/libdevmapper.a
+-      $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
++      $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static 
-L$(interfacebuilddir) -o $@ \
+             $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
+ 
+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o 
lvm2cmd.o

diff --git a/sys-fs/lvm2/lvm2-2.02.139.ebuild b/sys-fs/lvm2/lvm2-2.02.139.ebuild
new file mode 100644
index 0000000..d975343
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.139.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev 
flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://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 ~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 )"
+
+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= )
+       udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+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 )
+       thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+       virtual/pkgconfig
+       >=sys-devel/binutils-2.20.1-r1
+       static? (
+               selinux? ( sys-libs/libselinux[static-libs] )
+               udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+               >=sys-apps/util-linux-2.16[static-libs]
+       )"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+pkg_setup() {
+       local CONFIG_CHECK="~SYSVIPC"
+
+       if use udev; then
+               local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required 
for udev sync)\n"
+               if linux_config_exists; then
+                       local uevent_helper_path=$(linux_chkconfig_string 
UEVENT_HELPER_PATH)
+                       if [ -n "${uevent_helper_path}" ] && [ 
"${uevent_helper_path}" != '""' ]; then
+                               ewarn "It's recommended to set an empty value 
to the following kernel config option:"
+                               ewarn 
"CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+                       fi
+               fi
+       fi
+
+       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_prepare() {
+       # Gentoo specific modification(s):
+       epatch "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
+
+       sed -i \
+               -e "1iAR = $(tc-getAR)" \
+               -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+               make.tmpl.in || die #444082
+
+       sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
+
+       if use udev && ! use device-mapper-only; then
+               sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die 
#514196
+               elog "Notice that \"use_lvmetad\" setting is enabled with 
USE=\"udev\" in"
+               elog "/etc/lvm/lvm.conf, which will require restart of udev, 
lvm, and lvmetad"
+               elog "if it was previously disabled."
+       fi
+
+       sed -i -e "s:/usr/bin/true:$(type -P true):" 
scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+       # For upstream -- review and forward:
+       epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+       epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+       epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+       epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+       epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
+       epatch "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+       epatch "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch 
#370217, #439414 + blkid
+       epatch "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
+
+       # Without thin-privision-tools, there is nothing to install for target 
install_man7:
+       use thin || { sed -i -e '/^install_lvm2/s:install_man7::' 
man/Makefile.in || die; }
+
+       eautoreconf
+}
+
+src_configure() {
+       filter-flags -flto
+       local myconf
+       local buildmode
+
+       myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
+       myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
+       myconf="${myconf} $(use_enable !device-mapper-only applib)"
+       myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
+       myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
+       use device-mapper-only && myconf="${myconf} 
--disable-udev-systemd-background-jobs"
+
+       # 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
+               buildmode="internal"
+               # This only causes the .static versions to become available
+               myconf="${myconf} --enable-static_link"
+       else
+               buildmode="shared"
+       fi
+       dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+
+       # dmeventd requires mirrors to be internal, and snapshot available
+       # so we cannot disable them
+       myconf="${myconf} --with-mirrors=${dmbuildmode}"
+       myconf="${myconf} --with-snapshots=${dmbuildmode}"
+       if use thin; then
+               myconf="${myconf} --with-thin=internal --with-cache=internal"
+               local texec
+               for texec in check dump repair restore; do
+                       myconf="${myconf} 
--with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
+                       myconf="${myconf} 
--with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
+               done
+       else
+               myconf="${myconf} --with-thin=none --with-cache=none"
+       fi
+
+       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}"
+               use corosync && clvmd="${clvmd:+$clvmd,}corosync"
+               use openais && clvmd="${clvmd:+$clvmd,}openais"
+               [ -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 \
+               --exec-prefix="${EPREFIX}" \
+               --sbindir="${EPREFIX}/sbin" \
+               --with-staticdir="${EPREFIX}"/sbin \
+               --libdir="${EPREFIX}/$(get_libdir)" \
+               --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+               --with-default-dm-run-dir=/run \
+               --with-default-run-dir=/run/lvm \
+               --with-default-locking-dir=/run/lock/lvm \
+               --with-default-pid-dir=/run \
+               $(use_enable udev udev_rules) \
+               $(use_enable udev udev_sync) \
+               $(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+               $(use_enable systemd udev-systemd-background-jobs) \
+               "$(systemd_with_unitdir)" \
+               ${myconf} \
+               CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+       pushd include >/dev/null
+       emake
+       popd >/dev/null
+
+       if use device-mapper-only ; then
+               emake device-mapper
+       else
+               emake
+               emake CC="$(tc-getCC)" -C scripts 
lvm2_activation_generator_systemd_red_hat
+       fi
+}
+
+src_install() {
+       local inst
+       INSTALL_TARGETS="install install_tmpfiles_configuration"
+       # install systemd related files only when requested, bug #522430
+       use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} 
install_systemd_units install_systemd_generators"
+       use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
+       for inst in ${INSTALL_TARGETS}; do
+               emake DESTDIR="${D}" ${inst}
+       done
+
+       newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+       newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+       if use !device-mapper-only ; then
+               newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+               newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
+               newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+               newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 
lvm-monitoring
+               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
+               #gen_usr_ldscript libdevmapper.so
+               dolib.a daemons/dmeventd/libdevmapper-event.a
+               #gen_usr_ldscript libdevmapper-event.so
+       else
+               rm -f 
"${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+       fi
+
+       if use lvm2create_initrd; then
+               dosbin scripts/lvm2create_initrd/lvm2create_initrd
+               doman scripts/lvm2create_initrd/lvm2create_initrd.8
+               newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+       fi
+
+       insinto /etc
+       doins "${FILESDIR}"/dmtab
+
+       dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+       ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+       ewarn "# rc-update add lvm boot"
+       ewarn
+       ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+       ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+       einfo "Tests are disabled because of device-node mucking, if you want 
to"
+       einfo "run tests, compile the package and see ${S}/tests"
+}

diff --git a/sys-fs/lvm2/lvm2-2.02.145.ebuild b/sys-fs/lvm2/lvm2-2.02.145.ebuild
new file mode 100644
index 0000000..1d68e30
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.145.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev 
flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://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 ~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 )"
+
+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= )
+       udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+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 )
+       thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+       virtual/pkgconfig
+       >=sys-devel/binutils-2.20.1-r1
+       sys-devel/autoconf-archive
+       static? (
+               selinux? ( sys-libs/libselinux[static-libs] )
+               udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+               >=sys-apps/util-linux-2.16[static-libs]
+       )"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+pkg_setup() {
+       local CONFIG_CHECK="~SYSVIPC"
+
+       if use udev; then
+               local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required 
for udev sync)\n"
+               if linux_config_exists; then
+                       local uevent_helper_path=$(linux_chkconfig_string 
UEVENT_HELPER_PATH)
+                       if [ -n "${uevent_helper_path}" ] && [ 
"${uevent_helper_path}" != '""' ]; then
+                               ewarn "It's recommended to set an empty value 
to the following kernel config option:"
+                               ewarn 
"CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+                       fi
+               fi
+       fi
+
+       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_prepare() {
+       # Gentoo specific modification(s):
+       epatch "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
+
+       sed -i \
+               -e "1iAR = $(tc-getAR)" \
+               -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+               make.tmpl.in || die #444082
+
+       sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
+
+       if use udev && ! use device-mapper-only; then
+               sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die 
#514196
+               elog "Notice that \"use_lvmetad\" setting is enabled with 
USE=\"udev\" in"
+               elog "/etc/lvm/lvm.conf, which will require restart of udev, 
lvm, and lvmetad"
+               elog "if it was previously disabled."
+       fi
+
+       sed -i -e "s:/usr/bin/true:$(type -P true):" 
scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+       # For upstream -- review and forward:
+       epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+       epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+       epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+       epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+       epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
+       epatch "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+       epatch "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch 
#370217, #439414 + blkid
+       epatch "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
+
+       # Without thin-privision-tools, there is nothing to install for target 
install_man7:
+       use thin || { sed -i -e '/^install_lvm2/s:install_man7::' 
man/Makefile.in || die; }
+
+       eautoreconf
+}
+
+src_configure() {
+       filter-flags -flto
+       local myconf
+       local buildmode
+
+       myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
+       myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
+       myconf="${myconf} $(use_enable !device-mapper-only applib)"
+       myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
+       myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
+       use device-mapper-only && myconf="${myconf} 
--disable-udev-systemd-background-jobs"
+
+       # 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
+               buildmode="internal"
+               # This only causes the .static versions to become available
+               myconf="${myconf} --enable-static_link"
+       else
+               buildmode="shared"
+       fi
+       dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+
+       # dmeventd requires mirrors to be internal, and snapshot available
+       # so we cannot disable them
+       myconf="${myconf} --with-mirrors=${dmbuildmode}"
+       myconf="${myconf} --with-snapshots=${dmbuildmode}"
+       if use thin; then
+               myconf="${myconf} --with-thin=internal --with-cache=internal"
+               local texec
+               for texec in check dump repair restore; do
+                       myconf="${myconf} 
--with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
+                       myconf="${myconf} 
--with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
+               done
+       else
+               myconf="${myconf} --with-thin=none --with-cache=none"
+       fi
+
+       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}"
+               use corosync && clvmd="${clvmd:+$clvmd,}corosync"
+               use openais && clvmd="${clvmd:+$clvmd,}openais"
+               [ -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 \
+               --exec-prefix="${EPREFIX}" \
+               --sbindir="${EPREFIX}/sbin" \
+               --with-staticdir="${EPREFIX}"/sbin \
+               --libdir="${EPREFIX}/$(get_libdir)" \
+               --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+               --with-default-dm-run-dir=/run \
+               --with-default-run-dir=/run/lvm \
+               --with-default-locking-dir=/run/lock/lvm \
+               --with-default-pid-dir=/run \
+               $(use_enable udev udev_rules) \
+               $(use_enable udev udev_sync) \
+               $(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+               $(use_enable systemd udev-systemd-background-jobs) \
+               "$(systemd_with_unitdir)" \
+               ${myconf} \
+               CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+       pushd include >/dev/null
+       emake
+       popd >/dev/null
+
+       if use device-mapper-only ; then
+               emake device-mapper
+       else
+               emake
+               emake CC="$(tc-getCC)" -C scripts 
lvm2_activation_generator_systemd_red_hat
+       fi
+}
+
+src_install() {
+       local inst
+       INSTALL_TARGETS="install install_tmpfiles_configuration"
+       # install systemd related files only when requested, bug #522430
+       use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} 
install_systemd_units install_systemd_generators"
+       use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
+       for inst in ${INSTALL_TARGETS}; do
+               emake DESTDIR="${D}" ${inst}
+       done
+
+       newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+       newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+       if use !device-mapper-only ; then
+               newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+               newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
+               newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+               newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 
lvm-monitoring
+               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
+               #gen_usr_ldscript libdevmapper.so
+               dolib.a daemons/dmeventd/libdevmapper-event.a
+               #gen_usr_ldscript libdevmapper-event.so
+       else
+               rm -f 
"${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+       fi
+
+       if use lvm2create_initrd; then
+               dosbin scripts/lvm2create_initrd/lvm2create_initrd
+               doman scripts/lvm2create_initrd/lvm2create_initrd.8
+               newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+       fi
+
+       insinto /etc
+       doins "${FILESDIR}"/dmtab
+
+       dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+       ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+       ewarn "# rc-update add lvm boot"
+       ewarn
+       ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+       ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+       einfo "Tests are disabled because of device-node mucking, if you want 
to"
+       einfo "run tests, compile the package and see ${S}/tests"
+}

Reply via email to