From b6c4829483f69298a2cd83f02a44ef24680ebb2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 20 Apr 2018 23:37:56 +0200 Subject: [PATCH] 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 --- dev-lang/python/python-2.7.14-r1.ebuild | 6 ++---- dev-lang/python/python-3.4.6-r1.ebuild | 6 ++---- dev-lang/python/python-3.5.5.ebuild | 6 ++---- dev-lang/python/python-3.6.5.ebuild | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dev-lang/python/python-2.7.14-r1.ebuild b/dev-lang/python/python-2.7.14-r1.ebuild index f5e6506189eec..a392cbff39c47 100644 --- 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 0f6328d603062..00a9bfb9c67bc 100644 --- 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 06178c0f80bd3..481617f6b77b6 100644 --- 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 b658d6c9eaa28..f99870740e26d 100644 --- 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= )