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

diff --git a/dev-lang/python/python-2.7.10.ebuild b/dev-lang/python/python-2.7.10.ebuild
index 00ff5c59242da458353d82e102b1cd58280cad6a..74ff08afc5ac4edbad4d405e0d59f203f0ad06e5 100644 (file)
--- 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 d87a47c409b1d11f6ace68841215f976f05f647f..a31a4475e30d35dffb7570b806acb2776b4fd11a 100644 (file)
--- 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 d44d70cd584e53a86f27ac9cb56ae7af6232b278..5c5df4c798b4381bb1e38034fdc20f4ceb4e20a4 100644 (file)
--- 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 f0f894a67d264da1d53f8631e9abadae3b87d243..109d4532db8990f6e9093b5379d8c044253e6e2b 100644 (file)
--- 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