A mix of patch and adds to the main portage tree