commit:     5d62a004d49d9b106979621cff790491358cdefa
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 17:29:05 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri May 13 17:40:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d62a004

sys-devel/automake: rework how HELP2MAN is set up #582734

Only the 1.11 release used this variable -- later versions bundle a copy
and use that rather than the system one.  Move the export to prepare so
the configure function stays the same across versions.

 sys-devel/automake/automake-1.11.6-r2.ebuild | 3 ++-
 sys-devel/automake/automake-1.12.6-r1.ebuild | 2 +-
 sys-devel/automake/automake-1.12.6.ebuild    | 2 +-
 sys-devel/automake/automake-1.13.4-r1.ebuild | 2 +-
 sys-devel/automake/automake-1.13.4.ebuild    | 2 +-
 sys-devel/automake/automake-1.14.1-r1.ebuild | 2 +-
 sys-devel/automake/automake-1.14.1.ebuild    | 2 +-
 sys-devel/automake/automake-1.15-r1.ebuild   | 2 +-
 sys-devel/automake/automake-1.15-r2.ebuild   | 2 +-
 sys-devel/automake/automake-1.15.ebuild      | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sys-devel/automake/automake-1.11.6-r2.ebuild 
b/sys-devel/automake/automake-1.11.6-r2.ebuild
index cd44869..d6ead6f 100644
--- a/sys-devel/automake/automake-1.11.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r2.ebuild
@@ -28,10 +28,11 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
        epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch
        chmod a+rx tests/*.test
+       export HELP2MAN=true
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.12.6-r1.ebuild 
b/sys-devel/automake/automake-1.12.6-r1.ebuild
index 70eee07..f9c1334 100644
--- a/sys-devel/automake/automake-1.12.6-r1.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r1.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.12.6.ebuild 
b/sys-devel/automake/automake-1.12.6.ebuild
index 55e7c66..06a25a3 100644
--- a/sys-devel/automake/automake-1.12.6.ebuild
+++ b/sys-devel/automake/automake-1.12.6.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.13.4-r1.ebuild 
b/sys-devel/automake/automake-1.13.4-r1.ebuild
index 8f515d2..6e12d60 100644
--- a/sys-devel/automake/automake-1.13.4-r1.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r1.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.13.4.ebuild 
b/sys-devel/automake/automake-1.13.4.ebuild
index 597591f..57f143b 100644
--- a/sys-devel/automake/automake-1.13.4.ebuild
+++ b/sys-devel/automake/automake-1.13.4.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.14.1-r1.ebuild 
b/sys-devel/automake/automake-1.14.1-r1.ebuild
index add59cb..b1e9964 100644
--- a/sys-devel/automake/automake-1.14.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r1.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.14.1.ebuild 
b/sys-devel/automake/automake-1.14.1.ebuild
index 6f8a8ec..3d5a958 100644
--- a/sys-devel/automake/automake-1.14.1.ebuild
+++ b/sys-devel/automake/automake-1.14.1.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.15-r1.ebuild 
b/sys-devel/automake/automake-1.15-r1.ebuild
index add59cb..b1e9964 100644
--- a/sys-devel/automake/automake-1.15-r1.ebuild
+++ b/sys-devel/automake/automake-1.15-r1.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild 
b/sys-devel/automake/automake-1.15-r2.ebuild
index 9b47c67..8e77497 100644
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

diff --git a/sys-devel/automake/automake-1.15.ebuild 
b/sys-devel/automake/automake-1.15.ebuild
index 6f8a8ec..3d5a958 100644
--- a/sys-devel/automake/automake-1.15.ebuild
+++ b/sys-devel/automake/automake-1.15.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {

Reply via email to