dev-vcs/git: set PERL_PATH variable.

The rational for this change is that git on Gentoo/FreeBSD doesn't build
properly when this variable is unset. After chatting to floppym on the
gentoo-dev channel, here's what he found out in git-instaweb's Makefile:

Define PERL_PATH to the path of your Perl binary (usually /usr/bin/perl).

Package-Manager: Portage-2.3.13, Repoman-2.3.4
Closes: https://github.com/gentoo/gentoo/pull/6849

diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
index 81e7734629c8544f9eebc7231c62b01a29e6d246..3f4dab26bde88281a385f485a8c827381674c320 100644 (file)
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -280,7 +280,6 @@ src_prepare() {
 }
 
 git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
        # bug #320647: PYTHON_PATH
        PYTHON_PATH=""
        use python && PYTHON_PATH="${PYTHON}"
@@ -294,13 +293,12 @@ git_emake() {
                htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                sysconfdir="${EPREFIX}"/etc \
                PYTHON_PATH="${PYTHON_PATH}" \
+               PERL_PATH="${EPREFIX}/usr/bin/perl" \
                PERL_MM_OPT="" \
                GIT_TEST_OPTS="--no-color" \
                V=1 \
                "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+
 }
 
 src_configure() {

diff --git a/dev-vcs/git/git-2.14.3.ebuild b/dev-vcs/git/git-2.14.3.ebuild
index d079a65a75eb5b6883f235a8e88d6d6bf66cf43f..fde79e887f8a2d4b548c75392986ed9d63862a5e 100644 (file)
--- a/dev-vcs/git/git-2.14.3.ebuild
+++ b/dev-vcs/git/git-2.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
        # bug #320647: PYTHON_PATH
        PYTHON_PATH=""
        use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
                htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                sysconfdir="${EPREFIX}"/etc \
                PYTHON_PATH="${PYTHON_PATH}" \
+               PERL_PATH="${EPREFIX}/usr/bin/perl" \
                PERL_MM_OPT="" \
                GIT_TEST_OPTS="--no-color" \
                V=1 \
                "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {

diff --git a/dev-vcs/git/git-2.15.1.ebuild b/dev-vcs/git/git-2.15.1.ebuild
index 3f45eb3ef445a280a37fb5598b5c54d89fd3c571..d3e89d0092f72e1a9f90825a979d83b8cceacea8 100644 (file)
--- a/dev-vcs/git/git-2.15.1.ebuild
+++ b/dev-vcs/git/git-2.15.1.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
        # bug #320647: PYTHON_PATH
        PYTHON_PATH=""
        use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
                htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                sysconfdir="${EPREFIX}"/etc \
                PYTHON_PATH="${PYTHON_PATH}" \
+               PERL_PATH="${EPREFIX}/usr/bin/perl" \
                PERL_MM_OPT="" \
                GIT_TEST_OPTS="--no-color" \
                V=1 \
                "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {

diff --git a/dev-vcs/git/git-2.16.0_rc2.ebuild b/dev-vcs/git/git-2.16.0_rc2.ebuild
index 3f45eb3ef445a280a37fb5598b5c54d89fd3c571..d3e89d0092f72e1a9f90825a979d83b8cceacea8 100644 (file)
--- a/dev-vcs/git/git-2.16.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.16.0_rc2.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
        # bug #320647: PYTHON_PATH
        PYTHON_PATH=""
        use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
                htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                sysconfdir="${EPREFIX}"/etc \
                PYTHON_PATH="${PYTHON_PATH}" \
+               PERL_PATH="${EPREFIX}/usr/bin/perl" \
                PERL_MM_OPT="" \
                GIT_TEST_OPTS="--no-color" \
                V=1 \
                "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 3f45eb3ef445a280a37fb5598b5c54d89fd3c571..d3e89d0092f72e1a9f90825a979d83b8cceacea8 100644 (file)
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
        # bug #320647: PYTHON_PATH
        PYTHON_PATH=""
        use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
                htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                sysconfdir="${EPREFIX}"/etc \
                PYTHON_PATH="${PYTHON_PATH}" \
+               PERL_PATH="${EPREFIX}/usr/bin/perl" \
                PERL_MM_OPT="" \
                GIT_TEST_OPTS="--no-color" \
                V=1 \
                "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 3f45eb3ef445a280a37fb5598b5c54d89fd3c571..d3e89d0092f72e1a9f90825a979d83b8cceacea8 100644 (file)
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
        # bug #320647: PYTHON_PATH
        PYTHON_PATH=""
        use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
                htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                sysconfdir="${EPREFIX}"/etc \
                PYTHON_PATH="${PYTHON_PATH}" \
+               PERL_PATH="${EPREFIX}/usr/bin/perl" \
                PERL_MM_OPT="" \
                GIT_TEST_OPTS="--no-color" \
                V=1 \
                "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 3f45eb3ef445a280a37fb5598b5c54d89fd3c571..d3e89d0092f72e1a9f90825a979d83b8cceacea8 100644 (file)
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
        # bug #320647: PYTHON_PATH
        PYTHON_PATH=""
        use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
                htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                sysconfdir="${EPREFIX}"/etc \
                PYTHON_PATH="${PYTHON_PATH}" \
+               PERL_PATH="${EPREFIX}/usr/bin/perl" \
                PERL_MM_OPT="" \
                GIT_TEST_OPTS="--no-color" \
                V=1 \
                "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 3f45eb3ef445a280a37fb5598b5c54d89fd3c571..d3e89d0092f72e1a9f90825a979d83b8cceacea8 100644 (file)
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
        # bug #320647: PYTHON_PATH
        PYTHON_PATH=""
        use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
                htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                sysconfdir="${EPREFIX}"/etc \
                PYTHON_PATH="${PYTHON_PATH}" \
+               PERL_PATH="${EPREFIX}/usr/bin/perl" \
                PERL_MM_OPT="" \
                GIT_TEST_OPTS="--no-color" \
                V=1 \
                "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {