It would be nice if bash-completion-r1.eclass would be usable with EAPI=6, at least the basic functions dobashcomp and newbashcomp. I see nothing which should require any change for EAPI=6 except for the unnecessary blocking test.
Patches sent to ml for review.
And pushed.