[gentoo-commits] proj/musl:master commit in: sys-fs/lvm2/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     465f8cba7d8cb10d83bd01bb11f7366931f64f93
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 17:17:19 2022 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 17:17:19 2022 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=465f8cba

sys-fs/lvm2: Fix builds for musl users

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 ...-2.02.188-r2.ebuild => lvm2-2.02.188-r3.ebuild} | 41 +++++++++++-----------
 sys-fs/lvm2/metadata.xml                           | 15 ++++----
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
similarity index 92%
rename from sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
rename to sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
index 14cda96d..493fc838 100644
--- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic
+TMPFILES_OPTIONAL=1
+inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -12,8 +13,8 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin )
 	static? ( !systemd !udev )
 	static-libs? ( !udev )
 	systemd? ( udev )"
@@ -31,11 +32,9 @@ DEPEND_COMMON="
 # 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/lvm-user
 	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
+	lvm2create-initrd? ( sys-apps/makedev )
+	!device-mapper-only? ( virtual/tmpfiles )
 	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
@@ -54,11 +53,6 @@ PATCHES=(
 	# Gentoo specific modification(s):
 	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
 
-	# Musl fixes
-	"${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch
-	"${FILESDIR}"/${PN}-2.02.183-portability.patch
-	"${FILESDIR}"/${PN}-2.02.183-implement-libc-specific-reopen_stream.patch
-
 	# For upstream -- review and forward:
 	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
 	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
@@ -75,6 +69,11 @@ PATCHES=(
 	#"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream
 	"${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652
 	"${FILESDIR}"/${PN}-2.02.186-udev_remove_unsupported_option.patch #700160
+
+	# Musl fixes
+	"${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch
+	"${FILESDIR}"/${PN}-2.02.183-portability.patch
+	"${FILESDIR}"/${PN}-2.02.183-implement-libc-specific-reopen_stream.patch
 )
 
 pkg_setup() {
@@ -213,14 +212,12 @@ src_compile() {
 }
 
 src_install() {
-	local inst INSTALL_TARGETS
-	INSTALL_TARGETS=( install install_tmpfiles_configuration )
+	local inst
+	local INSTALL_TARGETS=( install install_tmpfiles_configuration )
 	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
+	use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
 	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
-	for inst in ${INSTALL_TARGETS[@]}; do
-		emake V=1 DESTDIR="${D}" ${inst}
-	done
+	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 
 	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
 	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
@@ -257,7 +254,7 @@ src_install() {
 		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
 	fi
 
-	if use lvm2create_initrd; then
+	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
@@ -270,7 +267,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process lvm2.conf
+	if ! use device-mapper-only; then
+		tmpfiles_process lvm2.conf
+	fi
 
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		# This is a new installation

diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 8eb6a410..e264bd79 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agk@redhat.com</email>
 		<name>Alasdair Kergon</name>
 		<description>Upstream Maintainer (please CC on bugs)</description>
 	</maintainer>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-		<description>Backup to Robin. Please CC on bugs.</description>
-	</maintainer>
 	<use>
-		<flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</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="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>