The new icann directive is that they suggest we shutdown whois. So in theory at least there will be only RDAP. I'm guessing all the distros will add something soon.

On the other hand my employer and I imagine most other registries are not planning to shut off whois. Actual people in the real world still use it.