Add Gentoo Prefix modifications since the ebuild was already EAPI3. Keywords, dosym, ED usage.

Package-Manager: portage-2.1.9.49/cvs/Linux i686

3 files changed, 13 insertions, 16 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 3fa46735084d..7c842e2e9de8 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.151 2011/03/01 23:20:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.152 2011/05/31 15:37:21 darkside Exp $
+
+  31 May 2011; Jeremy Olexa <darkside@gentoo.org> m4-1.4.16.ebuild:
+  Add Gentoo Prefix modifications since the ebuild was already EAPI3. Keywords,
+  dosym, ED usage.
 
 *m4-1.4.16 (01 Mar 2011)
 
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 6aa769d1ee19..409e1d2fecd2 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX m4-1.4.15-git-version-gen.patch 1275 RMD160 8a0660c118ab584f6a91691318d0415f7a46daaa SHA1 7b9371299803afefdbe8d8beca0c7e3e0c1aa4ed SHA256 42cfd406e5508768987b916b46bcbc7e81ef8ed57f65428fc9a462439eba0896
 AUX m4-1.4.15-uclibc-sched_param-def.patch 580 RMD160 2bcea0eb33aaef5ae5f9046a36385af7a9194865 SHA1 e3c94913eaaf8a280e598353f89ef46119dd3f94 SHA256 b111051eaaa15ce6e53ae168d06e0fb9688c70141060abfe0a15c5d1400fbaf9
 DIST m4-1.4.15.tar.xz 947068 RMD160 a51516c6e22d3518eabb934083a6d450d85190e2 SHA1 d4c7fe695ddf93c0f05c6435d892520b65f4c0d7 SHA256 ec26b4ef8037286b36bc5af9893f0da63bf8615bbf478a587aa6cab927b0349d
 DIST m4-1.4.16.tar.xz 1005264 RMD160 179325c371810db9489d8c2c65d5ab3a38ba84e0 SHA1 d8688d1d84e058366134301e018e57bbbdc33463 SHA256 d5b5d51cf8f5b18f3bac39bc2f6b1e61f34d400136ae1a87d075e26a38028d5d
 EBUILD m4-1.4.15.ebuild 1282 RMD160 59f1072471225fe0f7e5334250e802f5c3177bf5 SHA1 5abe7f09506d99cb9bf8ba6709d86d0f1334cf3f SHA256 e472ea03a5e23e7bd1b38f499d6c3cfc9a99354c653fd14b7c5eed40b7647190
-EBUILD m4-1.4.16.ebuild 1161 RMD160 d155ad92c24ed693eca7eb3ce7f3ed1d74123402 SHA1 5bdc9edaacaa21960cd69ec5cd3482ac597cf537 SHA256 a584b8e3e97a71bf2118d55e3d63fa7b1222790a7bd60cf3b711c0acce9357c4
-MISC ChangeLog 16972 RMD160 493346c66ff7a4c21e84835950ea100e007d2db7 SHA1 955816d75ee222fa27487ea8a74f61951309537f SHA256 660774a06c4cdd8a656cb7a5b1d9b68a79bffb3ef52649199f36a3d3844ec4d8
+EBUILD m4-1.4.16.ebuild 1567 RMD160 77f72df102898db1e7aa508e35c16b343e7ec645 SHA1 a49795a9db0408d6f005594107b2d870f0aaac63 SHA256 c759683530706d662ad90d73eca5a26308f5e8df52c3a531cb507dfb0611a2a2
+MISC ChangeLog 17142 RMD160 b59e82f3f92e37a9d5f025c57d9703b4ff05ae9d SHA1 b0c2a8bf7c49eec85ddc8221e6d63e409926951f SHA256 6389f2593a0d85aa0e6c68ed3d7f3844134b7f0c7bbfc2bf3967d67f8f9155ef
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk1tf10ACgkQaC/OocHi7JbwcAD/VJaNtH7NsKvwdDY568WwIpjU
-hJNbEENi0wHqiVaBYHIA/08BV191Rw8H8uTiuNfMXetKMalvWZQf5gUBqimxrER3
-=pIwM
------END PGP SIGNATURE-----
diff --git a/sys-devel/m4/m4-1.4.16.ebuild b/sys-devel/m4/m4-1.4.16.ebuild
index 01d1f719c4b8..826df369df55 100644
--- a/sys-devel/m4/m4-1.4.16.ebuild
+++ b/sys-devel/m4/m4-1.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.16.ebuild,v 1.1 2011/03/01 23:20:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.16.ebuild,v 1.2 2011/05/31 15:37:21 darkside Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
@@ -35,10 +35,13 @@ src_test() {
 
 src_install() {
 	emake install DESTDIR="${D}" || die
+	# autoconf-2.60 for instance, first checks gm4, then m4.  If we don't have
+	# gm4, it might find gm4 from outside the prefix on for instance Darwin
+	use prefix && dosym /usr/bin/m4 /usr/bin/gm4
 	dodoc BACKLOG ChangeLog NEWS README* THANKS TODO
 	if use examples ; then
 		docinto examples
 		dodoc examples/*
-		rm -f "${D}"/usr/share/doc/${PF}/examples/Makefile*
+		rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
 	fi
 }