dev-lang/python: Move readline dep outside 'ncurses?'

Move the dependency on readline to be independent of ncurses.  Looking
at the code, there is no apparent reason for putting it inside
'ncurses?' block.  Furthermore, it is inconsistent with how the readline
module build is controlled.

Closes: https://bugs.gentoo.org/401651

diff --git a/dev-lang/python/python-2.7.14-r1.ebuild b/dev-lang/python/python-2.7.14-r1.ebuild
index f5e6506189eecb96a00d62645a7f32c67bfe50b5..a392cbff39c4722a069d4436f9969832cb9c2a73 100644 (file)
--- a/dev-lang/python/python-2.7.14-r1.ebuild
+++ b/dev-lang/python/python-2.7.14-r1.ebuild
@@ -42,10 +42,8 @@ RDEPEND="app-arch/bzip2:0=
                sys-libs/db:4.2
        ) )
        gdbm? ( sys-libs/gdbm:0=[berkdb] )
-       ncurses? (
-               >=sys-libs/ncurses-5.2:0=
-               readline? ( >=sys-libs/readline-4.1:0= )
-       )
+       ncurses? ( >=sys-libs/ncurses-5.2:0= )
+       readline? ( >=sys-libs/readline-4.1:0= )
        sqlite? ( >=dev-db/sqlite-3.3.8:3= )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )

diff --git a/dev-lang/python/python-3.4.6-r1.ebuild b/dev-lang/python/python-3.4.6-r1.ebuild
index 0f6328d6030620dc1b1ca146c256e0b2896f4097..00a9bfb9c67bc48c0bcb572557f008271aab0e35 100644 (file)
--- a/dev-lang/python/python-3.4.6-r1.ebuild
+++ b/dev-lang/python/python-3.4.6-r1.ebuild
@@ -30,10 +30,8 @@ RDEPEND="app-arch/bzip2:0=
        virtual/libffi
        virtual/libintl
        gdbm? ( sys-libs/gdbm:0=[berkdb] )
-       ncurses? (
-               >=sys-libs/ncurses-5.2:0=
-               readline? ( >=sys-libs/readline-4.1:0= )
-       )
+       ncurses? ( >=sys-libs/ncurses-5.2:0= )
+       readline? ( >=sys-libs/readline-4.1:0= )
        sqlite? ( >=dev-db/sqlite-3.3.8:3= )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )

diff --git a/dev-lang/python/python-3.5.5.ebuild b/dev-lang/python/python-3.5.5.ebuild
index 06178c0f80bd3a3a2aeffcadb87416de42d3920f..481617f6b77b6348c5476f3bb159b9ea6379f15a 100644 (file)
--- a/dev-lang/python/python-3.5.5.ebuild
+++ b/dev-lang/python/python-3.5.5.ebuild
@@ -31,10 +31,8 @@ RDEPEND="app-arch/bzip2:0=
        virtual/libffi
        virtual/libintl
        gdbm? ( sys-libs/gdbm:0=[berkdb] )
-       ncurses? (
-               >=sys-libs/ncurses-5.2:0=
-               readline? ( >=sys-libs/readline-4.1:0= )
-       )
+       ncurses? ( >=sys-libs/ncurses-5.2:0= )
+       readline? ( >=sys-libs/readline-4.1:0= )
        sqlite? ( >=dev-db/sqlite-3.3.8:3= )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )

diff --git a/dev-lang/python/python-3.6.5.ebuild b/dev-lang/python/python-3.6.5.ebuild
index b658d6c9eaa28b3b44dc112509a5c6716bddb8f1..f99870740e26d17f5505c7f7dba5b76f17fa98aa 100644 (file)
--- a/dev-lang/python/python-3.6.5.ebuild
+++ b/dev-lang/python/python-3.6.5.ebuild
@@ -31,10 +31,8 @@ RDEPEND="app-arch/bzip2:0=
        virtual/libffi
        virtual/libintl
        gdbm? ( sys-libs/gdbm:0=[berkdb] )
-       ncurses? (
-               >=sys-libs/ncurses-5.2:0=
-               readline? ( >=sys-libs/readline-4.1:0= )
-       )
+       ncurses? ( >=sys-libs/ncurses-5.2:0= )
+       readline? ( >=sys-libs/readline-4.1:0= )
        sqlite? ( >=dev-db/sqlite-3.3.8:3= )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )