Switch to emake in src_install and drop USE=build cruft.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 30 insertions, 24 deletions

diff --git a/sys-devel/make/ChangeLog b/sys-devel/make/ChangeLog
index ccf12f11ac22..a30dde0b4d40 100644
--- a/sys-devel/make/ChangeLog
+++ b/sys-devel/make/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/make
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.59 2006/11/05 12:12:43 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.60 2008/12/07 03:18:17 vapier Exp $
+
+  07 Dec 2008; Mike Frysinger <vapier@gentoo.org> make-3.80-r4.ebuild,
+  make-3.81.ebuild:
+  Switch to emake in src_install and drop USE=build cruft.
 
   05 Nov 2006; Mike Frysinger <vapier@gentoo.org>
   +files/make-3.81-tests-lang.patch, make-3.81.ebuild:
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index bf3ac0d7a959..56aba9ec8338 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.80-memory.patch 2248 RMD160 3c8d5c017c61061eb4d6f666799d377f1ba272ca SHA1 9e3f3d9c9fa7911dff14adbe46080e1326cf05f2 SHA256 0fa6d8b039fd56313626a3865cde7ef09622525a751ec55bf3741a6fc172091f
 AUX make-3.80-conditional-eval.patch 4144 RMD160 f8755c6ea82cfc4cdc6675b2e462fb6438b9e569 SHA1 3320a4196e42a25a3f7f51a3f84859c49dea6683 SHA256 68f182f5435296b60acc710006bddf745bee6c37e68ae2942c778add93a40155
 AUX make-3.80-parallel-build-failure.patch 2210 RMD160 5c7fe016fc854b017315bf22c6ddc1c600d4b99a SHA1 0b3f318ccf89aa660a0cc33c179bc58a62fbe378 SHA256 71f80dee56a04f30f2fe8bb9012d32ed830d2e0e9f68c183819c5ccf025c9b62
 AUX make-3.81-tests-lang.patch 1788 RMD160 c62f231b9bb5fef003e91f9a48b76832bd75b72d SHA1 2d77b19cafa2a24a840af3b7418399b7ee696ee2 SHA256 0d2f6b061ed2b09babbb851d1bcebcd20bc2331c799d469bfefa2a985774e486
 DIST make-3.80.tar.bz2 920645 RMD160 dcb61f3913d4d43caeef5b597ba2d4e1a03701aa SHA1 d2085842f08e57d58d3e1cd75a5f0342a60e5f45 SHA256 a99b39e7b04c333724f48c38fede709481cfb69fafe7e32ae4285b7fadf92f1b
 DIST make-3.81.tar.bz2 1151445 RMD160 79d418e1258ec0d6ba08b1431a4ade3fec54c2b2 SHA1 41ed86d941b9c8025aee45db56c0283169dcab3d SHA256 f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8
-EBUILD make-3.80-r4.ebuild 1306 RMD160 734c64c51dc0e3897bbbc257c0bb5aa3e3c98148 SHA1 e26dc0861f8859b665c99dc525cbc8b09a4e24b9 SHA256 b69e7918e6623c50bede953f55d5dae3f4238c2e441f6b3c68179263ad9e012f
-EBUILD make-3.81.ebuild 1133 RMD160 a5cf18ae230a725e77203aae0ad7726660e09169 SHA1 890e69eab66d37ed02a1f5cf449ce47ca45c9654 SHA256 8095f9332a1502253373413aa1a0e65d691df092677d0829bbb0689792dcdc76
-MISC ChangeLog 6980 RMD160 0ff8a141d44ef635f54660a911ddc5be9fe390db SHA1 60c15e732499fdce5bee52ba32e3a981ac1861a4 SHA256 06e84764929bb32ceb445292a64b75a8a26f35ce7a03d1eca85ee1c6a5482168
+EBUILD make-3.80-r4.ebuild 1140 RMD160 8b378fd1bf71d892ad072a3e14bc3d5ab73b6e29 SHA1 e4556c756032747e36c1638737fa6921087db668 SHA256 9dca642ab97bb823a6cd85aa0757bb7c88636f4cddd7f3323c8f4da394ce7667
+EBUILD make-3.81.ebuild 1134 RMD160 425a6c02111d11a5a37f5925d61cfd7eca056738 SHA1 38775d52c06b6d850e2ca9e492c7f2ce197e7992 SHA256 f75601a66102b975d9dcf04517087f4a7393bc06d70432eb121ec205dabb846d
+MISC ChangeLog 7131 RMD160 ca547c2986f980b5e58062c8eea0d761c12007c1 SHA1 a00703c36d5bdcc0cfdcce653d7f89e096c23c85 SHA256 99c8542b3004c52a58e03af28cc47c7cd466e243763bfa5d71d6e122a9814b65
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk7QH8ACgkQ67wieSYcaxfeCgCgneYLDXOouxo2FiHM2Pnk1ovq
+AL4AoOVdc7bCfoXRqYvfetgFyiu32tYp
+=Fr0L
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/make/make-3.80-r4.ebuild b/sys-devel/make/make-3.80-r4.ebuild
index a8b174aa5d3a..e49a3104f364 100644
--- a/sys-devel/make/make-3.80-r4.ebuild
+++ b/sys-devel/make/make-3.80-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.80-r4.ebuild,v 1.10 2006/04/14 23:05:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.80-r4.ebuild,v 1.11 2008/12/07 03:18:17 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnu.org/gnu/make/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static build"
+IUSE="nls static"
 
 DEPEND="nls? ( sys-devel/gettext )"
 RDEPEND=""
@@ -34,18 +34,10 @@ src_compile() {
 }
 
 src_install() {
-	if use build ; then
-		if [[ ${USERLAND} == "GNU" ]] ; then
-			dobin make || die "dobin"
-		else
-			newbin make gmake || die "newbin failed"
-		fi
-	else
-		make DESTDIR="${D}" install || die "make install failed"
-		dodoc AUTHORS ChangeLog NEWS README*
-		if [[ ${USERLAND} == "GNU" ]] ; then
-			dosym gmake /usr/bin/make
-			dosym gmake.1 /usr/share/man/man1/make.1
-		fi
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README*
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		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
index 8466ab32eb4c..a0ebd601454b 100644
--- a/sys-devel/make/make-3.81.ebuild
+++ b/sys-devel/make/make-3.81.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.12 2006/11/05 12:12:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81.ebuild,v 1.13 2008/12/07 03:18:17 vapier Exp $
 
 inherit flag-o-matic
 
@@ -32,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	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,