From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E5D1158020 for ; Sun, 30 Oct 2022 04:35:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F72DE0896; Sun, 30 Oct 2022 04:35:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0784DE0895 for ; Sun, 30 Oct 2022 04:35:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18510340C54 for ; Sun, 30 Oct 2022 04:35:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60FF2644 for ; Sun, 30 Oct 2022 04:35:38 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1667104536.9199809d660b52e6f4e960fc1bea889bea15cdaa.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild X-VCS-Directories: sys-fs/multipath-tools/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 9199809d660b52e6f4e960fc1bea889bea15cdaa X-VCS-Branch: master Date: Sun, 30 Oct 2022 04:35:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aaa3478d-743c-4769-9590-a965dcc46ee3 X-Archives-Hash: f5ab4fff2aeec3ceec3a60e3dd32dbab commit: 9199809d660b52e6f4e960fc1bea889bea15cdaa Author: Robin H. Johnson gentoo org> AuthorDate: Sun Oct 30 04:35:20 2022 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Oct 30 04:35:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9199809d sys-fs/multipath-tools: bump Signed-off-by: Robin H. Johnson gentoo.org> Reference: https://bugs.gentoo.org/show_bug.cgi?id=878763 .../multipath-tools/multipath-tools-0.9.3.ebuild | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild index 937105680154..74c4e010e73a 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit linux-info systemd toolchain-funcs udev +inherit linux-info systemd toolchain-funcs udev tmpfiles DESCRIPTION="Device mapper target autoconfig" HOMEPAGE="http://christophe.varoqui.free.fr/" @@ -34,7 +34,7 @@ PATCHES=( ) src_prepare() { default # life is too short for some trivial patches - sed -r -i -e '/^(CPPFLAGS|CFLAGS)/s,:=,+=,' \ + sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ "${S}"/Makefile.inc || die } @@ -44,23 +44,33 @@ src_compile() { # LIBDM_API_FLUSH involves grepping files in /usr/include, # so force the test to go the way we want #411337. emake \ - prefix="${EPREFIX}" \ + prefix="${EPREFIX}/usr" \ LIB="$(get_libdir)" \ LIBDM_API_FLUSH=1 \ - PKGCONFIG="$(tc-getPKG_CONFIG)" + PKGCONFIG="$(tc-getPKG_CONFIG)" \ + GENTOO_CFLAGS="${CFLAGS}" \ + GENTOO_CPPFLAGS="${CPPFLAGS}" \ + FAKEVAR=1 } src_install() { - dodir /sbin /usr/share/man/man{3,5,8} + dodir /sbin + # upstream makefile has terrible $(prefix) choices emake \ - DESTDIR="${D}" \ + DESTDIR="${ED}" \ prefix="${EPREFIX}" \ LIB="$(get_libdir)" \ RUN=run \ unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='$(prefix)'/$(get_udevdir) \ - pkgconfdir='$(prefix)/usr/$(LIB)/pkgconfig' \ + libudevdir="${EPREFIX}/$(get_udevdir)" \ + pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \ + GENTOO_CFLAGS="${CFLAGS}" \ + GENTOO_CPPFLAGS="${CPPFLAGS}" \ install + rmdir "${ED}"/usr/include + rmdir "${ED}"/usr/share + mv "${ED}"/include "${ED}"/usr/include || die + mv "${ED}"/share "${ED}"/usr/share || die einstalldocs newinitd "${FILESDIR}"/multipathd-r1.rc multipathd @@ -70,6 +80,7 @@ src_install() { } pkg_postinst() { + tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf udev_reload if [[ -z ${REPLACING_VERSIONS} ]] ; then