| 1 |
commit: c673770d67a67a83f41fb1eddc9e29726b22bb33 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 18 21:52:51 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 18 22:01:15 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c673770d |
| 7 |
|
| 8 |
dev-lang/python: Ensure python-config & .pc ABI symlinks, idle wrapping |
| 9 |
|
| 10 |
Fix the pythonX.Y-config symlink creation to be only applied when |
| 11 |
ABIFLAGS are not empty, and add additional python-X.Ym.pc symlink for |
| 12 |
pkg-config. Make both official as they are created as part of regular |
| 13 |
upstream 'make install' (but not 'make altinstall' used by Gentoo). |
| 14 |
|
| 15 |
Install python-exec wrapping symlink for the idle executable when USE=tk |
| 16 |
is enabled. |
| 17 |
|
| 18 |
.../{python-2.7.10-r4.ebuild => python-2.7.10-r5.ebuild} | 5 +++++ |
| 19 |
.../{python-2.7.11.ebuild => python-2.7.11-r1.ebuild} | 5 +++++ |
| 20 |
.../{python-3.3.5-r5.ebuild => python-3.3.5-r6.ebuild} | 15 ++++++++++----- |
| 21 |
.../{python-3.4.3-r5.ebuild => python-3.4.3-r6.ebuild} | 15 ++++++++++----- |
| 22 |
.../{python-3.5.0-r4.ebuild => python-3.5.0-r5.ebuild} | 15 ++++++++++----- |
| 23 |
.../{python-3.5.1.ebuild => python-3.5.1-r1.ebuild} | 15 ++++++++++----- |
| 24 |
6 files changed, 50 insertions(+), 20 deletions(-) |
| 25 |
|
| 26 |
diff --git a/dev-lang/python/python-2.7.10-r4.ebuild b/dev-lang/python/python-2.7.10-r5.ebuild |
| 27 |
similarity index 99% |
| 28 |
rename from dev-lang/python/python-2.7.10-r4.ebuild |
| 29 |
rename to dev-lang/python/python-2.7.10-r5.ebuild |
| 30 |
index ee52958..e4d9824 100644 |
| 31 |
--- a/dev-lang/python/python-2.7.10-r4.ebuild |
| 32 |
+++ b/dev-lang/python/python-2.7.10-r5.ebuild |
| 33 |
@@ -337,6 +337,11 @@ src_install() { |
| 34 |
"${D}${PYTHON_SCRIPTDIR}/2to3" || die |
| 35 |
ln -s "../../../bin/pydoc${SLOT}" \ |
| 36 |
"${D}${PYTHON_SCRIPTDIR}/pydoc" || die |
| 37 |
+ # idle |
| 38 |
+ if use tk; then |
| 39 |
+ ln -s "../../../bin/idle${PYVER}" \ |
| 40 |
+ "${D}${PYTHON_SCRIPTDIR}/idle" || die |
| 41 |
+ fi |
| 42 |
} |
| 43 |
|
| 44 |
pkg_preinst() { |
| 45 |
|
| 46 |
diff --git a/dev-lang/python/python-2.7.11.ebuild b/dev-lang/python/python-2.7.11-r1.ebuild |
| 47 |
similarity index 99% |
| 48 |
rename from dev-lang/python/python-2.7.11.ebuild |
| 49 |
rename to dev-lang/python/python-2.7.11-r1.ebuild |
| 50 |
index f3113c6..3cf1079 100644 |
| 51 |
--- a/dev-lang/python/python-2.7.11.ebuild |
| 52 |
+++ b/dev-lang/python/python-2.7.11-r1.ebuild |
| 53 |
@@ -338,6 +338,11 @@ src_install() { |
| 54 |
"${D}${PYTHON_SCRIPTDIR}/2to3" || die |
| 55 |
ln -s "../../../bin/pydoc${SLOT}" \ |
| 56 |
"${D}${PYTHON_SCRIPTDIR}/pydoc" || die |
| 57 |
+ # idle |
| 58 |
+ if use tk; then |
| 59 |
+ ln -s "../../../bin/idle${PYVER}" \ |
| 60 |
+ "${D}${PYTHON_SCRIPTDIR}/idle" || die |
| 61 |
+ fi |
| 62 |
} |
| 63 |
|
| 64 |
pkg_preinst() { |
| 65 |
|
| 66 |
diff --git a/dev-lang/python/python-3.3.5-r5.ebuild b/dev-lang/python/python-3.3.5-r6.ebuild |
| 67 |
similarity index 96% |
| 68 |
rename from dev-lang/python/python-3.3.5-r5.ebuild |
| 69 |
rename to dev-lang/python/python-3.3.5-r6.ebuild |
| 70 |
index eac97ee..a85ba3c 100644 |
| 71 |
--- a/dev-lang/python/python-3.3.5-r5.ebuild |
| 72 |
+++ b/dev-lang/python/python-3.3.5-r6.ebuild |
| 73 |
@@ -254,10 +254,14 @@ src_install() { |
| 74 |
|
| 75 |
# Cheap hack to get version with ABIFLAGS |
| 76 |
local abiver=$(cd "${ED}usr/include"; echo python*) |
| 77 |
- # Replace python3.X with a symlink if appropriate |
| 78 |
if [[ ${abiver} != python${PYVER} ]]; then |
| 79 |
+ # Replace python3.X with a symlink to python3.Xm |
| 80 |
rm "${ED}usr/bin/python${PYVER}" || die |
| 81 |
dosym "${abiver}" "/usr/bin/python${PYVER}" |
| 82 |
+ # Create python3.X-config symlink |
| 83 |
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" |
| 84 |
+ # Create python-3.5m.pc symlink |
| 85 |
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" |
| 86 |
fi |
| 87 |
|
| 88 |
if use build; then |
| 89 |
@@ -325,10 +329,11 @@ src_install() { |
| 90 |
"${D}${PYTHON_SCRIPTDIR}/pydoc" || die |
| 91 |
ln -s "../../../bin/pyvenv-${PYVER}" \ |
| 92 |
"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die |
| 93 |
- |
| 94 |
- # Compatibility link for stuff that calls ${PYTHON}-config |
| 95 |
- # Remove this when all revdeps have been fixed to not do that. |
| 96 |
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" |
| 97 |
+ # idle |
| 98 |
+ if use tk; then |
| 99 |
+ ln -s "../../../bin/idle${PYVER}" \ |
| 100 |
+ "${D}${PYTHON_SCRIPTDIR}/idle" || die |
| 101 |
+ fi |
| 102 |
} |
| 103 |
|
| 104 |
pkg_preinst() { |
| 105 |
|
| 106 |
diff --git a/dev-lang/python/python-3.4.3-r5.ebuild b/dev-lang/python/python-3.4.3-r6.ebuild |
| 107 |
similarity index 96% |
| 108 |
rename from dev-lang/python/python-3.4.3-r5.ebuild |
| 109 |
rename to dev-lang/python/python-3.4.3-r6.ebuild |
| 110 |
index ecdb23d..98549fa 100644 |
| 111 |
--- a/dev-lang/python/python-3.4.3-r5.ebuild |
| 112 |
+++ b/dev-lang/python/python-3.4.3-r6.ebuild |
| 113 |
@@ -241,10 +241,14 @@ src_install() { |
| 114 |
|
| 115 |
# Cheap hack to get version with ABIFLAGS |
| 116 |
local abiver=$(cd "${ED}usr/include"; echo python*) |
| 117 |
- # Replace python3.X with a symlink if appropriate |
| 118 |
if [[ ${abiver} != python${PYVER} ]]; then |
| 119 |
+ # Replace python3.X with a symlink to python3.Xm |
| 120 |
rm "${ED}usr/bin/python${PYVER}" || die |
| 121 |
dosym "${abiver}" "/usr/bin/python${PYVER}" |
| 122 |
+ # Create python3.X-config symlink |
| 123 |
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" |
| 124 |
+ # Create python-3.5m.pc symlink |
| 125 |
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" |
| 126 |
fi |
| 127 |
|
| 128 |
use elibc_uclibc && rm -fr "${libdir}/test" |
| 129 |
@@ -308,10 +312,11 @@ src_install() { |
| 130 |
"${D}${PYTHON_SCRIPTDIR}/pydoc" || die |
| 131 |
ln -s "../../../bin/pyvenv-${PYVER}" \ |
| 132 |
"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die |
| 133 |
- |
| 134 |
- # Compatibility link for stuff that calls ${PYTHON}-config |
| 135 |
- # Remove this when all revdeps have been fixed to not do that. |
| 136 |
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" |
| 137 |
+ # idle |
| 138 |
+ if use tk; then |
| 139 |
+ ln -s "../../../bin/idle${PYVER}" \ |
| 140 |
+ "${D}${PYTHON_SCRIPTDIR}/idle" || die |
| 141 |
+ fi |
| 142 |
} |
| 143 |
|
| 144 |
pkg_preinst() { |
| 145 |
|
| 146 |
diff --git a/dev-lang/python/python-3.5.0-r4.ebuild b/dev-lang/python/python-3.5.0-r5.ebuild |
| 147 |
similarity index 96% |
| 148 |
rename from dev-lang/python/python-3.5.0-r4.ebuild |
| 149 |
rename to dev-lang/python/python-3.5.0-r5.ebuild |
| 150 |
index df51c60..2ed9898 100644 |
| 151 |
--- a/dev-lang/python/python-3.5.0-r4.ebuild |
| 152 |
+++ b/dev-lang/python/python-3.5.0-r5.ebuild |
| 153 |
@@ -244,10 +244,14 @@ src_install() { |
| 154 |
|
| 155 |
# Cheap hack to get version with ABIFLAGS |
| 156 |
local abiver=$(cd "${ED}usr/include"; echo python*) |
| 157 |
- # Replace python3.X with a symlink if appropriate |
| 158 |
if [[ ${abiver} != python${PYVER} ]]; then |
| 159 |
+ # Replace python3.X with a symlink to python3.Xm |
| 160 |
rm "${ED}usr/bin/python${PYVER}" || die |
| 161 |
dosym "${abiver}" "/usr/bin/python${PYVER}" |
| 162 |
+ # Create python3.X-config symlink |
| 163 |
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" |
| 164 |
+ # Create python-3.5m.pc symlink |
| 165 |
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" |
| 166 |
fi |
| 167 |
|
| 168 |
use elibc_uclibc && rm -fr "${libdir}/test" |
| 169 |
@@ -311,10 +315,11 @@ src_install() { |
| 170 |
"${D}${PYTHON_SCRIPTDIR}/pydoc" || die |
| 171 |
ln -s "../../../bin/pyvenv-${PYVER}" \ |
| 172 |
"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die |
| 173 |
- |
| 174 |
- # Compatibility link for stuff that calls ${PYTHON}-config |
| 175 |
- # Remove this when all revdeps have been fixed to not do that. |
| 176 |
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" |
| 177 |
+ # idle |
| 178 |
+ if use tk; then |
| 179 |
+ ln -s "../../../bin/idle${PYVER}" \ |
| 180 |
+ "${D}${PYTHON_SCRIPTDIR}/idle" || die |
| 181 |
+ fi |
| 182 |
} |
| 183 |
|
| 184 |
pkg_preinst() { |
| 185 |
|
| 186 |
diff --git a/dev-lang/python/python-3.5.1.ebuild b/dev-lang/python/python-3.5.1-r1.ebuild |
| 187 |
similarity index 96% |
| 188 |
rename from dev-lang/python/python-3.5.1.ebuild |
| 189 |
rename to dev-lang/python/python-3.5.1-r1.ebuild |
| 190 |
index cce4c7d..ef7c58e 100644 |
| 191 |
--- a/dev-lang/python/python-3.5.1.ebuild |
| 192 |
+++ b/dev-lang/python/python-3.5.1-r1.ebuild |
| 193 |
@@ -244,10 +244,14 @@ src_install() { |
| 194 |
|
| 195 |
# Cheap hack to get version with ABIFLAGS |
| 196 |
local abiver=$(cd "${ED}usr/include"; echo python*) |
| 197 |
- # Replace python3.X with a symlink if appropriate |
| 198 |
if [[ ${abiver} != python${PYVER} ]]; then |
| 199 |
+ # Replace python3.X with a symlink to python3.Xm |
| 200 |
rm "${ED}usr/bin/python${PYVER}" || die |
| 201 |
dosym "${abiver}" "/usr/bin/python${PYVER}" |
| 202 |
+ # Create python3.X-config symlink |
| 203 |
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" |
| 204 |
+ # Create python-3.5m.pc symlink |
| 205 |
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" |
| 206 |
fi |
| 207 |
|
| 208 |
use elibc_uclibc && rm -fr "${libdir}/test" |
| 209 |
@@ -311,10 +315,11 @@ src_install() { |
| 210 |
"${D}${PYTHON_SCRIPTDIR}/pydoc" || die |
| 211 |
ln -s "../../../bin/pyvenv-${PYVER}" \ |
| 212 |
"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die |
| 213 |
- |
| 214 |
- # Compatibility link for stuff that calls ${PYTHON}-config |
| 215 |
- # Remove this when all revdeps have been fixed to not do that. |
| 216 |
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" |
| 217 |
+ # idle |
| 218 |
+ if use tk; then |
| 219 |
+ ln -s "../../../bin/idle${PYVER}" \ |
| 220 |
+ "${D}${PYTHON_SCRIPTDIR}/idle" || die |
| 221 |
+ fi |
| 222 |
} |
| 223 |
|
| 224 |
pkg_preinst() { |
Archives