* [gentoo-commits] repo/gentoo:python-wrapper-full-replacement commit in: app-eselect/eselect-python/
@ 2015-11-15 11:54 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2015-11-15 11:54 UTC (permalink / raw
To: gentoo-commits
commit: 3630022d9b2677620737e974113c013fc2555fd8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 11:54:03 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 11:54:03 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3630022d
app-admin/eselect-python: Fake-bump for testing
app-eselect/eselect-python/Manifest | 1 +
...ect-python-99999999.ebuild => eselect-python-20151115.ebuild} | 9 ++++-----
app-eselect/eselect-python/eselect-python-99999999.ebuild | 3 +--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 98a02a2..9ac29ae 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -2,3 +2,4 @@ DIST eselect-python-20111108.tar.bz2 64959 SHA256 34d7618808a3c1d22e6763bc6c67d5
DIST eselect-python-20131210.tar.bz2 71802 SHA256 61ff5a5a3ae7982c6ffd503886cbcd35142df05f07008722b90ab5036e4bf8f2 SHA512 8c523019e2a8fe7f1679b96a3da22326dbe65888739bb8cce3c4e2aa7c2c08cada01196a65c8fe35e08b3b7682a3f695e453e9ef1fb53f6b8886c51c09107d60 WHIRLPOOL e8c75eb1ad6fcaaba50cae9d10d2414b29b3cfc8d06c79257948b0d0b4e7c2156d1672be4f5edd28055b5ae3f6aa54b1b8ef6eaaae9dfa1ce9b7b0b68dbc712a
DIST eselect-python-20140115.tar.bz2 71910 SHA256 5898ee19015ae905168e8b7aa76552b96f691285ab77c426b6a9238ecf742e45 SHA512 65d6a6b9dfa0a0f4bea5352f965bed8942a16382135edea093342fa79a824d114b900cbcf607490f260b4ce4e5a2eb57872169e5494f8e6e65f41dd63cd5d335 WHIRLPOOL 633bca3e8a87e04c54a3790bb207da92d41af604cce7f8600c5317f6a759c55efbd3e5ba658e893d2d079248d2dadb1a0bb60248960e3d20cd766768a228d8c5
DIST eselect-python-20140125.tar.bz2 72102 SHA256 ee7b470f7facc42285bab7f4b947280741515a85c9067339511c219248f8fdfb SHA512 94d4eb5a1af365c6f56a6fc2b75298018267cd4f6004f30b2e4d0c4744d3e82b33f6c82e6f0ea0f15132d5157c3ace99fa167bbf3ebada46edd2e005ca96eb51 WHIRLPOOL 70d5f9af2929507d26e56080ce934066d2de5f16030dfd63b016215465ad5fc89eb952d64cc545c7058d146108e26925741d2c8fbaba08abba1a5cae7b0c23b6
+DIST eselect-python-20151115.tar.bz2 3256 SHA256 e5a5a97f80ff9613db1af35c5a265baa9157eb38e2513391fe59d4b794a71e57 SHA512 525f1552c5dd27cb0a81c9d9ff965dc63c538e2880de1dd873a6059bd387b9935bc6c4b43b7d9b409a827751ba1f25925862f65264b03a80df893bf2405f7d61 WHIRLPOOL dc9d847d6ac55d4b8a6c86029689e244697faa68e02025545ffc57574ea389a938a8886c1a0ebb4a25993204020468d06cac2abaa6a77fc8926ebdd1e8e50b25
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-20151115.ebuild
similarity index 87%
copy from app-eselect/eselect-python/eselect-python-99999999.ebuild
copy to app-eselect/eselect-python/eselect-python-20151115.ebuild
index d43f443..fc7b0f6 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20151115.ebuild
@@ -9,8 +9,8 @@ if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
EGIT_BRANCH="mgornys-hackery"
else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+ inherit autotools vcs-snapshot
+ SRC_URI="https://gitweb.gentoo.org/proj/eselect-python.git/snapshot/2e082de29ee3707d11d1097132aaeeae16d0ea83.tar.bz2 -> ${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
@@ -21,16 +21,15 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-# TODO: add appropriate >= dep on python-exec
RDEPEND=">=app-admin/eselect-1.2.3
- dev-lang/python-exec:2
+ >=dev-lang/python-exec-2.1:2
!<dev-lang/python-2.7.10-r3:2.7
!<dev-lang/python-3.3.5-r3:3.3
!<dev-lang/python-3.4.3-r3:3.4
!<dev-lang/python-3.5.0-r2:3.5"
src_prepare() {
- [[ ${PV} == "99999999" ]] && eautoreconf
+ eautoreconf
}
src_install() {
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index d43f443..092cd23 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -21,9 +21,8 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-# TODO: add appropriate >= dep on python-exec
RDEPEND=">=app-admin/eselect-1.2.3
- dev-lang/python-exec:2
+ >=dev-lang/python-exec-2.1:2
!<dev-lang/python-2.7.10-r3:2.7
!<dev-lang/python-3.3.5-r3:3.3
!<dev-lang/python-3.4.3-r3:3.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:python-wrapper-full-replacement commit in: app-eselect/eselect-python/
@ 2015-11-17 13:01 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2015-11-17 13:01 UTC (permalink / raw
To: gentoo-commits
commit: 373c1e2f2d3db06ed042de935cb3dca9abf2a227
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 13:01:05 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 13:01:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=373c1e2f
Update the eselect-python bump for EXEEXT fix
app-eselect/eselect-python/Manifest | 2 +-
.../{eselect-python-20151115.ebuild => eselect-python-20151117.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 9ac29ae..c07c04d 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -2,4 +2,4 @@ DIST eselect-python-20111108.tar.bz2 64959 SHA256 34d7618808a3c1d22e6763bc6c67d5
DIST eselect-python-20131210.tar.bz2 71802 SHA256 61ff5a5a3ae7982c6ffd503886cbcd35142df05f07008722b90ab5036e4bf8f2 SHA512 8c523019e2a8fe7f1679b96a3da22326dbe65888739bb8cce3c4e2aa7c2c08cada01196a65c8fe35e08b3b7682a3f695e453e9ef1fb53f6b8886c51c09107d60 WHIRLPOOL e8c75eb1ad6fcaaba50cae9d10d2414b29b3cfc8d06c79257948b0d0b4e7c2156d1672be4f5edd28055b5ae3f6aa54b1b8ef6eaaae9dfa1ce9b7b0b68dbc712a
DIST eselect-python-20140115.tar.bz2 71910 SHA256 5898ee19015ae905168e8b7aa76552b96f691285ab77c426b6a9238ecf742e45 SHA512 65d6a6b9dfa0a0f4bea5352f965bed8942a16382135edea093342fa79a824d114b900cbcf607490f260b4ce4e5a2eb57872169e5494f8e6e65f41dd63cd5d335 WHIRLPOOL 633bca3e8a87e04c54a3790bb207da92d41af604cce7f8600c5317f6a759c55efbd3e5ba658e893d2d079248d2dadb1a0bb60248960e3d20cd766768a228d8c5
DIST eselect-python-20140125.tar.bz2 72102 SHA256 ee7b470f7facc42285bab7f4b947280741515a85c9067339511c219248f8fdfb SHA512 94d4eb5a1af365c6f56a6fc2b75298018267cd4f6004f30b2e4d0c4744d3e82b33f6c82e6f0ea0f15132d5157c3ace99fa167bbf3ebada46edd2e005ca96eb51 WHIRLPOOL 70d5f9af2929507d26e56080ce934066d2de5f16030dfd63b016215465ad5fc89eb952d64cc545c7058d146108e26925741d2c8fbaba08abba1a5cae7b0c23b6
-DIST eselect-python-20151115.tar.bz2 3256 SHA256 e5a5a97f80ff9613db1af35c5a265baa9157eb38e2513391fe59d4b794a71e57 SHA512 525f1552c5dd27cb0a81c9d9ff965dc63c538e2880de1dd873a6059bd387b9935bc6c4b43b7d9b409a827751ba1f25925862f65264b03a80df893bf2405f7d61 WHIRLPOOL dc9d847d6ac55d4b8a6c86029689e244697faa68e02025545ffc57574ea389a938a8886c1a0ebb4a25993204020468d06cac2abaa6a77fc8926ebdd1e8e50b25
+DIST eselect-python-20151117.tar.bz2 3283 SHA256 ad41e2ea2fef39c8dc2c5fb5f4a4cde73da127ac771edd2ace5cc1f03b65a844 SHA512 aabf14cbe8a70a80d861c2550a0320e16c0deddf44e4fb8ccf45b66289161a2196340667b66f857a662ed04414f4a933f0ef7a67947101a2bb73075d104c5ec2 WHIRLPOOL 4aec8226b9a4207ef4eb6f7c19ff61b436f2cd354c26e3551bcaa0d6ea37134da0c15e3d753792b4e70df746246711afb755ed03b3f6ef4f5694721e02fbe917
diff --git a/app-eselect/eselect-python/eselect-python-20151115.ebuild b/app-eselect/eselect-python/eselect-python-20151117.ebuild
similarity index 96%
rename from app-eselect/eselect-python/eselect-python-20151115.ebuild
rename to app-eselect/eselect-python/eselect-python-20151117.ebuild
index fc7b0f6..cbd72ae 100644
--- a/app-eselect/eselect-python/eselect-python-20151115.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20151117.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "99999999" ]] ; then
EGIT_BRANCH="mgornys-hackery"
else
inherit autotools vcs-snapshot
- SRC_URI="https://gitweb.gentoo.org/proj/eselect-python.git/snapshot/2e082de29ee3707d11d1097132aaeeae16d0ea83.tar.bz2 -> ${P}.tar.bz2"
+ SRC_URI="https://gitweb.gentoo.org/proj/eselect-python.git/snapshot/6824d7d6841536d153cb56a350c6f89708725777.tar.bz2 -> ${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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:python-wrapper-full-replacement commit in: app-eselect/eselect-python/
@ 2015-11-17 20:35 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2015-11-17 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 460af21306dcef36204adfa5098b21f6bcbd2379
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 20:32:36 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 20:32:36 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460af213
app-eselect/eselect-python: Preserve previous python[23] selection
.../eselect-python/eselect-python-20151117.ebuild | 37 ++++++++++++++++++----
.../eselect-python/eselect-python-99999999.ebuild | 37 ++++++++++++++++++----
2 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/app-eselect/eselect-python/eselect-python-20151117.ebuild b/app-eselect/eselect-python/eselect-python-20151117.ebuild
index 9968e7f..86e9a3c 100644
--- a/app-eselect/eselect-python/eselect-python-20151117.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20151117.ebuild
@@ -40,14 +40,39 @@ src_install() {
done
}
+pkg_preinst() {
+ local py
+
+ # Copy python[23] selection from the old format (symlink)
+ for py in 2 3; do
+ # default to none
+ declare -g "PREV_PYTHON${py}"=
+
+ if [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+ local target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+ # check if it's actually old eselect symlink
+ if [[ ${target} == python?.? ]]; then
+ declare -g "PREV_PYTHON${py}=${target}"
+ fi
+ fi
+ done
+}
+
pkg_postinst() {
+ local py
+
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
+
+ for py in 2 3; do
+ local pyvar=PREV_PYTHON${py}
+ if [[ -n ${!pyvar} ]]; then
+ einfo "Setting Python${py} to ${!pyvar}"
+ eselect python set "--python${py}" "${!pyvar}"
+ elif has_version "=dev-lang/python-${py}*"; then
+ eselect python update "--python${py}" --if-unset
+ fi
+ done
}
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 9968e7f..86e9a3c 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -40,14 +40,39 @@ src_install() {
done
}
+pkg_preinst() {
+ local py
+
+ # Copy python[23] selection from the old format (symlink)
+ for py in 2 3; do
+ # default to none
+ declare -g "PREV_PYTHON${py}"=
+
+ if [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+ local target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+ # check if it's actually old eselect symlink
+ if [[ ${target} == python?.? ]]; then
+ declare -g "PREV_PYTHON${py}=${target}"
+ fi
+ fi
+ done
+}
+
pkg_postinst() {
+ local py
+
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
+
+ for py in 2 3; do
+ local pyvar=PREV_PYTHON${py}
+ if [[ -n ${!pyvar} ]]; then
+ einfo "Setting Python${py} to ${!pyvar}"
+ eselect python set "--python${py}" "${!pyvar}"
+ elif has_version "=dev-lang/python-${py}*"; then
+ eselect python update "--python${py}" --if-unset
+ fi
+ done
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-17 20:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-15 11:54 [gentoo-commits] repo/gentoo:python-wrapper-full-replacement commit in: app-eselect/eselect-python/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2015-11-17 13:01 Michał Górny
2015-11-17 20:35 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