As of Aug 1 there is an updated patch available on the gentoo bugtracker, which references the additional code you pinpointed.
-- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
