Switch gen-kconfig to new framework

Also:
- Move companion_* to comp_* to match the kconfig symbols
- Replace bootstrap with former gen-versions.sh
- Fold *.in.2 into their respective first parts; this moves common
  options to the end - if it is undesirable, inclusion of *.in
  can be moved where *.in.2 used to be (but that will also move
  version selection after common options).
- Retire addToolVersion.sh (may later replace with a more
  comprehensive script that tries to download the added tarballs,
  copy the patches and try to apply them, and create a version.desc).

Signed-off-by: Alexey Neyman <stilor@att.net>

11 files changed, 0 insertions, 124 deletions

diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
deleted file mode 100644
index b894de9..0000000
--- a/config/companion_libs/cloog.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# CLooG options
-## depends on OBSOLETE
-
-# CLooG 0.18.4 requires ISL 0.12 or newer
-# CLooG 0.18.1/0.18.0 requires ISL 0.12 or older
-
-source "config/versions/cloog.in"
-
-config CLOOG_HAS_WITH_GMP_ISL_OSL
-	bool
-	default y if CLOOG_0_18_or_later
diff --git a/config/companion_libs/expat.in b/config/companion_libs/expat.in
deleted file mode 100644
index a2753a4..0000000
--- a/config/companion_libs/expat.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# expat config file
-
-source "config/versions/expat.in"
diff --git a/config/companion_libs/gettext.in b/config/companion_libs/gettext.in
deleted file mode 100644
index 4928ede..0000000
--- a/config/companion_libs/gettext.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# gettext options
-
-source "config/versions/gettext.in"
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in
deleted file mode 100644
index 28359cd..0000000
--- a/config/companion_libs/gmp.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# GMP options
-
-source "config/versions/gmp.in"
-
-config GMP_HAS_MPBSD
-    bool
-    default y if !GMP_5_1_or_later
diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in
deleted file mode 100644
index 9c74078..0000000
--- a/config/companion_libs/isl.in
+++ /dev/null
@@ -1,26 +0,0 @@
-# ISL options
-# FIXME these currently have no effect
-## select CLOOG_REQUIRE_0_18_1_or_older if !ISL_0_12_or_later
-## select CLOOG_REQUIRE_0_18_4_or_later if !ISL_0_14_or_older
-
-source "config/versions/isl.in"
-
-# FIXME should be auto-generated once companion libs are using gen-kconfig (and hence, ## syntax)
-config ISL_CLOOG_auto_select_1
-    def_bool y
-    depends on CLOOG_NEEDED && !ISL_0_12_or_later
-    select CLOOG_REQUIRE_0_18_1_or_older
-
-# FIXME should be auto-generated once companion libs are using gen-kconfig (and hence, ## syntax)
-config ISL_CLOOG_auto_select_2
-    def_bool y
-    depends on CLOOG_NEEDED && !ISL_0_13_or_older
-    select CLOOG_REQUIRE_0_18_4_or_later
-
-config ISL_NEEDS_WITH_GMP
-    bool
-    default y if !ISL_0_12_or_later
-
-config ISL_HAS_WITH_PIPLIB
-    bool
-    default y if !ISL_0_14_or_later
diff --git a/config/companion_libs/libelf.in b/config/companion_libs/libelf.in
deleted file mode 100644
index 5b268c1..0000000
--- a/config/companion_libs/libelf.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# libelf config file
-
-source "config/versions/libelf.in"
diff --git a/config/companion_libs/libiconv.in b/config/companion_libs/libiconv.in
deleted file mode 100644
index 99d3365..0000000
--- a/config/companion_libs/libiconv.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# libiconv options
-
-source "config/versions/libiconv.in"
diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in
deleted file mode 100644
index 790e755..0000000
--- a/config/companion_libs/mpc.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# MPC options
-
-source "config/versions/mpc.in"
diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in
deleted file mode 100644
index 5ed7ac8..0000000
--- a/config/companion_libs/mpfr.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# GMP options
-
-source "config/versions/mpfr.in"
diff --git a/config/companion_libs/ncurses.in b/config/companion_libs/ncurses.in
deleted file mode 100644
index 7087fbe..0000000
--- a/config/companion_libs/ncurses.in
+++ /dev/null
@@ -1,59 +0,0 @@
-# expat config file
-
-source "config/versions/ncurses.in"
-
-config NCURSES_NEW_ABI
-    bool "ncurses 6.0 ABI support"
-    depends on EXPERIMENTAL
-    help
-      This option allows you to use the new ncurses-6 ABI.
-      It's wise to leave this disabled and stick with the ncurses-5 ABI!
-
-config NCURSES_HOST_CONFIG_ARGS
-    string "Extra configure arguments for host ncurses"
-    help
-      Extra arguments that are passed verbatim to the configure when
-      building host ncurses.
-
-config NCURSES_HOST_DISABLE_DB
-    bool "Disable terminfo DB on the host"
-    default y
-    help
-      The terminfo database is not currently not installed on the host
-      as a part of the toolchain built by crosstool-ng.  This means the
-      library will not be able to use the terminals, unless that database
-      comes preinstalled.
-
-      Selecting this option allows one to embed some popular terminal
-      definitions into the library itself.
-
-      If not select, the path to the terminfo database on the host will
-      likely need to be passed as an argument to configure.
-
-config NCURSES_HOST_FALLBACKS
-    string "List of fallback terminals for the host"
-    default "linux,xterm,xterm-color,xterm-256color,vt100"
-    help
-      List of terminal descriptions that will be compiled into the curses
-      library for the host.
-
-config NCURSES_TARGET_CONFIG_ARGS
-    string "Extra configure arguments for target ncurses"
-    help
-      Extra arguments that are passed verbatim to the configure when
-      building target ncurses.
-
-config NCURSES_TARGET_DISABLE_DB
-    bool "Disable terminfo DB on the target"
-    default n
-    help
-      The terminfo database is installed with the terminfo database for the
-      target. If you want to configure ncurses with preselected terminals,
-      select Y here.
-
-config NCURSES_TARGET_FALLBACKS
-    string "List of fallback terminals for the target"
-    help
-      List of terminal descriptions that will be compiled into the curses
-      library for the target.
-
diff --git a/config/companion_libs/zlib.in b/config/companion_libs/zlib.in
deleted file mode 100644
index 70668e2..0000000
--- a/config/companion_libs/zlib.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# Zlib options
-
-source "config/versions/zlib.in"