[gentoo-commits] dev/heroxbd:master commit in: sys-devel/automake/

["Benda XU" <heroxbd@gentoo.org>]

commit:     6e477e6e880e9aa1161b0d01085b869e6176d0aa
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 08:55:40 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed May 11 08:55:40 2016 +0000
URL:        https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=6e477e6e

sys-devel/automake: prefixify.

Bug: 582734

 sys-devel/automake/Manifest                |  2 +-
 sys-devel/automake/automake-1.15-r2.ebuild | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 7d2e905..aad7d0a 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,5 +1,5 @@
 AUX automake-1.15-mdate-tz.patch 1757 SHA256 6409933549df0afcf9dcece8b2036140290999512b32a6554a6d898ae1d80fee SHA512 c4fc5a2ed4d7d6e0dc06f0e90fa84bea99f35145a885485fef072c4e0dfc979f696959e1d54381f78de429a11d5ee9b061686cca8fd1c85469245d5b4d2cdc52 WHIRLPOOL 217c2ca5a15cfa159b473aea0691f8b0f494b4b1be1845b2f39ec0c0ccb5a392b53f00a2de496076094f878db583432d75f22e2c5e858897b97b052933168c67
 AUX automake-1.15-perl-escape-curly-bracket.patch 1129 SHA256 1f5c086733cdb7b64c5a160fea22ab90eaec45664db47a7fedf82051eb7f6b56 SHA512 d6c2078e7eebd4e5104e7c9d9b5623cab322689b520e28b788a0e6fc52d795ef24e246f72ada9be6aae7d4904e34e4a6f2b6dc94abb3ed70b338d89985ed2164 WHIRLPOOL 7e2916b62811b79d80ac03cbe96b1c2fb32ba64747e93e5913931a7c10efb5560d9cfb81d5c4c953d0894f97382ceb62a264ab627b123c9323a03b0e9591a7d1
 DIST automake-1.15.tar.xz 1496708 SHA256 9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636 SHA512 200a13f49a3f492ed27bc2eb615aa2f47e775e470a781f6821cd43e0f7b927d091e690b4a23fe5cc8fa79c48daaa9436be4b968784696c3bdbf1634b456cda47 WHIRLPOOL 5c7878f46fd3d0104b5fa6a17f985d5cb57ac4a1c956763953acce411756a94b3e8e3b5a701f28c0a4b8c3cd60d60ab34561ae88706e6ccc54f0d76e1174502c
-EBUILD automake-1.15-r2.ebuild 2836 SHA256 0564efe4ffdb7497a7609df5d513855e1d67bc5652679265b131168d83e2900d SHA512 a645603a1871a58168172a7f5dfdc0d196bb1f98bdc22c6d9555663068a7d3ceb3614c66d1cfb9a102e201d3559155e80db4db26bcadaf7d7e43c4e5ada2d54f WHIRLPOOL 43fccefbe645d5a15f21b564cf0feaf4827d5ffac48d3082eee3dd72867c1825c87f6248763b87a8e2603d3daf3aefaca06b300ddaa2b9e1ba0100e26041245b
+EBUILD automake-1.15-r2.ebuild 2873 SHA256 bffd0db626bbd0199d78d4c072792fafe0c04efb243fc1402d70014513ba2f2b SHA512 ee412fcd75de00e06999eb460164f879bec96aa4a1eedea4f301b509a4c54283b1929f813e4851f28fea851bea639b6072cea84941bb4e8499ad8499b0e0f9c1 WHIRLPOOL d060aa5100ba580a606ada25cd3c3dd92d3e19a1a8963a8e251ffa7f41b826d7cffbe271bfb1bdeffdc914c2fa044222b3a0f6c2dee8b5372a4cbe5797335c3d
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild b/sys-devel/automake/automake-1.15-r2.ebuild
index 9b47c67..af9496d 100644
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -43,11 +43,11 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF} HELP2MAN=true
 }
 
 src_compile() {
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
+	emake APIVERSION="${SLOT}" pkgvdatadir="${EPREFIX}/usr/share/${PN}-${SLOT}"
 }
 
 src_test() {
@@ -57,7 +57,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${D}"/usr/share/info >/dev/null
+	pushd "${ED}"/usr/share/info >/dev/null
 	rm -f dir
 
 	# Rewrite all the references to other pages.
@@ -85,15 +85,15 @@ slot_info_pages() {
 
 src_install() {
 	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
+		APIVERSION="${SLOT}" pkgvdatadir="${EPREFIX}/usr/share/${PN}-${SLOT}"
 	slot_info_pages
-	rm "${D}"/usr/share/aclocal/README || die
-	rmdir "${D}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 
 	rm \
-		"${D}"/usr/bin/{aclocal,automake} \
-		"${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version