* [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/, profiles/
@ 2015-11-17 20:39 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2015-11-17 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 6c2f9e9f117072625ea850d2c8f6f79b6b6a2401
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 16:26:15 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 20:39:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c2f9e9f
dev-lang/python: Add symlinks for python-exec wrapping of execs
Add symlinks to make it possible to wrap Python executable aliases
(python, python-config, pydoc...) via python-exec.
...on-2.7.10-r3.ebuild => python-2.7.10-r4.ebuild} | 21 +++++++++++++++++++-
...thon-3.3.5-r3.ebuild => python-3.3.5-r4.ebuild} | 23 +++++++++++++++++++++-
...thon-3.4.3-r3.ebuild => python-3.4.3-r4.ebuild} | 23 +++++++++++++++++++++-
...thon-3.5.0-r2.ebuild => python-3.5.0-r3.ebuild} | 23 +++++++++++++++++++++-
profiles/package.mask | 9 +++++----
5 files changed, 91 insertions(+), 8 deletions(-)
diff --git a/dev-lang/python/python-2.7.10-r3.ebuild b/dev-lang/python/python-2.7.10-r4.ebuild
similarity index 93%
rename from dev-lang/python/python-2.7.10-r3.ebuild
rename to dev-lang/python/python-2.7.10-r4.ebuild
index 4fae1b5..2158a54 100644
--- a/dev-lang/python/python-2.7.10-r3.ebuild
+++ b/dev-lang/python/python-2.7.10-r4.ebuild
@@ -304,7 +304,7 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- local vars=( EPYTHON PYTHON_SITEDIR )
+ local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
@@ -317,6 +317,25 @@ src_install() {
python_export "python${SLOT}" "${vars[@]}"
echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${SLOT%.*}
+ mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+ # python and pythonX
+ ln -s "../../../bin/python${SLOT}" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+ ln -s "python${pymajor}" \
+ "${D}${PYTHON_SCRIPTDIR}/python" || die
+ # python-config and pythonX-config
+ ln -s "../../../bin/python${SLOT}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${SLOT}" \
+ "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+ ln -s "../../../bin/pydoc${SLOT}" \
+ "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
}
pkg_preinst() {
diff --git a/dev-lang/python/python-3.3.5-r3.ebuild b/dev-lang/python/python-3.3.5-r4.ebuild
similarity index 92%
rename from dev-lang/python/python-3.3.5-r3.ebuild
rename to dev-lang/python/python-3.3.5-r4.ebuild
index 3049ce1..9b0e261 100644
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r4.ebuild
@@ -291,7 +291,7 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
# for python-exec
- local vars=( EPYTHON PYTHON_SITEDIR )
+ local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
@@ -304,6 +304,27 @@ src_install() {
python_export "python${PYVER}" "${vars[@]}"
echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+ ln -s "python${pymajor}" \
+ "${D}${PYTHON_SCRIPTDIR}/python" || die
+ # python-config and pythonX-config
+ ln -s "../../../bin/${abiver}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+ ln -s "../../../bin/pyvenv-${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
}
pkg_preinst() {
diff --git a/dev-lang/python/python-3.4.3-r3.ebuild b/dev-lang/python/python-3.4.3-r4.ebuild
similarity index 91%
rename from dev-lang/python/python-3.4.3-r3.ebuild
rename to dev-lang/python/python-3.4.3-r4.ebuild
index aaaa72a..526233a 100644
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-3.4.3-r4.ebuild
@@ -274,7 +274,7 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
# for python-exec
- local vars=( EPYTHON PYTHON_SITEDIR )
+ local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
@@ -287,6 +287,27 @@ src_install() {
python_export "python${PYVER}" "${vars[@]}"
echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+ ln -s "python${pymajor}" \
+ "${D}${PYTHON_SCRIPTDIR}/python" || die
+ # python-config and pythonX-config
+ ln -s "../../../bin/${abiver}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+ ln -s "../../../bin/pyvenv-${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
}
pkg_preinst() {
diff --git a/dev-lang/python/python-3.5.0-r2.ebuild b/dev-lang/python/python-3.5.0-r3.ebuild
similarity index 91%
rename from dev-lang/python/python-3.5.0-r2.ebuild
rename to dev-lang/python/python-3.5.0-r3.ebuild
index caa9e35..b2b50a1 100644
--- a/dev-lang/python/python-3.5.0-r2.ebuild
+++ b/dev-lang/python/python-3.5.0-r3.ebuild
@@ -277,7 +277,7 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
# for python-exec
- local vars=( EPYTHON PYTHON_SITEDIR )
+ local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
@@ -290,6 +290,27 @@ src_install() {
python_export "python${PYVER}" "${vars[@]}"
echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+ ln -s "python${pymajor}" \
+ "${D}${PYTHON_SCRIPTDIR}/python" || die
+ # python-config and pythonX-config
+ ln -s "../../../bin/${abiver}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+ ln -s "../../../bin/pyvenv-${PYVER}" \
+ "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
}
pkg_preinst() {
diff --git a/profiles/package.mask b/profiles/package.mask
index 21421f8..2745f98 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -68,13 +68,14 @@ sci-chemistry/pymol-apbs-plugin
# Michał Górny <mgorny@gentoo.org> (11 Nov 2015)
# Cleaned up Python versions masked for testing:
# - python-config-X.Y compatibility removed,
+# - python-exec symlinks added (to replace eselect-python's wrapper),
# - ABIFLAGS reintroduced for 3.3+.
# Resulting API/ABI change can break reverse dependencies, especially
# if upstream hardcodes paths or library names.
-=dev-lang/python-2.7.10-r3
-=dev-lang/python-3.3.5-r3
-=dev-lang/python-3.4.3-r3
-=dev-lang/python-3.5.0-r2
+=dev-lang/python-2.7.10-r4
+=dev-lang/python-3.3.5-r4
+=dev-lang/python-3.4.3-r4
+=dev-lang/python-3.5.0-r3
# Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
# Vulnerable package CVE-2014-{1932,1933}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/, profiles/
@ 2019-03-21 12:57 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-03-21 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 065f5867e6e8e788bc3c344520bb7bf9a279d9d7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 12:54:11 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 12:56:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065f5867
package.mask: Revert "Mask net-print/magicfilter as well"
Accidentally included part of local changes.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-lang/python/python-3.5.7.ebuild | 2 +-
profiles/package.mask | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev-lang/python/python-3.5.7.ebuild b/dev-lang/python/python-3.5.7.ebuild
index 03fd2fd6818..4687d3484b7 100644
--- a/dev-lang/python/python-3.5.7.ebuild
+++ b/dev-lang/python/python-3.5.7.ebuild
@@ -73,7 +73,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch"
epatch "${FILESDIR}/3.6-disable-nis.patch"
-# epatch "${FILESDIR}/python-3.5.5-libressl-compatibility.patch"
+ epatch "${FILESDIR}/python-3.5.5-libressl-compatibility.patch"
epatch "${FILESDIR}/python-3.5.5-hash-unaligned.patch"
epatch_user
diff --git a/profiles/package.mask b/profiles/package.mask
index 83cc4719dde..c5662d8a28b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,10 +33,8 @@
# Not really maintained anymore. Last upstream release is from 2015.
# Fails to build against modern versions of app-crypt/mit-krb5, may have
# more hidden issues. It is probably time to move to net-print/cups.
-# net-print/magicfilter is the only reverse dependency (from 2011).
# Removal in 30 days. Bug #496922.
net-print/lprng
-net-print/magicfilter
# Michał Górny <mgorny@gentoo.org> (21 Mar 2019)
# Fails to build on modern systems. Really bad quality ebuild (#670524)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-21 12:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-21 12:57 [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/, profiles/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2015-11-17 20:39 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox