commit: 8ba276fde89ca0828e6988833bdcca7d6aa79623
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 21:10:00 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 21:10:00 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba276fd
dev-lang/python: Do not forcably disable xml support with USE=build
This is breaking stages when portage has the xattr USE flag enabled.
This pulls in dev-python/setuptools, which needs pyexpat.
Package-Manager: portage-2.2.20
dev-lang/python/python-2.7.10.ebuild | 4 ++--
dev-lang/python/python-2.7.9-r1.ebuild | 4 ++--
dev-lang/python/python-3.4.1.ebuild | 4 ++--
dev-lang/python/python-3.4.3.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-lang/python/python-2.7.10.ebuild
b/dev-lang/python/python-2.7.10.ebuild
index 00ff5c5..74ff08a 100644
--- a/dev-lang/python/python-2.7.10.ebuild
+++ b/dev-lang/python/python-2.7.10.ebuild
@@ -29,6 +29,7 @@ RDEPEND="app-arch/bzip2
>=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
+ xml? ( >=dev-libs/expat-2.1 )
!build? (
berkdb? ( || (
sys-libs/db:5.3
@@ -55,7 +56,6 @@ RDEPEND="app-arch/bzip2
dev-tcltk/blt
dev-tcltk/tix
)
- xml? ( >=dev-libs/expat-2.1 )
)
!!<sys-apps/portage-2.1.9"
DEPEND="${RDEPEND}
@@ -119,7 +119,7 @@ src_prepare() {
src_configure() {
if use build; then
# Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses
_curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+ export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses
_curses_panel readline _sqlite3 _tkinter"
export PYTHON_DISABLE_SSL="1"
else
# dbm module can be linked against berkdb or gdbm.
diff --git a/dev-lang/python/python-2.7.9-r1.ebuild
b/dev-lang/python/python-2.7.9-r1.ebuild
index d87a47c..a31a447 100644
--- a/dev-lang/python/python-2.7.9-r1.ebuild
+++ b/dev-lang/python/python-2.7.9-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="app-arch/bzip2
>=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
+ xml? ( >=dev-libs/expat-2.1 )
!build? (
berkdb? ( || (
sys-libs/db:5.3
@@ -56,7 +57,6 @@ RDEPEND="app-arch/bzip2
dev-tcltk/blt
dev-tcltk/tix
)
- xml? ( >=dev-libs/expat-2.1 )
)
!!<sys-apps/portage-2.1.9"
DEPEND="${RDEPEND}
@@ -120,7 +120,7 @@ src_prepare() {
src_configure() {
if use build; then
# Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses
_curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+ export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses
_curses_panel readline _sqlite3 _tkinter"
export PYTHON_DISABLE_SSL="1"
else
# dbm module can be linked against berkdb or gdbm.
diff --git a/dev-lang/python/python-3.4.1.ebuild
b/dev-lang/python/python-3.4.1.ebuild
index d44d70c..5c5df4c 100644
--- a/dev-lang/python/python-3.4.1.ebuild
+++ b/dev-lang/python/python-3.4.1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="app-arch/bzip2
>=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
+ xml? ( >=dev-libs/expat-2.1 )
!build? (
gdbm? ( sys-libs/gdbm[berkdb] )
ncurses? (
@@ -44,7 +45,6 @@ RDEPEND="app-arch/bzip2
dev-tcltk/blt
dev-tcltk/tix
)
- xml? ( >=dev-libs/expat-2.1 )
)
!!<sys-apps/sandbox-2.6-r1"
DEPEND="${RDEPEND}
@@ -93,7 +93,7 @@ src_prepare() {
src_configure() {
if use build; then
# Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel
readline _sqlite3 _tkinter _elementtree pyexpat"
+ export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel
readline _sqlite3 _tkinter"
export PYTHON_DISABLE_SSL="1"
else
local disable
diff --git a/dev-lang/python/python-3.4.3.ebuild
b/dev-lang/python/python-3.4.3.ebuild
index f0f894a..109d453 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3.ebuild
@@ -30,6 +30,7 @@ RDEPEND="app-arch/bzip2
>=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
+ xml? ( >=dev-libs/expat-2.1 )
!build? (
gdbm? ( sys-libs/gdbm[berkdb] )
ncurses? (
@@ -43,7 +44,6 @@ RDEPEND="app-arch/bzip2
dev-tcltk/blt
dev-tcltk/tix
)
- xml? ( >=dev-libs/expat-2.1 )
)
!!<sys-apps/sandbox-2.6-r1"
DEPEND="${RDEPEND}
@@ -92,7 +92,7 @@ src_prepare() {
src_configure() {
if use build; then
# Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel
readline _sqlite3 _tkinter _elementtree pyexpat"
+ export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel
readline _sqlite3 _tkinter"
export PYTHON_DISABLE_SSL="1"
else
local disable
