Removed old versions and files. Converted latest ebuild to EAPI-4

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

9 files changed, 26 insertions, 282 deletions

diff --git a/sys-devel/make/ChangeLog b/sys-devel/make/ChangeLog
index 6f73a79f167d..f48140a236db 100644
--- a/sys-devel/make/ChangeLog
+++ b/sys-devel/make/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/make
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.117 2013/12/13 06:15:37 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.118 2014/01/07 09:53:01 polynomial-c Exp $
+
+  07 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -make-3.81.ebuild,
+  -make-3.81-r1.ebuild, -make-3.82.ebuild, -make-3.82-r1.ebuild,
+  -make-3.82-r3.ebuild, -make-4.0.ebuild, make-4.0-r1.ebuild:
+  Removed old versions and files. Converted latest ebuild to EAPI-4.
 
 *make-4.0-r1 (13 Dec 2013)
 
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 013fa9e3e0df..e2ea5f9b96f8 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -25,25 +25,25 @@ DIST make-3.81.tar.bz2 1151445 SHA256 f3e69023771e23908f5d5592954d8271d3d6af0969
 DIST make-3.82.tar.bz2 1242186 SHA256 e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 SHA512 3260be0d1a9a7c5eb0dbb87179a9a9521fdfc7809ca51f13ee5a37ba5e63d21ad50a4249ec7d3929a9d0ce8c8f6cf302558743964f0f7ff742efe283b91df9de WHIRLPOOL 0b6b5f95f33e0e5584cddad234afb2350bbf62f2a9c280703345100eba7867d80412cbe1b22f429eb32db43dd37e665e0f136d0262ee3f030cf384f77e99d1cb
 DIST make-4.0.tar.bz2 1341927 SHA256 e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb SHA512 82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376 WHIRLPOOL 96984c0493651bf27db3ddd6fadde25678e512d4d134fd7063cc5cd54bff6228543c98463835940e19e1cc79a67e22067c889efd460b355438670a4d42ce0d09
 EBUILD make-3.80-r4.ebuild 1139 SHA256 9255d743c5381166aeac922b2b4b4c50fb8234c0f9a1c61b96f79ad6972148f6 SHA512 78cf993af5ecf8f89270ff29bc8de0cf9a082d299d26246ae122ef832eeee13e4da540d3b9739e722d84aa05bdf0096b0468fb6f5674235b752e804b1ce9e2b3 WHIRLPOOL 6acf4998b8e89c9ddbac636c1c23ab64a6437d8089f2a7aa80a74e2004c60c5ef55db46c2c1ba8a89e1f290f8bfcb2533681679fcb94079419638a6cc158373d
-EBUILD make-3.81-r1.ebuild 1210 SHA256 773900dc3f41b0dc65a8b3512654649423536cd57d608ea41bf6cadc13af5d83 SHA512 361b971d057226b89e945a74141829c60955f762bd45ed0f44517f12b11292443061edac31376fa8e10b2ca092d9b80b0fec2293733407ddb39dbb92a735b058 WHIRLPOOL 3092d616212a2e066e8f848bf0edc21ce7ccaa8c4186b709b5b4a0f401fc561fd916e50c3700d83cee63334ab1ef22c02aa27dc8cb857a050e4e92f8cf21e650
 EBUILD make-3.81-r2.ebuild 1307 SHA256 e9869620c7d244c93b029362a4e370320ac8c17a4f509d9b8c3e8e8abcb2c234 SHA512 7b439eb63e17fe4fff7bb854c52c6976c41457eb0932da0c83479f2fe1fc50111d58dd0e7f6a66dd1aeb0b76e2aac7b3643b2d6883cf378f0916635dae97de56 WHIRLPOOL 7ad244e63180910b8a3172e03143aba27b56d573e16ddb14e0baf0d86f48ff9135f7b2b6e93b36e8f27c33dc2e5efbd3684cf9a55488c273c12ada8e66cd58cf
-EBUILD make-3.81.ebuild 1142 SHA256 a64392d4eab939ce0b5da99775ab1e216d9c32827f0e595d2f10a72c6a2e6c6f SHA512 718f2485de85c7650297e812606b1e9c6ded70b3b5cb0790ff6322bcdd854315df60e53f758d7d6d37d5674e575839abaf2017125eeb6e9b307da88bc509624d WHIRLPOOL 680cd8719e7ee66823b0e8a5ed4c98023219210ce905b40bb975774ea3fcabf75f943c2c3409e1b96031263c23053ffa0c5013622db82e33378c9064a0f4c15e
-EBUILD make-3.82-r1.ebuild 1241 SHA256 449e8f16fab46f04f9d21b52e4712af3922ceaa3bc2b1e8630932d7bb36c9ae7 SHA512 028e96393149ea59b1c84afbb2daaeae57232c2d603f959b67bde06d128d4f84e611dfb296256d83aa8d562556edbf402bd454aed20698eac90e4010743d1899 WHIRLPOOL 53c4781723d629206b58e12cde9ce7996893a2035f473fd8751e36b1794b5961c161e544c087feca860c8c038ab13c4a248425fc646c7e29fd75f7d1d97b4537
-EBUILD make-3.82-r3.ebuild 1307 SHA256 86260b468454eb17687dcaac59d288dd1ab192a354b87ba4e9db617342b676f2 SHA512 3000360b794c7f6db2e249a189e386b74410f6e124f2cefa6947db839fb9135ea13944f8c6e34a3644bd776ac45f1df1b4c9883355dca0ebc922dedf9d601fcf WHIRLPOOL 2b9f5e865b984a3a164b95d028e6127cc2e439ba7e8e16019aa954bb6bab8390170b8188ebec336175c96fd671d80a2d5f65490ed5d11b3af88be5a6d6c40b93
 EBUILD make-3.82-r4.ebuild 1875 SHA256 7cee00db1523fa86d61bba1244ec75ee3582c58fc21ddc4bfddb75bd4a73edc3 SHA512 f5817dd770605919bbf04de11efb29f7dfb03647134dd1c958fe93913dda00a3e411115642222cc98a141c99b7901140ccdcfa81b0c953090834b45aa385ea40 WHIRLPOOL 549ad92c4f7f7aa1010b3e0dc3ff2755ab3080e2fd7e15185054905ac3dc8ba33a82974cfa98f4cb840ecc38844988f499aad4dffc81680e9511cfc6c271001e
-EBUILD make-3.82.ebuild 1183 SHA256 1f2ca73bb4d269ad882400528a2eeb2e22fbcee64fb8a589b074009b5df6ea52 SHA512 cc6cc43313c4381fe770ef6d6838d2e66da5ffab950f607f19ffc2f62958f5f15b411292be621ce3ce90f323866807bf03996209f2c694db54921177247d968c WHIRLPOOL 431e29680e0fcbad27939d2a5f37b793b0d605b34289776877ffe4673ab99712101cb5637b702e99b76f63e67625b5914962cd5ab3fe4a1f165dc01412949c96
-EBUILD make-4.0-r1.ebuild 1494 SHA256 4542ac45b558c4ed4975154485d5fe14ca17bf30444de8fb2698c68b95ce595d SHA512 f589fd8cbd11df70fcac7f58247b0934138190a16ecbbb92f3314a10e0216143010817ddee43f92da7cc4052a62b2cac51e8cb0d0e18694d9126590beff8e6d5 WHIRLPOOL 1080ee7de10c4b7357214b53c25073a29484ea57bf52a427b31bdec78e5cc8ac676308628a21c298c99ab4d0e5bab001ce990e7d0cc2e9e770d397b74f22a439
-EBUILD make-4.0.ebuild 1451 SHA256 683191a1d2c0790e241d2301c96311d1500728edc6879b4540c4be780132ae10 SHA512 f67e31508c8d0a8519f84012d65a74be240d98a2354fd14aecdd306ff6bb0db586a5b2c88bb6c2fcc6d5137b02d8bb91704457752ae399f450210e75326cf825 WHIRLPOOL e9a72a7df525fe73f3e289d449a516e770e8fd90b64c212809a2e5e98263f5eefe011881a8acccd7c76ab793bf8a78b82fef5b8e27dcf1ddb972146b15a46b2c
-MISC ChangeLog 15323 SHA256 beea11fbd3cdd2c7d6614d29b7549d0251716a336b94b9620a63f0eb49d17ca1 SHA512 46b70486e2954d2117ef87c0ec58f37c529aeceb2726767d4b1978f454be9f8b7bbd06be2ab3f0c94fd9d4b652f44e7ba30f85737ed9d508c61e0734ed6e745c WHIRLPOOL bbe00f05e55c5f3a1f2a9e91397581b8a4c5cb086bea4d07450915bdebdd1be26b2fae0c8ed634073f25d53bc6f92404ca2b27aa49d0a725e2ca95e1ccdd921b
+EBUILD make-4.0-r1.ebuild 1488 SHA256 dc410e8cf6517e4dadcc794befccf43b9ffcb82f8eebaf1954f95faed912d4a7 SHA512 676a365630f3e3b821840f37801c9d06cf342e72552629a9f1299c351fae73d2b18f47e5580bfeef4334da4a7cab1f4468bd86097c3ce965bbb79df745d293e6 WHIRLPOOL 60fc55b1c8b4f331e30be127bc0d2ed334201663a37783f0d1ef84d4672993ec2c76c8c2853d729f492cc53b4b78b49996f950a68dab4021d6c4153ad9a2bdd3
+MISC ChangeLog 15596 SHA256 21d8c41cd1a9e63e2ff5576fb087d13eeea6482c2610cbd8fb41912591a775a5 SHA512 dd67f9dccd2956b93e432092102b6e0b463ee701ddea17a47efcafd6278bdf38a129e28faef83811ede1df2c607b9ed915f692f9a8647541b4cee096d302f340 WHIRLPOOL d64e866619efb15a816b68896eeeabc0d1d3ca236f665968eac7cb4f78cb0bfdf56e9867591cb6564c786dd775de0902d3b09c42b7cd8065ff8cdd3df219f7a4
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSqqXFAAoJEEdUh39IaPFNYjcH/RxNYBqo60dp3kD2IrJ7juVr
-A0PgHy+JiIHQwDJVwUj8WDp2hQ1FKUAAe46FtVPNqZepm7H5LF3PxKe7FoVTHGbG
-4A4CPZSIzADWB4Fgcs6/W1X7YgA07WRdnTyIvNezY4ztOu0Nx9Doh9sH+lJ2z6Go
-+BxE9byqmFjDb+nxD+T5ad6VnW1umavZ4LvEVZKM5DWMmeaLfqmPWdalGGQYIcfb
-vEFsdyCJ9stkryeb2DKYXK+EIPm+o8TX9lBCQSQxc2Dn65BtdFvzPA7uoqyi6XKA
-Qz67iGgAD65f1XD7tWzKI0SuLNUBpr+Z95fBggHh0g3MQaoDKyuJrshXzwz35l4=
-=DjDn
+iQIcBAEBCAAGBQJSy85+AAoJEPiazRVxLXTF9Z8QAMn7GSBfMw35/VOTv/NKhsVI
+4w62HP2eN8AQT4GWArtcxlZFpykZUzE2Gjf+gqIB++90Iz72z3mIvNNwYPhDSbSI
+GVhb3tq/2zPtx6XkS4qXmWZEq517UpwEL0u0J9QAx65bpJT9o/tRfI5o3rY7HMJP
+rgFPg+QcQzL2Rhv8M08W1b3ocyXV6HkQtA4Hp8JmY/1hTqur0nglnJD9mlsY69g/
+TlgPNjE0rTBHXEPyiTc+iWPsTB1OyFI2kYusTgsgQiKLx7GpohvluAMZk0dMIukl
+GSNdxdUqTGi+pAT7B+j71be5X06TUral+ejkpPrAGUtOYvzONmX+YKiPNAUIyqEW
+01hyVDfNf5JWB6silixag9mJ6kdIGhxtnfHlKd3RfQjqzUoHGYH7JaGM1zG7OGS9
+3Qe/IY0VTLIN+GM0q4KFC1JXl4lWOI7cdeAo0YSdOzHMhjhBl/rOIoeUFUqQpNK9
+mSjTiG0Y++gj4UprUz6ErdkJC5sc0Xpzkt2yHax5cr/1wOKsvsc0I2EauOXabRQd
+tZmnhp0AgkvAr2nZ0vrxpgm+TYMBrOcioB5sVzg12dkBCsgMlhR7200Yu/lR9RG8
+aUOzQcCKsmFfFeHjCpkYguEUrKOH9Wc4Lo3PKeAzORoA/FV8wsR18ExQOKJ2RtRu
+edBdYXcOu0U8HeHTmnVH
+=nwc0
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/make/make-3.81-r1.ebuild b/sys-devel/make/make-3.81-r1.ebuild
deleted file mode 100644
index 8791da40004d..000000000000
--- a/sys-devel/make/make-3.81-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81-r1.ebuild,v 1.2 2012/05/24 02:38:35 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="http://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-tests-lang.patch
-	epatch "${FILESDIR}"/${P}-long-cmdline.patch #301116
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf \
-		$(use_enable nls) \
-		--program-prefix=g \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-3.81.ebuild b/sys-devel/make/make-3.81.ebuild
deleted file mode 100644
index 3207e2c309e7..000000000000
--- a/sys-devel/make/make-3.81.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81.ebuild,v 1.15 2012/05/24 02:38:35 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="http://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-tests-lang.patch
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf \
-		$(use_enable nls) \
-		--program-prefix=g \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-3.82-r1.ebuild b/sys-devel/make/make-3.82-r1.ebuild
deleted file mode 100644
index 671f0109c9c2..000000000000
--- a/sys-devel/make/make-3.82-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82-r1.ebuild,v 1.8 2011/12/30 15:46:43 halcy0n Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="http://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="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
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--program-prefix=g \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-3.82-r3.ebuild b/sys-devel/make/make-3.82-r3.ebuild
deleted file mode 100644
index c97375c7abde..000000000000
--- a/sys-devel/make/make-3.82-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82-r3.ebuild,v 1.8 2012/09/02 18:52:35 armin76 Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="http://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="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
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--program-prefix=g \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-3.82.ebuild b/sys-devel/make/make-3.82.ebuild
deleted file mode 100644
index e3cc1ef142d9..000000000000
--- a/sys-devel/make/make-3.82.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82.ebuild,v 1.11 2011/07/09 09:17:29 xarthisius Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="http://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-archives-many-objs.patch #334889
-	epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--program-prefix=g \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-4.0-r1.ebuild b/sys-devel/make/make-4.0-r1.ebuild
index 67e31ba4842d..259c5f32448d 100644
--- a/sys-devel/make/make-4.0-r1.ebuild
+++ b/sys-devel/make/make-4.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-4.0-r1.ebuild,v 1.1 2013/12/13 06:15:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-4.0-r1.ebuild,v 1.2 2014/01/07 09:53:01 polynomial-c Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit flag-o-matic eutils
 
@@ -36,7 +36,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README*
 	if [[ ${USERLAND} == "GNU" ]] ; then
 		# we install everywhere as 'gmake' but on GNU systems,
diff --git a/sys-devel/make/make-4.0.ebuild b/sys-devel/make/make-4.0.ebuild
deleted file mode 100644
index 0993335e96c8..000000000000
--- a/sys-devel/make/make-4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-4.0.ebuild,v 1.1 2013/10/13 16:51:59 polynomial-c Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="http://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-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="guile nls static"
-
-CDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl )"
-
-src_prepare() {
-	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)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}