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.

diff --git a/sys-devel/automake/automake-1.11.6-r2.ebuild b/sys-devel/automake/automake-1.11.6-r2.ebuild
index cd44869359e87473343c28d49dc6f2ea1dfcbaa9..d6ead6fe036d50f97969d41659e7fb051b10bc96 100644 (file)
--- 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 70eee071acd4ff1ae351e2b9138af9ae128a79c8..f9c1334ce991baff9e7e0e9540ed286dd136cd21 100644 (file)
--- 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 55e7c667807d52f9811c16eaf54c8a4b51a832f8..06a25a3e8519bf9de8c62d03e7755830addb75d7 100644 (file)
--- 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 8f515d2cef9e5215497ad16af8da1c7355102d1c..6e12d6022d21fba7d3fc35ab5a9d23d2b99b8e3a 100644 (file)
--- 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 597591fd716985ca0c6e661d5a9c6dd740859a7a..57f143ba8ad2788676c6e02ed7cd901679bacde7 100644 (file)
--- 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 add59cb2756d1917652351d89a96411abc22438c..b1e9964ae94c59161883cf016a21c7b53ed502d3 100644 (file)
--- 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 6f8a8ecdb2dba531843910365c4d0edfae69fc46..3d5a9585f03c11a2ad37652344179c92fcc1a2e9 100644 (file)
--- 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 add59cb2756d1917652351d89a96411abc22438c..b1e9964ae94c59161883cf016a21c7b53ed502d3 100644 (file)
--- 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 9b47c6764c2405979f19d0954e43b2a8471e0457..8e774977cae5fd90384c5064748543c6bd6107f6 100644 (file)
--- 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 6f8a8ecdb2dba531843910365c4d0edfae69fc46..3d5a9585f03c11a2ad37652344179c92fcc1a2e9 100644 (file)
--- 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() {