| 1 |
commit: bfd107bdb1af60be1f7541c2adc7ef03ba7e71ef |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 3 15:36:30 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 3 15:36:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd107bd |
| 7 |
|
| 8 |
dev-vcs/git: Added python3 to PYTHON_COMPAT in live ebuilds. |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/677518 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-vcs/git/git-9999-r1.ebuild | 2 +- |
| 15 |
dev-vcs/git/git-9999-r2.ebuild | 2 +- |
| 16 |
dev-vcs/git/git-9999-r3.ebuild | 2 +- |
| 17 |
dev-vcs/git/git-9999.ebuild | 5 +---- |
| 18 |
4 files changed, 4 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 21 |
index ad2cb1dae85..882ac65deae 100644 |
| 22 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 23 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 24 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 25 |
GENTOO_DEPEND_ON_PERL=no |
| 26 |
|
| 27 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 28 |
-PYTHON_COMPAT=( python2_7 ) |
| 29 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) |
| 30 |
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" |
| 31 |
if [[ ${PV} == *9999 ]]; then |
| 32 |
SCM="git-r3" |
| 33 |
|
| 34 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 35 |
index ad2cb1dae85..882ac65deae 100644 |
| 36 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 37 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 38 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 39 |
GENTOO_DEPEND_ON_PERL=no |
| 40 |
|
| 41 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 42 |
-PYTHON_COMPAT=( python2_7 ) |
| 43 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) |
| 44 |
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" |
| 45 |
if [[ ${PV} == *9999 ]]; then |
| 46 |
SCM="git-r3" |
| 47 |
|
| 48 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 49 |
index ad2cb1dae85..882ac65deae 100644 |
| 50 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 51 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 52 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 53 |
GENTOO_DEPEND_ON_PERL=no |
| 54 |
|
| 55 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 56 |
-PYTHON_COMPAT=( python2_7 ) |
| 57 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) |
| 58 |
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" |
| 59 |
if [[ ${PV} == *9999 ]]; then |
| 60 |
SCM="git-r3" |
| 61 |
|
| 62 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 63 |
index f9e6cd3fae0..882ac65deae 100644 |
| 64 |
--- a/dev-vcs/git/git-9999.ebuild |
| 65 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 66 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 67 |
GENTOO_DEPEND_ON_PERL=no |
| 68 |
|
| 69 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 70 |
-PYTHON_COMPAT=( python2_7 ) |
| 71 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) |
| 72 |
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" |
| 73 |
if [[ ${PV} == *9999 ]]; then |
| 74 |
SCM="git-r3" |
| 75 |
@@ -140,9 +140,6 @@ PATCHES=( |
| 76 |
"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch |
| 77 |
|
| 78 |
"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 79 |
- |
| 80 |
- # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. |
| 81 |
- "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 82 |
) |
| 83 |
|
| 84 |
pkg_setup() { |
Archives