adjusting some package names, and collapsing some ruby entries that can be combined. Also properly sort the <bid> and <cvename> tags. b comes before c.