[gentoo-commits] repo/gentoo:master commit in: x11-misc/shared-mime-info/

[Mike Gilbert]

commit:     82829612a8463a037daa81d0390f37b3e02cc672
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 15:37:21 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu May  2 15:37:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82829612

x11-misc/shared-mime-info: ensure LFS workaround is removed

Bug: https://bugs.gentoo.org/684884
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
index cbbfc1e3752..1529b9bf6c7 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
@@ -25,8 +25,14 @@ DOCS=( ChangeLog HACKING NEWS README )
 src_configure() {
 	export ac_cv_func_fdatasync=no #487504
 
-	# https://bugs.gentoo.org/684884
-	append-lfs-flags
+	if [[ ${PV} == 1.10 ]]; then
+		# https://bugs.gentoo.org/684884
+		append-lfs-flags
+	else
+		eerror "LFS support merged upstream."
+		eerror "https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/20"
+		die "Please remove LFS workaround."
+	fi
 
 	local myeconfargs=(
 		$(use_enable test default-make-check)