* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-python/, app-eselect/eselect-python/files/
@ 2016-02-28 17:14 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2016-02-28 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 9fdf4a9619d85b4272cba0fa28f4bbcddf20ddd6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 16:46:38 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 17:14:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fdf4a96
app-eselect/eselect-python: Support pythonX.Y-config in the old version
.../eselect-python-20140125-r1.ebuild | 47 ++++++++++++++++++++++
.../eselect-python-20140125-pythonX.Y-config.patch | 38 +++++++++++++++++
2 files changed, 85 insertions(+)
diff --git a/app-eselect/eselect-python/eselect-python-20140125-r1.ebuild b/app-eselect/eselect-python/eselect-python-20140125-r1.ebuild
new file mode 100644
index 0000000..7babd51
--- /dev/null
+++ b/app-eselect/eselect-python/eselect-python-20140125-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2
+ https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-pythonX.Y-config.patch
+ [[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+src_install() {
+ keepdir /etc/env.d/python
+ emake DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+ if has_version 'dev-lang/python'; then
+ eselect python update --if-unset
+ fi
+ if has_version '=dev-lang/python-2*'; then
+ eselect python update --python2 --if-unset
+ fi
+ if has_version '=dev-lang/python-3*'; then
+ eselect python update --python3 --if-unset
+ fi
+}
diff --git a/app-eselect/eselect-python/files/eselect-python-20140125-pythonX.Y-config.patch b/app-eselect/eselect-python/files/eselect-python-20140125-pythonX.Y-config.patch
new file mode 100644
index 0000000..f35cd2c
--- /dev/null
+++ b/app-eselect/eselect-python/files/eselect-python-20140125-pythonX.Y-config.patch
@@ -0,0 +1,38 @@
+From 3a5909537315dbe624fbd242d8ab25f3926465fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 28 Feb 2016 17:04:40 +0100
+Subject: [PATCH] Use pythonX.Y-config instead of python-config-X.Y
+
+---
+ python.eselect.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/python.eselect.in b/python.eselect.in
+index 9a52791..c40483a 100644
+--- a/python.eselect.in
++++ b/python.eselect.in
+@@ -46,9 +46,9 @@ set_python_config() {
+ #!/usr/bin/env bash
+ # Gentoo python-config wrapper script
+
+-[[ "\${EPYTHON}" =~ (/|^python\$) ]] && EPYTHON="${target/-config-/}"
+-python_config="\${EPYTHON/python/python-config-}"
+-"\${0%/*}/\${python_config:-${target}}" "\$@"
++[[ "\${EPYTHON}" =~ (/|^python\$|^$) ]] && EPYTHON="${target%-config}"
++python_config="\${EPYTHON}-config"
++"\${0%/*}/\${python_config}" "\$@"
+ EOF
+ chmod a+rx "${script}"
+ }
+@@ -121,7 +121,7 @@ set_scripts_and_symlinks() {
+ ln -nfs "${target}" "${target%.*}"
+ if [[ "${SET_MAIN_ACTIVE_PYTHON_INTERPRETER}" == "1" ]]; then
+ set_python "${target}"
+- set_python_config "${target/python/python-config-}"
++ set_python_config "${target}-config"
+ ln -nfs "${target/python/pydoc}" pydoc
+ # idle is optionally installed
+ if [[ -f "${target/python/idle}" ]]; then
+--
+2.7.2
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-python/, app-eselect/eselect-python/files/
@ 2017-04-21 14:12 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2017-04-21 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 38598ef8e58ca08440a91a790bbca376dff5f8d2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 13:57:04 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 14:12:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38598ef8
app-eselect/eselect-python: Clean old version up
app-eselect/eselect-python/Manifest | 1 -
.../eselect-python-20140125-r2.ebuild | 48 ----------------------
.../eselect-python-20140125-pythonX.Y-config.patch | 38 -----------------
3 files changed, 87 deletions(-)
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 7e4f252a90a..a6b5f8189b7 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -1,2 +1 @@
-DIST eselect-python-20140125.tar.bz2 72102 SHA256 ee7b470f7facc42285bab7f4b947280741515a85c9067339511c219248f8fdfb SHA512 94d4eb5a1af365c6f56a6fc2b75298018267cd4f6004f30b2e4d0c4744d3e82b33f6c82e6f0ea0f15132d5157c3ace99fa167bbf3ebada46edd2e005ca96eb51 WHIRLPOOL 70d5f9af2929507d26e56080ce934066d2de5f16030dfd63b016215465ad5fc89eb952d64cc545c7058d146108e26925741d2c8fbaba08abba1a5cae7b0c23b6
DIST eselect-python-20160516.tar.bz2 46549 SHA256 bea0a39d9e5afb7513be47955a82efa636b983de6388965df517cb1eb7615fd2 SHA512 0ac310e13bca9e3cdfdd55820cc2956cacf28ade99c1b5048edadd48c6a04c2ae1037207aaac74fcd75e809cf993f88b52e463979b68bd123fe925e491a7030a WHIRLPOOL 66782323a455af7536592cf76c9fd9f57c8adf8a67b374c4e6bb96fdc21dfb8add4f74697139643c47561357a451d50b777f3e2e73db850176fc05d61ae6e54c
diff --git a/app-eselect/eselect-python/eselect-python-20140125-r2.ebuild b/app-eselect/eselect-python/eselect-python-20140125-r2.ebuild
deleted file mode 100644
index e0980ff93d2..00000000000
--- a/app-eselect/eselect-python/eselect-python-20140125-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-if [[ ${PV} == "99999999" ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-pythonX.Y-config.patch
- [[ ${PV} == "99999999" ]] && eautoreconf
-}
-
-src_install() {
- keepdir /etc/env.d/python
- emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
- if has_version 'dev-lang/python'; then
- eselect python update --if-unset
- # Regen python-config wrapper
- eselect python set $(eselect python show)
- fi
- if has_version '=dev-lang/python-2*'; then
- eselect python update --python2 --if-unset
- fi
- if has_version '=dev-lang/python-3*'; then
- eselect python update --python3 --if-unset
- fi
-}
diff --git a/app-eselect/eselect-python/files/eselect-python-20140125-pythonX.Y-config.patch b/app-eselect/eselect-python/files/eselect-python-20140125-pythonX.Y-config.patch
deleted file mode 100644
index f35cd2c8f0d..00000000000
--- a/app-eselect/eselect-python/files/eselect-python-20140125-pythonX.Y-config.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3a5909537315dbe624fbd242d8ab25f3926465fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 28 Feb 2016 17:04:40 +0100
-Subject: [PATCH] Use pythonX.Y-config instead of python-config-X.Y
-
----
- python.eselect.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/python.eselect.in b/python.eselect.in
-index 9a52791..c40483a 100644
---- a/python.eselect.in
-+++ b/python.eselect.in
-@@ -46,9 +46,9 @@ set_python_config() {
- #!/usr/bin/env bash
- # Gentoo python-config wrapper script
-
--[[ "\${EPYTHON}" =~ (/|^python\$) ]] && EPYTHON="${target/-config-/}"
--python_config="\${EPYTHON/python/python-config-}"
--"\${0%/*}/\${python_config:-${target}}" "\$@"
-+[[ "\${EPYTHON}" =~ (/|^python\$|^$) ]] && EPYTHON="${target%-config}"
-+python_config="\${EPYTHON}-config"
-+"\${0%/*}/\${python_config}" "\$@"
- EOF
- chmod a+rx "${script}"
- }
-@@ -121,7 +121,7 @@ set_scripts_and_symlinks() {
- ln -nfs "${target}" "${target%.*}"
- if [[ "${SET_MAIN_ACTIVE_PYTHON_INTERPRETER}" == "1" ]]; then
- set_python "${target}"
-- set_python_config "${target/python/python-config-}"
-+ set_python_config "${target}-config"
- ln -nfs "${target/python/pydoc}" pydoc
- # idle is optionally installed
- if [[ -f "${target/python/idle}" ]]; then
---
-2.7.2
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-21 14:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-28 17:14 [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-python/, app-eselect/eselect-python/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2017-04-21 14:12 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