package/python-*: drop redundant python || python3 dependencies

As discussed on the list:

http://lists.busybox.net/pipermail/buildroot/2014-November/112509.html

We currently have a mix of python packages explicitly depending on python ||
python3 in their Config.in and packages that don't.  As all python packages
are inside a python || python3 conditional in the main Config.in, the
explicit dependencies inside the package Config.in is redundant, so drop it
for consistency.

Automated using:

sed -i '/depends on BR2_PACKAGE_PYTHON.*PYTHON3/d' package/python-*/Config.in

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/python-bottle/Config.in b/package/python-bottle/Config.in
index 7b13c1d67397fe96faba5e56f3689246979ac347..f9b60ca724c738a9844dd5b73248c525d349b170 100644 (file)
--- a/package/python-bottle/Config.in
+++ b/package/python-bottle/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_BOTTLE
        bool "python-bottle"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        help
          Bottle is a fast, simple and lightweight WSGI micro web-framework
          for Python. It is distributed as a single file module and has no

diff --git a/package/python-cffi/Config.in b/package/python-cffi/Config.in
index f18ed96f60daeec2cedad8dd1552d0ef93867e63..9cbfcfbbb176f9fa686df559920227d3a14851a6 100644 (file)
--- a/package/python-cffi/Config.in
+++ b/package/python-cffi/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_CFFI
        bool "python-cffi"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        select BR2_PACKAGE_LIBFFI
        help
          This is the Foreign Function Interface for Python calling C

diff --git a/package/python-configshell-fb/Config.in b/package/python-configshell-fb/Config.in
index fb9676381138f216cc96c4690730ec6cbfd422c7..85f47a83bc3eb2e37ffb8179101a6bcbf3558287 100644 (file)
--- a/package/python-configshell-fb/Config.in
+++ b/package/python-configshell-fb/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB
        bool "python-configshell-fb"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        select BR2_PACKAGE_PYTHON_PYPARSING
        select BR2_PACKAGE_PYTHON3_READLINE if BR2_PACKAGE_PYTHON3
        select BR2_PACKAGE_PYTHON_READLINE if BR2_PACKAGE_PYTHON

diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in
index 064f0c947963a6580ef8413fac91d12c82e375fa..1d92873f82edf0cb79e924b70120bafa7834638f 100644 (file)
--- a/package/python-ipython/Config.in
+++ b/package/python-ipython/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_IPYTHON
        bool "python-ipython"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        help
          IPython is a command shell for interactive computing in multiple
          programming languages, originally developed for the Python

diff --git a/package/python-libconfig/Config.in b/package/python-libconfig/Config.in
index eae6cdafc84203b918e77d74c93aca94a7005716..7a49d9159d65a66cef7ec946ca4cb5bc1e48eabe 100644 (file)
--- a/package/python-libconfig/Config.in
+++ b/package/python-libconfig/Config.in
@@ -3,7 +3,6 @@ comment "python-libconfig needs a toolchain w/ C++, largefile, threads"
 
 config BR2_PACKAGE_PYTHON_LIBCONFIG
        bool "python-libconfig"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        select BR2_PACKAGE_BOOST
        select BR2_PACKAGE_BOOST_PYTHON
        select BR2_PACKAGE_LIBCONFIG

diff --git a/package/python-pyasn/Config.in b/package/python-pyasn/Config.in
index efdbbc59d627e0c24dbc344c2fe3be56f11a3f48..997b737f5b979ce9e41edb2ebf5c7c6fd4b2dc6c 100644 (file)
--- a/package/python-pyasn/Config.in
+++ b/package/python-pyasn/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PYASN
        bool "python-pyasn"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        depends on BR2_INSTALL_LIBSTDCPP
        select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
        select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON

diff --git a/package/python-pycrypto/Config.in b/package/python-pycrypto/Config.in
index fe545b5f6a1eedb9309e0e1e34d5a5fdc75e9b37..e998ecf89cba06c9147f4ddd873ad691a080bbba 100644 (file)
--- a/package/python-pycrypto/Config.in
+++ b/package/python-pycrypto/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PYCRYPTO
        bool "python-pycrypto"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        select BR2_PACKAGE_GMP
        help
          PyCrypto is a collection of cryptographic algorithms and

diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in
index 0408e5e44e25bb63da196717ab9f6d4209f1fe4c..b926286cc45daa5042e69d5cee4e9afde2eba972 100644 (file)
--- a/package/python-pyparsing/Config.in
+++ b/package/python-pyparsing/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PYPARSING
        bool "python-pyparsing"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        help
          The pyparsing module is an alternative approach to creating and
          executing simple grammars, vs. the traditional lex/yacc approach,

diff --git a/package/python-pysnmp-apps/Config.in b/package/python-pysnmp-apps/Config.in
index 8edd04c5531c292394a8c46ac6a35d7bc50ade3a..b032eba1fe2c05520b8ffa97784b46f344c362d9 100644 (file)
--- a/package/python-pysnmp-apps/Config.in
+++ b/package/python-pysnmp-apps/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PYSNMP_APPS
        bool "python-pysnmp-apps"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        select BR2_PACKAGE_PYTHON_PYSNMP
        depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn
        help

diff --git a/package/python-pysnmp-mibs/Config.in b/package/python-pysnmp-mibs/Config.in
index cc03676a3b29d5f3fb687b7ea3e9787a19e2e566..eca17d26aa092fac8f800c6156cef32ec92776bd 100644 (file)
--- a/package/python-pysnmp-mibs/Config.in
+++ b/package/python-pysnmp-mibs/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PYSNMP_MIBS
        bool "python-pysnmp-mibs"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        select BR2_PACKAGE_PYTHON_PYSNMP
        depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn
        help

diff --git a/package/python-pysnmp/Config.in b/package/python-pysnmp/Config.in
index 6cf18ee063250a9fa17d1f6112b51735a7607c8b..c7cdf3892d3f0b7cf98b60dcdb2b7893265d1463 100644 (file)
--- a/package/python-pysnmp/Config.in
+++ b/package/python-pysnmp/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PYSNMP
        bool "python-pysnmp"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        depends on BR2_INSTALL_LIBSTDCPP # pyasn
        select BR2_PACKAGE_PYTHON_PYASN
        select BR2_PACKAGE_PYTHON_PYCRYPTO

diff --git a/package/python-rtslib-fb/Config.in b/package/python-rtslib-fb/Config.in
index 119b63bf147383953ce3dd41161cd34fbab8f17e..42a610cc5e5b07fb3f857c90c18deb473be81300 100644 (file)
--- a/package/python-rtslib-fb/Config.in
+++ b/package/python-rtslib-fb/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_RTSLIB_FB
        bool "python-rtslib-fb"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        help
          rtslib-fb is an object-based Python library for configuring
          the LIO generic SCSI target, present in 3.x Linux kernel

diff --git a/package/python-serial/Config.in b/package/python-serial/Config.in
index 72f556756ab66b0cea146fc081f920baa9b9d6cc..09a4c39257beb019cf65955304a4bbaa6abe3343 100644 (file)
--- a/package/python-serial/Config.in
+++ b/package/python-serial/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_SERIAL
        bool "python-serial"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        help
          python-serial is a Python library to access serial ports.
 

diff --git a/package/python-urwid/Config.in b/package/python-urwid/Config.in
index 92f7d53d295f234753838b9a3e09fd3ace75a180..f584a9258d227a32b880193c8d9a7cd1dcfbcbe9 100644 (file)
--- a/package/python-urwid/Config.in
+++ b/package/python-urwid/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_URWID
        bool "python-urwid"
-       depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        help
          Urwid is a console user interface library for Python