Solutions to the strong-CP problem in a world with gravity☆