From 1b91ec9ce59ba715f29b61cb384d1585d48fddc2 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Mon, 14 May 2018 22:58:30 +0200 Subject: sys-fs/lvm2: Fix correct order for applying patches Closes: https://bugs.gentoo.org/617756 Package-Manager: Portage-2.3.36, Repoman-2.3.9 (cherry picked from commit 8e74564c314c390f347bb6b2b5e83d448bf2735d) Signed-off-by: Robin H. Johnson Closes: https://github.com/gentoo/gentoo/pull/8402 --- sys-fs/lvm2/lvm2-2.02.171.ebuild | 2 +- sys-fs/lvm2/lvm2-2.02.172.ebuild | 2 +- sys-fs/lvm2/lvm2-2.02.173.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sys-fs/lvm2') diff --git a/sys-fs/lvm2/lvm2-2.02.171.ebuild b/sys-fs/lvm2/lvm2-2.02.171.ebuild index c37f990a866d..28862e26bce6 100644 --- a/sys-fs/lvm2/lvm2-2.02.171.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.171.ebuild @@ -66,9 +66,9 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 - "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 + "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream ) diff --git a/sys-fs/lvm2/lvm2-2.02.172.ebuild b/sys-fs/lvm2/lvm2-2.02.172.ebuild index b8021bbe2347..7d02c914775e 100644 --- a/sys-fs/lvm2/lvm2-2.02.172.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.172.ebuild @@ -66,9 +66,9 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 - "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 "${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 + "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream ) diff --git a/sys-fs/lvm2/lvm2-2.02.173.ebuild b/sys-fs/lvm2/lvm2-2.02.173.ebuild index b8021bbe2347..7d02c914775e 100644 --- a/sys-fs/lvm2/lvm2-2.02.173.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.173.ebuild @@ -66,9 +66,9 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 - "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 "${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 + "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream ) -- cgit v1.2.3-65-gdbad