The unshuffle infrastructure in ./bin/unshuffle_patch.sh ./bin/unshuffle_list.txt
is highly version specific, and has naturally bitrotted. Maybe it should simply be removed from openjdk-current. Maybe a more flexible version of unshuffle could be built that would work for any source and dest versions, by using the SCM's file-renaming metadata. It looks like y'all were careful to preserve that metadata. But probably no one has time to work on such a tool.