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@gentoo.org>

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 cbbfc1e375264147711f033ff9818990135f926f..1529b9bf6c713d25aaef5fc45a270c19c65c6166 100644 (file)
--- 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)