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

2016-05-22 Thread Benda XU
commit: f6674a7e56d207841f3524a2d856941cbd0ce43d
Author: Benda Xu  gentoo  org>
AuthorDate: Thu May 12 02:56:19 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 12 02:56:19 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=f6674a7e

sys-devel/automake: bump to EAPI=6.

 sys-devel/automake/automake-1.15-r2.ebuild | 22 +-
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild 
b/sys-devel/automake/automake-1.15-r2.ebuild
index af9496d..24fbb57 100644
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="6"
 
-inherit eutils versionator
+inherit versionator
 
 if [[ ${PV/_beta} == ${PV} ]]; then
MY_P=${P}
@@ -36,19 +36,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-   export WANT_AUTOCONF=2.5
-   epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
-   epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492
-}
-
-src_configure() {
-   econf --docdir="${EPREFIX}"/usr/share/doc/${PF} HELP2MAN=true
-}
-
-src_compile() {
-   emake APIVERSION="${SLOT}" 
pkgvdatadir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
+ "${FILESDIR}"/${PN}-1.15-mdate-tz.patch ) #520818 #574492
 
 src_test() {
emake check
@@ -84,8 +73,7 @@ slot_info_pages() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" install \
-   APIVERSION="${SLOT}" 
pkgvdatadir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+   emake DESTDIR="${D}" install
slot_info_pages
rm "${ED}"/usr/share/aclocal/README || die
rmdir "${ED}"/usr/share/aclocal || die



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

2016-05-22 Thread Benda XU
commit: 70c6024ef610c1bc99b8afe0eeefe71522bc7915
Author: Benda Xu  gentoo  org>
AuthorDate: Fri May 13 03:12:10 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri May 13 03:12:10 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=70c6024e

sys-devel/automake: gentoo docdir convention.

 sys-devel/automake/Manifest| 2 +-
 sys-devel/automake/automake-1.15-r2.ebuild | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 245d809..1fbdd89 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 2593 SHA256 
466fd5dbe32a4fca045debfd116ccc27b0e4793348b35e34a4b1b0018f57cf5a SHA512 
562efcba3fa32c8f288a1c4c7ceaeb7c6c5291c2c1b1f05b177c42c7dba3788507cad57648e37cacb0d21e8ac24752fa5495b08475d309b3667ce8a4898babe4
 WHIRLPOOL 
e37912e8377b7395036485424bdd0034bba65a2ae926de5e1b189455063f4f26f6dc3471088d757c5bd9706eedceb05db9ce65fd062a7f7e335f14245c15bbfd
+EBUILD automake-1.15-r2.ebuild 2658 SHA256 
4a2063c9f9b7f378e25a4db2551c34ab75f3016f520305801043f3e0602c020b SHA512 
2a9534fdd3065109957e37ffa6451b4c0601de2b76ac94571eb3c6f0ad0097d283a0fccfdb61df93c7ecadb789b75ac2fbc9b6a77413c7b0c9065c0eca809a64
 WHIRLPOOL 
b94bab7ca73c8df38b528fbe536671393ce9a5fd89f6d60dc9fb410e520689ccf125f27d41241b111c3be6aa9eaa22f1f8a140ec9237be4144c7a1463c560d55
 MISC metadata.xml 253 SHA256 
d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 
54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef1
 WHIRLPOOL 
e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild 
b/sys-devel/automake/automake-1.15-r2.ebuild
index eb10200..f4349c2 100644
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -41,6 +41,10 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492
 }
 
+src_configure() {
+   econf --docdir="\$(datarootdir)/doc/${PF}"
+}
+
 src_test() {
emake check
 }



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

2016-05-22 Thread Benda XU
commit: 8fd750e2bab0f77ec886aa817aed94ecc57a3b79
Author: Benda Xu  gentoo  org>
AuthorDate: Thu May 19 03:09:24 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 19 03:09:24 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=8fd750e2

sys-devel/automake: merged.

 sys-devel/automake/Manifest|  5 --
 sys-devel/automake/automake-1.15-r2.ebuild | 98 --
 .../automake/files/automake-1.15-mdate-tz.patch| 53 
 .../automake-1.15-perl-escape-curly-bracket.patch  | 37 
 sys-devel/automake/metadata.xml|  8 --
 5 files changed, 201 deletions(-)

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
deleted file mode 100644
index 1fbdd89..000
--- a/sys-devel/automake/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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 2658 SHA256 
4a2063c9f9b7f378e25a4db2551c34ab75f3016f520305801043f3e0602c020b SHA512 
2a9534fdd3065109957e37ffa6451b4c0601de2b76ac94571eb3c6f0ad0097d283a0fccfdb61df93c7ecadb789b75ac2fbc9b6a77413c7b0c9065c0eca809a64
 WHIRLPOOL 
b94bab7ca73c8df38b528fbe536671393ce9a5fd89f6d60dc9fb410e520689ccf125f27d41241b111c3be6aa9eaa22f1f8a140ec9237be4144c7a1463c560d55
-MISC metadata.xml 253 SHA256 
d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 
54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef1
 WHIRLPOOL 
e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild 
b/sys-devel/automake/automake-1.15-r2.ebuild
deleted file mode 100644
index f4349c2..000
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils versionator
-
-if [[ ${PV/_beta} == ${PV} ]]; then
-   MY_P=${P}
-   SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-   ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
-else
-   MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-   MY_P="${PN}-${MY_PV}"
-
-   # Alpha/beta releases are not distributed on the usual mirrors.
-   SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/";
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-   >=sys-devel/automake-wrapper-10
-   >=sys-devel/autoconf-2.69
-   sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-   sys-apps/help2man"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
-   epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492
-}
-
-src_configure() {
-   econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
-src_test() {
-   emake check
-}
-
-# 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 "${ED}"/usr/share/info >/dev/null
-   rm -f dir
-
-   # Rewrite all the references to other pages.
-   # before: * aclocal-invocation: (automake)aclocal Invocation.   
Generating aclocal.m4.
-   # after:  * aclocal-invocation v1.13: (automake-1.13)aclocal 
Invocation.   Generating aclocal.m4.
-   local p pages=( *.info ) args=()
-   for p in "${page

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

2016-05-22 Thread Benda XU
commit: b50d7da673b5ec90ec2c0be2c36c742e64c88622
Author: Benda Xu  gentoo  org>
AuthorDate: Thu May 12 04:16:35 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 12 04:16:35 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=b50d7da6

sys-devel/automake: revert back to EAPI5

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

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index bc8b16e..245d809 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 2565 SHA256 
5231e9bd4ff1a83fa51cabd1f5b1cfe46e99ba261b840b3983736f2a78cc9249 SHA512 
f9e69a7495f1571d0a3589736d3d1a87a4b670eb83ef9e1912808221954f8972753fb5a16ddeea46fcc672bc115be1dcc0205a22e8e9084e02b848a3cf2341ac
 WHIRLPOOL 
a0c865e2578a600d29f55e7564d360e2d06e32bd56d5e654c4fbd65b8524de60e923a6a876b949780a70cdc1c9235a1ca9e957f9d7254e318621a54d46da
+EBUILD automake-1.15-r2.ebuild 2593 SHA256 
466fd5dbe32a4fca045debfd116ccc27b0e4793348b35e34a4b1b0018f57cf5a SHA512 
562efcba3fa32c8f288a1c4c7ceaeb7c6c5291c2c1b1f05b177c42c7dba3788507cad57648e37cacb0d21e8ac24752fa5495b08475d309b3667ce8a4898babe4
 WHIRLPOOL 
e37912e8377b7395036485424bdd0034bba65a2ae926de5e1b189455063f4f26f6dc3471088d757c5bd9706eedceb05db9ce65fd062a7f7e335f14245c15bbfd
 MISC metadata.xml 253 SHA256 
d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 
54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef1
 WHIRLPOOL 
e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild 
b/sys-devel/automake/automake-1.15-r2.ebuild
index 8b70104..eb10200 100644
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI="5"
 
-inherit versionator
+inherit eutils versionator
 
 if [[ ${PV/_beta} == ${PV} ]]; then
MY_P=${P}
@@ -36,8 +36,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
-   "${FILESDIR}"/${PN}-1.15-mdate-tz.patch ) #520818 #574492
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
+   epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492
+}
 
 src_test() {
emake check



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

2016-05-22 Thread Benda XU
commit: 99440f509777c33970cb3f02e4bfa38bcba7e707
Author: Benda Xu  gentoo  org>
AuthorDate: Thu May 12 03:01:54 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 12 03:02:25 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=99440f50

sys-devel/automake: fix indentation

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

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index aad7d0a..bc8b16e 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 2873 SHA256 
bffd0db626bbd0199d78d4c072792fafe0c04efb243fc1402d70014513ba2f2b SHA512 
ee412fcd75de00e06999eb460164f879bec96aa4a1eedea4f301b509a4c54283b1929f813e4851f28fea851bea639b6072cea84941bb4e8499ad8499b0e0f9c1
 WHIRLPOOL 
d060aa5100ba580a606ada25cd3c3dd92d3e19a1a8963a8e251ffa7f41b826d7cffbe271bfb1bdeffdc914c2fa044222b3a0f6c2dee8b5372a4cbe5797335c3d
+EBUILD automake-1.15-r2.ebuild 2565 SHA256 
5231e9bd4ff1a83fa51cabd1f5b1cfe46e99ba261b840b3983736f2a78cc9249 SHA512 
f9e69a7495f1571d0a3589736d3d1a87a4b670eb83ef9e1912808221954f8972753fb5a16ddeea46fcc672bc115be1dcc0205a22e8e9084e02b848a3cf2341ac
 WHIRLPOOL 
a0c865e2578a600d29f55e7564d360e2d06e32bd56d5e654c4fbd65b8524de60e923a6a876b949780a70cdc1c9235a1ca9e957f9d7254e318621a54d46da
 MISC metadata.xml 253 SHA256 
d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 
54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef1
 WHIRLPOOL 
e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild 
b/sys-devel/automake/automake-1.15-r2.ebuild
index 24fbb57..8b70104 100644
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
- "${FILESDIR}"/${PN}-1.15-mdate-tz.patch ) #520818 #574492
+   "${FILESDIR}"/${PN}-1.15-mdate-tz.patch ) #520818 #574492
 
 src_test() {
emake check



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

2016-05-22 Thread Benda XU
commit: 6e477e6e880e9aa1161b0d01085b869e6176d0aa
Author: Benda Xu  gentoo  org>
AuthorDate: Wed May 11 08:55:40 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed May 11 08:55:40 2016 +
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 
54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef1
 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