Makefile and ebuild updated