--- /var/portage/sys-devel/make/make-3.82-r4.ebuild
+++ /usr/local/portage/sys-devel/make-4.0.ebuild
@@ -10,32 +10,26 @@
 HOMEPAGE="http://www.gnu.org/software/make/make.html"
 SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="guile nls static"
 
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
+CDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libintl )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-archives-many-objs.patch #334889
-	epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975
-	epatch "${FILESDIR}"/${P}-memory-corruption.patch #355907
-	epatch "${FILESDIR}"/${P}-glob-speedup.patch #382845
-	epatch "${FILESDIR}"/${P}-copy-on-expand.patch
-	epatch "${FILESDIR}"/${P}-oneshell.patch
-	epatch "${FILESDIR}"/${P}-parallel-remake.patch
-	epatch "${FILESDIR}"/${P}-intermediate-parallel.patch #431250
-	epatch "${FILESDIR}"/${P}-construct-command-line.patch
-	epatch "${FILESDIR}"/${P}-long-command-line.patch
-	epatch "${FILESDIR}"/${P}-darwin-library_search-dylib.patch
+	epatch "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
 }
 
 src_configure() {
 	use static && append-ldflags -static
 	econf \
 		--program-prefix=g \
+		$(use_with guile) \
 		$(use_enable nls)
 }