* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/, dev-python/pypy3/
@ 2015-08-15 5:45 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2015-08-15 5:45 UTC (permalink / raw
To: gentoo-commits
commit: f1a1ce103ab659640dd4a20901f2d2e7a72b6336
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 05:42:19 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 05:44:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1a1ce10
dev-python/pypy*: Fix USE=-ncurses and USE=-gdbm
Fix USE=-ncurses (and USE=-gdbm in pypy-2.6.0) not to try to regenerate
cffi modules for the two.
Bug: https://bugs.gentoo.org/show_bug.cgi?id=557540#c3
Package-Manager: portage-2.2.20
dev-python/pypy/pypy-2.4.0.ebuild | 4 +++-
dev-python/pypy/pypy-2.5.1.ebuild | 4 +++-
dev-python/pypy/pypy-2.6.0.ebuild | 3 ++-
dev-python/pypy3/pypy3-2.4.0.ebuild | 4 +++-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild
index 15faabb..352913b 100644
--- a/dev-python/pypy/pypy-2.4.0.ebuild
+++ b/dev-python/pypy/pypy-2.4.0.ebuild
@@ -203,11 +203,13 @@ src_install() {
# Generate cffi cache
# Please keep in sync with pypy/tool/release/package.py!
- "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
if use gdbm; then
"${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)"
fi
+ if use ncurses; then
+ "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
+ fi
if use sqlite; then
"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
fi
diff --git a/dev-python/pypy/pypy-2.5.1.ebuild b/dev-python/pypy/pypy-2.5.1.ebuild
index c07de49..109ebeb 100644
--- a/dev-python/pypy/pypy-2.5.1.ebuild
+++ b/dev-python/pypy/pypy-2.5.1.ebuild
@@ -203,11 +203,13 @@ src_install() {
# Generate cffi cache
# Please keep in sync with pypy/tool/release/package.py!
- "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
if use gdbm; then
"${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)"
fi
+ if use ncurses; then
+ "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
+ fi
if use sqlite; then
"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
fi
diff --git a/dev-python/pypy/pypy-2.6.0.ebuild b/dev-python/pypy/pypy-2.6.0.ebuild
index d73cb5e..18a8810 100644
--- a/dev-python/pypy/pypy-2.6.0.ebuild
+++ b/dev-python/pypy/pypy-2.6.0.ebuild
@@ -217,8 +217,9 @@ src_install() {
# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
- cffi_targets=( audioop curses syslog gdbm pwdgrp )
+ cffi_targets=( audioop syslog pwdgrp )
use gdbm && cffi_targets+=( gdbm )
+ use ncurses && cffi_targets+=( curses )
use sqlite && cffi_targets+=( sqlite3 )
use tk && cffi_targets+=( tkinter/tklib )
diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild b/dev-python/pypy3/pypy3-2.4.0.ebuild
index 20b01f3..0c369ad 100644
--- a/dev-python/pypy3/pypy3-2.4.0.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0.ebuild
@@ -197,11 +197,13 @@ src_install() {
# Generate cffi cache
# Please keep in sync with pypy/tool/release/package.py!
- "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
if use gdbm; then
"${PYTHON}" -c "import _gdbm" || die "Failed to import gdbm (cffi)"
fi
+ if use ncurses; then
+ "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
+ fi
if use sqlite; then
"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
fi
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/, dev-python/pypy3/
@ 2015-08-15 5:45 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2015-08-15 5:45 UTC (permalink / raw
To: gentoo-commits
commit: 7525bb1ec22f1b4320978236a4b45989d07d7c34
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 05:44:39 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 05:44:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7525bb1e
dev-python/pypy*: require sys-libs/ncurses:5/5 due to cffi use
The cffi modules in dev-python/pypy{,3} are locked to .so.5 ABI.
Package-Manager: portage-2.2.20
dev-python/pypy/pypy-2.3.1-r2.ebuild | 2 +-
dev-python/pypy/pypy-2.4.0.ebuild | 2 +-
dev-python/pypy/pypy-2.5.1.ebuild | 2 +-
dev-python/pypy/pypy-2.6.0.ebuild | 2 +-
dev-python/pypy3/pypy3-2.4.0.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-python/pypy/pypy-2.3.1-r2.ebuild b/dev-python/pypy/pypy-2.3.1-r2.ebuild
index b469181..89bf5fb 100644
--- a/dev-python/pypy/pypy-2.3.1-r2.ebuild
+++ b/dev-python/pypy/pypy-2.3.1-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
dev-libs/openssl:0=
bzip2? ( app-arch/bzip2:0= )
gdbm? ( sys-libs/gdbm:0= )
- ncurses? ( sys-libs/ncurses:5= )
+ ncurses? ( sys-libs/ncurses:5/5 )
sqlite? ( dev-db/sqlite:3= )
tk? (
dev-lang/tk:0=
diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild
index 352913b..71abed3 100644
--- a/dev-python/pypy/pypy-2.4.0.ebuild
+++ b/dev-python/pypy/pypy-2.4.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
dev-libs/openssl:0=
bzip2? ( app-arch/bzip2:0= )
gdbm? ( sys-libs/gdbm:0= )
- ncurses? ( sys-libs/ncurses:5= )
+ ncurses? ( sys-libs/ncurses:5/5 )
sqlite? ( dev-db/sqlite:3= )
tk? (
dev-lang/tk:0=
diff --git a/dev-python/pypy/pypy-2.5.1.ebuild b/dev-python/pypy/pypy-2.5.1.ebuild
index 109ebeb..ac26409 100644
--- a/dev-python/pypy/pypy-2.5.1.ebuild
+++ b/dev-python/pypy/pypy-2.5.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
dev-libs/openssl:0=[-bindist]
bzip2? ( app-arch/bzip2:0= )
gdbm? ( sys-libs/gdbm:0= )
- ncurses? ( sys-libs/ncurses:5= )
+ ncurses? ( sys-libs/ncurses:5/5 )
sqlite? ( dev-db/sqlite:3= )
tk? (
dev-lang/tk:0=
diff --git a/dev-python/pypy/pypy-2.6.0.ebuild b/dev-python/pypy/pypy-2.6.0.ebuild
index 18a8810..a1a40cb 100644
--- a/dev-python/pypy/pypy-2.6.0.ebuild
+++ b/dev-python/pypy/pypy-2.6.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
dev-libs/openssl:0=[-bindist]
bzip2? ( app-arch/bzip2:0= )
gdbm? ( sys-libs/gdbm:0= )
- ncurses? ( sys-libs/ncurses:5= )
+ ncurses? ( sys-libs/ncurses:5/5 )
sqlite? ( dev-db/sqlite:3= )
tk? (
dev-lang/tk:0=
diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild b/dev-python/pypy3/pypy3-2.4.0.ebuild
index 0c369ad..eda2f1d 100644
--- a/dev-python/pypy3/pypy3-2.4.0.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
dev-libs/openssl:0=
bzip2? ( app-arch/bzip2:0= )
gdbm? ( sys-libs/gdbm:0= )
- ncurses? ( sys-libs/ncurses:5= )
+ ncurses? ( sys-libs/ncurses:5/5 )
sqlite? ( dev-db/sqlite:3= )
tk? (
dev-lang/tk:0=
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-15 5:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-15 5:45 [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/, dev-python/pypy3/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2015-08-15 5:45 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