Update to cmake-3.1.0: revert dependency changes. Thanks to Armin.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk@15220 af4574ff-66df-0310-9fd7-8a98e5e911e0