Switch comp.libs/tools and debug to new framework.

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

360 files changed, 215 insertions, 1478 deletions

diff --git a/TODO b/TODO
index 58694c2..b48e54d 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,8 @@ A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic languag
 
 -- Alexey Neyman (@stilor)
 
+[ ] clean up GDB versions - no X.Y if X.Y.1 is present
+  [ ] Check other packages, leave only the most recent on each branch
 [ ] arm_neon.h - offer as a companion "library" for the target
 [ ] FreeBSD
   [ ] Use 'cc' rather than 'gcc' on the host
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 5e5cc67..089301c 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -5,19 +5,19 @@ comment "GNU binutils"
 source "config/versions/binutils.in"
 
 config BINUTILS_HAS_HASH_STYLE
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_GOLD
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_PLUGINS
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_PKGVERSION_BUGURL
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 # gold only suports the listed architectures
diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2
index f913355..29ae543 100644
--- a/config/binutils/binutils.in.2
+++ b/config/binutils/binutils.in.2
@@ -9,64 +9,7 @@ config ELF2FLT_REQUIRES
 
 comment "elf2flt"
 
-choice
-    bool
-    prompt "elf2flt version"
-
-config ELF2FLT_GIT
-    bool
-    prompt "git"
-    depends on CONFIGURE_has_git
-    help
-      Grab the latest version of elf2flt from the CVS repository
-
-config ELF2FLT_CUSTOM
-    bool
-    prompt "Custom elf2flt"
-    depends on EXPERIMENTAL || !CONFIGURE_has_git
-    help
-      The choosen elf2flt version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-endchoice
-
-if ELF2FLT_GIT
-
-config ELF2FLT_GIT_CSET
-    string
-    prompt "git cset"
-    default "6d80ab6c93409e796f85da404bde84b841231531"
-    help
-      Enter the git changeset to use.
-
-      The default currently points to the HEAD of the git tree.
-
-endif # ELF2FLT_GIT
-
-config ELF2FLT_VERSION
-    string
-    default ELF2FLT_GIT_CSET if ELF2FLT_GIT
-    default ELF2FLT_CUSTOM_VERSION if ELF2FLT_CUSTOM
-
-if ELF2FLT_CUSTOM
-
-config ELF2FLT_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom elf2flt source"
-    help
-      Enter the path to the directory or tarball of your source for elf2flt.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, elf2flt, and the version is set
-      below in the custom version string.
-
-config ELF2FLT_CUSTOM_VERSION
-    string
-    prompt "elf2flt custom version number"
-    help
-      Enter the version number for your custom elf2flt.
-
-endif # ELF2FLT_CUSTOM
+source "config/versions/elf2flt.in"
 
 config ELF2FLT_EXTRA_CONFIG_ARRAY
     string
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 427fc97..c0feaef 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -3,7 +3,7 @@
 ## default y
 ## select CC_SUPPORT_CXX if !LIBC_none
 ## select CC_SUPPORT_FORTRAN
-## select CC_SUPPORT_JAVA if !CC_GCC_6_or_later
+## select CC_SUPPORT_JAVA if !GCC_7_or_later
 ## select CC_SUPPORT_ADA
 ## select CC_SUPPORT_OBJC
 ## select CC_SUPPORT_OBJCXX
@@ -32,7 +32,7 @@ config CC_GCC_GOLD
     default y
 
 config CC_GCC_HAS_LIBMPX
-    depends on GCC_MS_5
+    depends on GCC_5_or_later
     bool
 
 config CC_LANG_JAVA_USE_ECJ
diff --git a/config/companion_libs.in b/config/companion_libs.in
index fae49ec..76ab0f9 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -122,43 +122,60 @@ config NCURSES_TARGET
 config ZLIB
     bool "Build local zlib"
 
+# FIXME this needs to have a list of options
+# [ ] libfoo for build
+# [ ] libfoo for host (if canadian)
+# [ ] libfoo for target
+#     libfoo options -->
+#
+# Then have other packages *set default* for build/host
+# (but not select, so that user can utilize build's or host's system library)
+# and *select* the target (so that we build it if we must, and let user optionally
+# build it if he wants). Upon any of these options LIBFOO_{BUILD,HOST,TARGET}
+# being set, set LIBFOO_ENABLED and use that as a qualifier for submenu.
+# For now, just have comments delineating the libs.
 if ZLIB
+comment "zlib options"
 source "config/companion_libs/zlib.in"
 endif
 if LIBICONV
+comment "libiconv options"
 source "config/companion_libs/libiconv.in"
 endif
 if GETTEXT
+comment "gettext options"
 source "config/companion_libs/gettext.in"
 endif
 if GMP
+comment "GMP options"
 source "config/companion_libs/gmp.in"
 endif
 if MPFR
+comment "MPFR options"
 source "config/companion_libs/mpfr.in"
 endif
 if ISL
+comment "ISL options"
 source "config/companion_libs/isl.in"
 endif
 if CLOOG
+comment "CLooG options"
 source "config/companion_libs/cloog.in"
 endif
 if MPC
+comment "MPC options"
 source "config/companion_libs/mpc.in"
 endif
 if LIBELF || LIBELF_TARGET
-comment "libelf version needed to build for target"
-    depends on !LIBELF
+comment "libelf options"
 source "config/companion_libs/libelf.in"
 endif
 if EXPAT || EXPAT_TARGET
-comment "expat version needed to build for target"
-    depends on !EXPAT
+comment "expat options"
 source "config/companion_libs/expat.in"
 endif
 if NCURSES || NCURSES_TARGET
-comment "ncurses version needed to build for target"
-    depends on !NCURSES
+comment "ncurses options"
 source "config/companion_libs/ncurses.in"
 endif
 
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
index 95b283c..3c92d52 100644
--- a/config/companion_libs/cloog.in
+++ b/config/companion_libs/cloog.in
@@ -1,51 +1,12 @@
 # CLooG options
 ## depends on OBSOLETE
 
+# TBD: encode these version requirements - how?
 # CLooG 0.18.4 requires ISL 0.12 or newer
 # CLooG 0.18.1/0.18.0 frequires ISL 0.12 or older
-choice
-    bool
-    prompt "CLooG version"
 
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
+source "config/versions/cloog.in"
 
-config CLOOG_V_0_18_4
-    bool
-    prompt "0.18.4"
-    depends on ISL_V_0_12_or_later
-    select CLOOG_0_18_4_or_later
-
-config CLOOG_V_0_18_1
-    bool
-    prompt "0.18.1 (OBSOLETE)"
-    depends on !ISL_V_0_14_or_later
-    depends on OBSOLETE
-    select CLOOG_0_18_or_later
-
-config CLOOG_V_0_18_0
-    bool
-    prompt "0.18.0 (OBSOLETE)"
-    depends on !ISL_V_0_14_or_later
-    depends on OBSOLETE
-    select CLOOG_0_18_or_later
-
-endchoice
-
-config CLOOG_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.18.4" if CLOOG_V_0_18_4
-    default "0.18.1" if CLOOG_V_0_18_1
-    default "0.18.0" if CLOOG_V_0_18_0
-
-config CLOOG_0_18_4_or_later
-    bool
-    select CLOOG_0_18_or_later
-
-config CLOOG_0_18_or_later
-    bool
-
-config CLOOG_NEEDS_AUTORECONF
-    bool
+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
index 4c2f2e2..a2753a4 100644
--- a/config/companion_libs/expat.in
+++ b/config/companion_libs/expat.in
@@ -1,25 +1,3 @@
 # expat config file
 
-choice
-    bool
-    prompt "expat version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config EXPAT_V_2_2_1
-    bool
-    prompt "2.2.1"
-
-config EXPAT_V_2_1_1
-    bool
-    prompt "2.1.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config EXPAT_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.2.1" if EXPAT_V_2_2_1
-    default "2.1.1" if EXPAT_V_2_1_1
+source "config/versions/expat.in"
diff --git a/config/companion_libs/gettext.in b/config/companion_libs/gettext.in
index d76955a..4928ede 100644
--- a/config/companion_libs/gettext.in
+++ b/config/companion_libs/gettext.in
@@ -1,25 +1,3 @@
 # gettext options
 
-choice
-    bool
-    prompt "gettext version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config GETTEXT_V_0_19_8_1
-    bool
-    prompt "0.19.8.1"
-
-config GETTEXT_V_0_19_7
-    bool
-    prompt "0.19.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config GETTEXT_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.19.8.1" if GETTEXT_V_0_19_8_1
-    default "0.19.7" if GETTEXT_V_0_19_7
+source "config/versions/gettext.in"
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in
index 167c772..28359cd 100644
--- a/config/companion_libs/gmp.in
+++ b/config/companion_libs/gmp.in
@@ -1,83 +1,7 @@
 # GMP options
 
-choice
-    bool
-    prompt "GMP version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config GMP_V_6_1_2
-    bool
-    prompt "6.1.2"
-    select GMP_5_0_2_or_later
-
-config GMP_V_6_1_0
-    bool
-    prompt "6.1.0 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_6_0_0
-    bool
-    prompt "6.0.0a (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_1_3
-    bool
-    prompt "5.1.3 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
+source "config/versions/gmp.in"
 
-config GMP_V_5_1_1
+config GMP_HAS_MPBSD
     bool
-    prompt "5.1.1 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_0_2
-    bool
-    prompt "5.0.2 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_0_1
-    bool
-    prompt "5.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_2
-    bool
-    prompt "4.3.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_1
-    bool
-    prompt "4.3.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_0
-    bool
-    prompt "4.3.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-# To disable --enable-mpbsd
-config GMP_5_0_2_or_later
-    bool
-
-config GMP_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "6.1.2" if GMP_V_6_1_2
-    default "6.1.0" if GMP_V_6_1_0
-    default "6.0.0a" if GMP_V_6_0_0
-    default "5.1.3" if GMP_V_5_1_3
-    default "5.1.1" if GMP_V_5_1_1
-    default "5.0.2" if GMP_V_5_0_2
-    default "5.0.1" if GMP_V_5_0_1
-    default "4.3.2" if GMP_V_4_3_2
-    default "4.3.1" if GMP_V_4_3_1
-    default "4.3.0" if GMP_V_4_3_0
+    default y if !GMP_5_1_or_later
diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in
index bb2766f..cf0fea8 100644
--- a/config/companion_libs/isl.in
+++ b/config/companion_libs/isl.in
@@ -1,92 +1,23 @@
 # ISL options
 
+# TBD need to encode this with new framework
 # GCC 4.8 supports ISL 0.10 to 0.14
 # GCC 4.9 supports ISL 0.10 to 0.15
 # GCC 5   supports ISL 0.12 to 0.16
 # GCC 6   supports ISL 0.14 to 0.16
+# GCC 7   supports ISL 0.15 and up
 # Starting with GCC 5, GCC's configure no longer checks the ISL version explicitly,
 # despite what the configure's message says ("checking for isl 0.15 or 0.16").
 # Instead, it verifies that certain interfaces are available, so it accepts 0.17.1
 # or 0.18 under that check. Include them as experimental just in case anyone needs
 # the bugfixes in these releases.
-choice
-    bool
-    prompt "ISL version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config ISL_V_0_18
-    bool
-    prompt "0.18"
-    depends on EXPERIMENTAL # Not officially recommended by GCC
-    depends on CC_GCC_5_or_later
-    select ISL_V_0_16_or_later
-
-config ISL_V_0_17_1
-    bool
-    prompt "0.17.1"
-    depends on EXPERIMENTAL # Not officially recommended by GCC
-    depends on CC_GCC_5_or_later
-    select ISL_V_0_16_or_later
-
-config ISL_V_0_16_1
-    bool
-    prompt "0.16.1"
-    depends on CC_GCC_5_or_later
-    select ISL_V_0_16_or_later
-
-# Linaro version of 4.9 does not support ISL 0.15, but most recent
-# mainline 4.9 release (4.9.4) does.
-config ISL_V_0_15
-    bool
-    prompt "0.15"
-    depends on CC_GCC_4_9_or_later
-    select ISL_V_0_15_or_later
-
-config ISL_V_0_14
-    bool
-    prompt "0.14 (OBSOLETE)"
-    select ISL_V_0_14_or_later
-    depends on OBSOLETE
-
-config ISL_V_0_12_2
-    bool
-    prompt "0.12.2 (OBSOLETE)"
-    depends on !CC_GCC_6_or_later
-    select ISL_V_0_12_or_later
-    depends on OBSOLETE
-
-config ISL_V_0_11_1
-    bool
-    prompt "0.11.1 (OBSOLETE)"
-    depends on !CC_GCC_4_9_or_later
-    depends on OBSOLETE
 
-endchoice
+source "config/versions/isl.in"
 
-config ISL_V_0_16_or_later
+config ISL_NEEDS_WITH_GMP
     bool
-    select ISL_V_0_15_or_later
+    default y if !ISL_0_12_or_later
 
-config ISL_V_0_15_or_later
+config ISL_HAS_WITH_PIPLIB
     bool
-    select ISL_V_0_14_or_later
-
-config ISL_V_0_14_or_later
-    bool
-    select ISL_V_0_12_or_later
-
-config ISL_V_0_12_or_later
-    bool
-
-config ISL_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.18" if ISL_V_0_18
-    default "0.17.1" if ISL_V_0_17_1
-    default "0.16.1" if ISL_V_0_16_1
-    default "0.15" if ISL_V_0_15
-    default "0.14" if ISL_V_0_14
-    default "0.12.2" if ISL_V_0_12_2
-    default "0.11.1" if ISL_V_0_11_1
+    default y if !ISL_0_14_or_later
diff --git a/config/companion_libs/libelf.in b/config/companion_libs/libelf.in
index b01ab36..5b268c1 100644
--- a/config/companion_libs/libelf.in
+++ b/config/companion_libs/libelf.in
@@ -1,25 +1,3 @@
 # libelf config file
 
-choice
-    bool
-    prompt "libelf version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBELF_V_0_8_13
-    bool
-    prompt "0.8.13"
-
-config LIBELF_V_0_8_12
-    bool
-    prompt "0.8.12 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config LIBELF_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.8.13" if LIBELF_V_0_8_13
-    default "0.8.12" if LIBELF_V_0_8_12
+source "config/versions/libelf.in"
diff --git a/config/companion_libs/libiconv.in b/config/companion_libs/libiconv.in
index d871681..99d3365 100644
--- a/config/companion_libs/libiconv.in
+++ b/config/companion_libs/libiconv.in
@@ -1,24 +1,3 @@
 # libiconv options
 
-choice
-    bool
-    prompt "libiconv version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBICONV_V_1_15
-    bool
-    prompt "1.15"
-
-config LIBICONV_V_1_14
-    bool
-    prompt "1.14"
-
-endchoice
-
-config LIBICONV_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.15" if LIBICONV_V_1_15
-    default "1.14" if LIBICONV_V_1_14
+source "config/versions/libiconv.in"
diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in
index cd8132d..790e755 100644
--- a/config/companion_libs/mpc.in
+++ b/config/companion_libs/mpc.in
@@ -1,61 +1,3 @@
 # MPC options
 
-choice
-    bool
-    prompt "MPC version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config MPC_V_1_0_3
-    bool
-    prompt "1.0.3"
-
-config MPC_V_1_0_2
-    bool
-    prompt "1.0.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_1_0_1
-    bool
-    prompt "1.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_1_0
-    bool
-    prompt "1.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_0_9
-    bool
-    prompt "0.9 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_0_8_2
-    bool
-    prompt "0.8.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_0_8_1
-    bool
-    prompt "0.8.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_0_7
-    bool
-    prompt "0.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config MPC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.0.3" if MPC_V_1_0_3
-    default "1.0.2" if MPC_V_1_0_2
-    default "1.0.1" if MPC_V_1_0_1
-    default "1.0" if MPC_V_1_0
-    default "0.9" if MPC_V_0_9
-    default "0.8.2" if MPC_V_0_8_2
-    default "0.8.1" if MPC_V_0_8_1
-    default "0.7" if MPC_V_0_7
+source "config/versions/mpc.in"
diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in
index ce33b3d..5ed7ac8 100644
--- a/config/companion_libs/mpfr.in
+++ b/config/companion_libs/mpfr.in
@@ -1,67 +1,3 @@
 # GMP options
 
-choice
-    bool
-    prompt "MPFR version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config MPFR_V_3_1_5
-    bool
-    prompt "3.1.5"
-
-config MPFR_V_3_1_3
-    bool
-    prompt "3.1.3 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_3_1_2
-    bool
-    prompt "3.1.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_3_1_0
-    bool
-    prompt "3.1.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_3_0_1
-    bool
-    prompt "3.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_3_0_0
-    bool
-    prompt "3.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_2_4_2
-    bool
-    prompt "2.4.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_2_4_1
-    bool
-    prompt "2.4.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_2_4_0
-    bool
-    prompt "2.4.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config MPFR_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "3.1.5" if MPFR_V_3_1_5
-    default "3.1.3" if MPFR_V_3_1_3
-    default "3.1.2" if MPFR_V_3_1_2
-    default "3.1.0" if MPFR_V_3_1_0
-    default "3.0.1" if MPFR_V_3_0_1
-    default "3.0.0" if MPFR_V_3_0_0
-    default "2.4.2" if MPFR_V_2_4_2
-    default "2.4.1" if MPFR_V_2_4_1
-    default "2.4.0" if MPFR_V_2_4_0
+source "config/versions/mpfr.in"
diff --git a/config/companion_libs/ncurses.in b/config/companion_libs/ncurses.in
index 68ecbb7..7087fbe 100644
--- a/config/companion_libs/ncurses.in
+++ b/config/companion_libs/ncurses.in
@@ -1,22 +1,6 @@
 # expat config file
 
-choice
-    bool
-    prompt "ncurses version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config NCURSES_V_6_0
-    bool
-    prompt "6.0"
-
-endchoice
-
-config NCURSES_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "6.0" if NCURSES_V_6_0
+source "config/versions/ncurses.in"
 
 config NCURSES_NEW_ABI
     bool "ncurses 6.0 ABI support"
diff --git a/config/companion_libs/zlib.in b/config/companion_libs/zlib.in
index df93682..70668e2 100644
--- a/config/companion_libs/zlib.in
+++ b/config/companion_libs/zlib.in
@@ -1,19 +1,3 @@
 # Zlib options
 
-choice
-    bool
-    prompt "zlib version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config ZLIB_V_1_2_11
-    bool
-    prompt "1.2.11"
-
-endchoice
-
-config ZLIB_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.2.11" if ZLIB_V_1_2_11
+source "config/versions/zlib.in"
diff --git a/config/companion_tools/autoconf.in b/config/companion_tools/autoconf.in
index b85e1f9..b49017d 100644
--- a/config/companion_tools/autoconf.in
+++ b/config/companion_tools/autoconf.in
@@ -4,26 +4,4 @@
 ## default y if !CONFIGURE_has_autoreconf_2_63_or_newer
 ## help Autoconf
 
-choice
-    bool
-    prompt "Autoconf version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config AUTOCONF_V_2_69
-    bool
-    prompt "2.69"
-
-config AUTOCONF_V_2_65
-    bool
-    prompt "2.65 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config AUTOCONF_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.69" if AUTOCONF_V_2_69
-    default "2.65" if AUTOCONF_V_2_65
+source "config/versions/autoconf.in"
diff --git a/config/companion_tools/automake.in b/config/companion_tools/automake.in
index 31d036b..455200e 100644
--- a/config/companion_tools/automake.in
+++ b/config/companion_tools/automake.in
@@ -3,38 +3,4 @@
 ## default y if !CONFIGURE_has_automake_1_15_or_newer
 ## help Automake
 
-choice
-    bool
-    prompt "Automake version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config AUTOMAKE_V_1_15
-    bool
-    prompt "1.15"
-
-config AUTOMAKE_V_1_14
-    bool
-    prompt "1.14 (OBSOLETE)"
-    depends on OBSOLETE
-
-config AUTOMAKE_V_1_11_6
-    bool
-    prompt "1.11.6 (OBSOLETE)"
-    depends on OBSOLETE
-
-config AUTOMAKE_V_1_11_1
-    bool
-    prompt "1.11.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config AUTOMAKE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.15" if AUTOMAKE_V_1_15
-    default "1.14" if AUTOMAKE_V_1_14
-    default "1.11.6" if AUTOMAKE_V_1_11_6
-    default "1.11.1" if AUTOMAKE_V_1_11_1
+source "config/versions/automake.in"
diff --git a/config/companion_tools/libtool.in b/config/companion_tools/libtool.in
index 5c14fa0..071b53e 100644
--- a/config/companion_tools/libtool.in
+++ b/config/companion_tools/libtool.in
@@ -2,22 +2,5 @@
 
 ## default y if !CONFIGURE_has_libtool_2_4_or_newer
 ## default y if !CONFIGURE_has_libtoolize_2_4_or_newer
-## help Libtool
 
-choice
-    bool
-    prompt "Libtool version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBTOOL_V_2_4_6
-    bool
-    prompt "2.4.6"
-
-endchoice
-
-config LIBTOOL_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.4.6" if LIBTOOL_V_2_4_6
+source "config/versions/libtool.in"
diff --git a/config/companion_tools/m4.in b/config/companion_tools/m4.in
index eb6a3d3..1a81a9f 100644
--- a/config/companion_tools/m4.in
+++ b/config/companion_tools/m4.in
@@ -1,34 +1,5 @@
 # GNU m4
 
 ## default y if !CONFIGURE_has_gnu_m4_1_4_12_or_newer
-## help GNU m4
 
-choice
-    bool
-    prompt "m4 version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config M4_V_1_4_18
-    bool
-    prompt "1.4.18"
-
-config M4_V_1_4_17
-    bool
-    prompt "1.4.17 (OBSOLETE)"
-    depends on OBSOLETE
-
-config M4_V_1_4_13
-    bool
-    prompt "1.4.13 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config M4_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.4.18" if M4_V_1_4_18
-    default "1.4.17" if M4_V_1_4_17
-    default "1.4.13" if M4_V_1_4_13
+source "config/versions/m4.in"
diff --git a/config/companion_tools/make.in b/config/companion_tools/make.in
index b6834a7..5c9cfb3 100644
--- a/config/companion_tools/make.in
+++ b/config/companion_tools/make.in
@@ -1,45 +1,10 @@
 # GNU make
 
 ## default y if !CONFIGURE_has_make_3_81_or_newer
-## help GNU make
 
-choice
-    bool
-    prompt "make version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config MAKE_V_4_2_1
-    bool
-    prompt "4.2.1"
-
-config MAKE_V_4_1
-    bool
-    prompt "4.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MAKE_V_4_0
-    bool
-    prompt "4.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MAKE_V_3_81
-    bool
-    prompt "3.81 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
+source "config/versions/make.in"
 
 config MAKE_GMAKE_SYMLINK
     bool
     prompt "Add gmake symlink to companion gnu/make"
     depends on COMP_TOOLS_make
-
-config MAKE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "4.2.1" if MAKE_V_4_2_1
-    default "4.1" if MAKE_V_4_1
-    default "4.0" if MAKE_V_4_0
-    default "3.81" if MAKE_V_3_81
diff --git a/config/debug/duma.in b/config/debug/duma.in
index f9e727b..6039a25 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -7,6 +7,8 @@
 ## help A memory bound checker, with additional features.
 ## help Formerly known as Electric Fence.
 
+source "config/versions/duma.in"
+
 config DUMA_SO
     bool
     prompt "Build a shared library"
@@ -18,21 +20,3 @@ config DUMA_CUSTOM_WRAPPER
     prompt "Install custom D.U.M.A wrapper"
     default y
     depends on DUMA_SO
-
-choice
-    bool
-    prompt "D.U.M.A. version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config DUMA_V_2_5_15
-    bool
-    prompt "2_5_15"
-
-endchoice
-
-config DUMA_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2_5_15" if DUMA_V_2_5_15
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index b1d101b..3fe486f 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -2,326 +2,20 @@
 
 ## help gdb is the GNU debugger
 
+source "config/versions/gdb.in"
+
 source "config/debug/gdb.in.cross"
 source "config/debug/gdb.in.native"
 source "config/debug/gdb.in.gdbserver"
 
-comment "gdb version"
-
-config GDB_CUSTOM
-    bool
-    prompt "Custom gdb"
-    depends on EXPERIMENTAL
-    select GDB_8_0_or_later
-    help
-      The choosen gdb version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if GDB_CUSTOM
-
-config GDB_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom gdb source"
-    help
-      Enter the path to the directory or tarball of your source for gcc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, gcc, and the version is set
-      below in the custom version string.
-
-config GDB_CUSTOM_VERSION
-    string
-    prompt "Custom GDB version"
-    help
-      Enter the version number for your custom gdb.
-
-config GDB_VERSION
-    string
-    default GDB_CUSTOM_VERSION
-
-endif # GDB_CUSTOM
-
-if ! GDB_CUSTOM
-
-config DEBUG_GDB_SHOW_LINARO
-    bool
-    prompt "Show Linaro versions"
-    depends on OBSOLETE
-    help
-      Linaro is maintaining some advanced/more stable/experimental versions
-      of gdb, especially for the ARM architecture.
-
-      Those versions have not been blessed by the gdb community (nor have they
-      been cursed either!), but they look to be pretty much stable, and even
-      more stable than the upstream versions. YMMV...
-
-      If you do not know what this Linaro stuff is, then simply say 'n' here,
-      and rest in peace. OTOH, if you know what you are doing, you will be
-      able to use and enjoy :-) the Linaro versions by saying 'y' here.
-
-      Linaro: http://www.linaro.org/
-
-choice
-    bool
-    prompt "gdb version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config GDB_V_8_0
-    bool
-    prompt "8.0"
-    select GDB_8_0_or_later
-
-config GDB_V_7_12_1
-    bool
-    prompt "7.12.1"
-    select GDB_7_12_or_later
-
-config GDB_V_7_11_1
-    bool
-    prompt "7.11.1"
-    select GDB_7_2_or_later
-
-config GDB_V_7_10_1
-    bool
-    prompt "7.10.1 (OBSOLETE)"
-    select GDB_7_2_or_later
-    depends on OBSOLETE
-
-config GDB_V_7_10
-    bool
-    prompt "7.10 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_9_1
-    bool
-    prompt "7.9.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_9
-    bool
-    prompt "7.9 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_8
-    bool
-    prompt "linaro-7.8-2014.09 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_8_2
-    bool
-    prompt "7.8.2 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-
-config GDB_V_7_8_1
-    bool
-    prompt "7.8.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_8
-    bool
-    prompt "7.8 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_7_1
-    bool
-    prompt "linaro-7.7.1-2014.06 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_7_1
-    bool
-    prompt "7.7.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_7
-    bool
-    prompt "linaro-7.7-2014.05 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_7
-    bool
-    prompt "7.7 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_6
-    bool
-    prompt "linaro-7.6.1-2013.10 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    select GDB_7_2_or_later
-
-config GDB_V_7_6_1
-    bool
-    prompt "7.6.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_5
-    bool
-    prompt "linaro-7.5-2012.12 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_5_1
-    bool
-    prompt "7.5.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_4
-    bool
-    prompt "linaro-7.4-2012.06 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_4_1
-    bool
-    prompt "7.4.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_4
-    bool
-    prompt "7.4 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_3
-    bool
-    prompt "linaro-7.3-2011.12 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_3_1
-    bool
-    prompt "7.3.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_3a
-    bool
-    prompt "7.3a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_2a
-    bool
-    prompt "7.2a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_1a
-    bool
-    prompt "7.1a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_7_0_1a
-    bool
-    prompt "7.0.1a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_7_0a
-    bool
-    prompt "7.0a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_6_8a
-    bool
-    prompt "6.8a (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-endif # ! GDB_CUSTOM
-
-config GDB_8_0_or_later
-    bool
-    select GDB_7_12_or_later
-
-config GDB_7_12_or_later
-    bool
-    select GDB_7_2_or_later
-
-config GDB_7_2_or_later
-    bool
-    select GDB_7_0_or_later
-
-config GDB_7_0_or_later
-    bool
-    select GDB_HAS_PKGVERSION_BUGURL
-    select GDB_HAS_PYTHON
-    select GDB_INSTALL_GDBINIT
-
 config GDB_HAS_PKGVERSION_BUGURL
     bool
+    default y if GDB_7_0_or_later
 
 config GDB_HAS_PYTHON
     bool
+    default y if GDB_7_0_or_later
 
 config GDB_INSTALL_GDBINIT
     bool
-
-# GDB 8.0 now requires C++ for build. GDB 7.12 offered a configure
-# switch to fall back to C.
-config GDB_TARGET_DISABLE_CXX_BUILD
-    def_bool y
-    depends on GDB_7_12_or_later && !GDB_8_0_or_later
-
-if ! GDB_CUSTOM
-
-config GDB_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "8.0" if GDB_V_8_0
-    default "7.12.1" if GDB_V_7_12_1
-    default "7.11.1" if GDB_V_7_11_1
-    default "7.10.1" if GDB_V_7_10_1
-    default "7.10" if GDB_V_7_10
-    default "7.9.1" if GDB_V_7_9_1
-    default "7.9" if GDB_V_7_9
-    default "7.8.2" if GDB_V_7_8_2
-    default "linaro-7.8-2014.09" if GDB_V_linaro_7_8
-    default "7.8.1" if GDB_V_7_8_1
-    default "7.8" if GDB_V_7_8
-    default "linaro-7.7.1-2014.06-1" if GDB_V_linaro_7_7_1
-    default "7.7.1" if GDB_V_7_7_1
-    default "linaro-7.7-2014.05" if GDB_V_linaro_7_7
-    default "7.7" if GDB_V_7_7
-    default "linaro-7.6.1-2013.10" if GDB_V_linaro_7_6
-    default "7.6.1" if GDB_V_7_6_1
-    default "linaro-7.5-2012.12" if GDB_V_linaro_7_5
-    default "7.5.1" if GDB_V_7_5_1
-    default "linaro-7.4-2012.06" if GDB_V_linaro_7_4
-    default "7.4.1" if GDB_V_7_4_1
-    default "7.4" if GDB_V_7_4
-    default "linaro-7.3-2011.12" if GDB_V_linaro_7_3
-    default "7.3.1" if GDB_V_7_3_1
-    default "7.3a" if GDB_V_7_3a
-    default "7.2a" if GDB_V_7_2a
-    default "7.1a" if GDB_V_7_1a
-    default "7.0.1a" if GDB_V_7_0_1a
-    default "7.0a" if GDB_V_7_0a
-    default "6.8a" if GDB_V_6_8a
-
-endif # ! GDB_CUSTOM
+    default y if GDB_7_0_or_later
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index fab6b81..cb511a4 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -8,33 +8,11 @@
 ## help the executed process and the signals which are received by that process.
 ## help It can also intercept and print the system calls executed by the program.
 
-choice
-    bool
-    prompt "ltrace version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LTRACE_V_0_7_3
-    bool
-    prompt "0.7.3"
-
-config LTRACE_V_0_5_3
-    bool
-    prompt "0.5.3 (OBSOLETE)"
-    depends on OBSOLETE
-    select LTRACE_0_5_3_CONFIGURE
-
-endchoice
-
-config LTRACE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.7.3" if LTRACE_V_0_7_3
-    default "0.5.3" if LTRACE_V_0_5_3
+source "config/versions/ltrace.in"
 
 # Ltrace 0.5.3 had a unique hand-crafted configure script that has to be
 # run differently from any preceding or following releases. This serves
 # as a reminder to remove that code once 0.5.3 support is dropped.
 config LTRACE_0_5_3_CONFIGURE
     bool
+    default y if LTRACE_V_0_5_3
diff --git a/config/debug/strace.in b/config/debug/strace.in
index e77702b..8062d15 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -2,97 +2,4 @@
 
 ## depends on ! LIBC_bionic
 
-choice
-    bool
-    prompt "strace version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config STRACE_V_4_16
-    bool
-    prompt "4.16"
-
-config STRACE_V_4_15
-    bool
-    prompt "4.15"
-
-config STRACE_V_4_14
-    bool
-    prompt "4.14 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_13
-    bool
-    prompt "4.13 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_12
-    bool
-    prompt "4.12 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_11
-    bool
-    prompt "4.11 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_10
-    bool
-    prompt "4.10 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_9
-    bool
-    prompt "4.9 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_8
-    bool
-    prompt "4.8 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_7
-    bool
-    prompt "4.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_6
-    bool
-    prompt "4.6 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_20
-    bool
-    prompt "4.5.20 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_19
-    bool
-    prompt "4.5.19 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_18
-    bool
-    prompt "4.5.18 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config STRACE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "4.16" if STRACE_V_4_16
-    default "4.15" if STRACE_V_4_15
-    default "4.14" if STRACE_V_4_14
-    default "4.13" if STRACE_V_4_13
-    default "4.12" if STRACE_V_4_12
-    default "4.11" if STRACE_V_4_11
-    default "4.10" if STRACE_V_4_10
-    default "4.9" if STRACE_V_4_9
-    default "4.8" if STRACE_V_4_8
-    default "4.7" if STRACE_V_4_7
-    default "4.6" if STRACE_V_4_6
-    default "4.5.20" if STRACE_V_4_5_20
-    default "4.5.19" if STRACE_V_4_5_19
-    default "4.5.18" if STRACE_V_4_5_18
+source "config/versions/strace.in"
diff --git a/maintainer/gen-kconfig.sh b/maintainer/gen-kconfig.sh
index 364844d..4066fbb 100755
--- a/maintainer/gen-kconfig.sh
+++ b/maintainer/gen-kconfig.sh
@@ -106,7 +106,6 @@ gen_choice() {
         if [ -f "${file}.2" ]; then
             printf '\n'
             printf 'if %s_%s\n' "${cfg_prefix}" "${_entry}"
-            printf 'comment "%s other options"\n' "${entry}"
             printf 'source "%s.2"\n' "${file}"
             printf 'endif\n'
         fi
diff --git a/maintainer/gen-versions.sh b/maintainer/gen-versions.sh
index 83a2eb5..726251f 100755
--- a/maintainer/gen-versions.sh
+++ b/maintainer/gen-versions.sh
@@ -186,8 +186,8 @@ run_template()
 config_dir=config/versions
 template=maintainer/kconfig-versions.template
 
-declare -A pkg_forks pkg_milestones
-declare -a pkg_masters pkg_nforks pkg_all
+declare -A pkg_forks pkg_milestones pkg_nforks
+declare -a pkg_masters pkg_all
 
 # Convert the argument to a Kconfig-style macro
 kconfigize()
@@ -385,7 +385,7 @@ find_forks()
     else
         pkg_nforks[${1}]=$[pkg_nforks[${1}]+1]
         pkg_forks[${1}]="${1}${pkg_forks[${1}]}"
-	pkg_milestones[${1}]=`sort_versions ${info[milestones]}`
+        pkg_milestones[${1}]=`sort_versions ${info[milestones]}`
         pkg_masters+=( "${1}" )
     fi
 }
@@ -406,10 +406,13 @@ enter_fork()
     # Set defaults
     info[obsolete]=
     info[experimental]=
+    info[repository]=
+    info[repository_cset]=HEAD
+    info[fork]=${fork}
+    info[name]=${fork}
 
     eval `read_package_desc ${fork}`
 
-    info[name]=${fork}
     info[pfx]=`kconfigize ${fork}`
     info[originpfx]=`kconfigize ${info[origin]}`
     if [ -r "packages/${info[origin]}.help" ]; then
@@ -455,6 +458,10 @@ set_latest_milestone()
 
 enter_version()
 {
+    local -A ver_postfix=( \
+        [,yes,,]=" (OBSOLETE)" \
+        [,,yes,]=" (EXPERIMENTAL)" \
+        [,yes,yes,]=" (OBSOLETE,EXPERIMENTAL)" )
     local version="${1}"
     local tmp milestone
 
@@ -462,9 +469,11 @@ enter_version()
     info[obsolete]=
     info[experimental]=
 
-    eval `read_version_desc ${info[name]} ${version}`
+    eval `read_version_desc ${info[fork]} ${version}`
     info[ver]=${version}
     info[kcfg]=`kconfigize ${version}`
+    info[ver_postfix]=${ver_postfix[,${info[obsolete]},${info[experimental]},]}
+
     # TBD do we need "prev" version?
     tmp=" ${info[all_versions]} "
     tmp=${tmp##* ${version} }
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 9a04f57..c6d001e 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -1,8 +1,8 @@
 #
 # DO NOT EDIT! This file is automatically generated.
 #
-
 #!if [ "@@nforks@@" -ge 2 ]
+
 choice
 	bool "Show @@master@@ versions from"
 
@@ -90,7 +90,7 @@ config @@pfx@@_DEVEL_BRANCH
 
 config @@pfx@@_DEVEL_REVISION
 	string "Revision/changeset"
-	default "HEAD"
+	default "@@repository_cset@@"
 	help
 	  Commit ID or revision ID to check out.
 
@@ -106,12 +106,13 @@ config @@pfx@@_CUSTOM_LOCATION
 
 endif
 
+#!if [ -n "@@all_versions@@" ]
 choice
 	bool "Version of @@name@@"
 
 #!foreach version
 config @@pfx@@_V_@@kcfg@@
-	bool "@@ver@@"
+	bool "@@ver@@@@ver_postfix@@"
 #!if [ "@@obsolete@@" = "yes" ]
 	depends on OBSOLETE
 #!end-if
@@ -119,11 +120,12 @@ config @@pfx@@_V_@@kcfg@@
 	depends on EXPERIMENTAL
 #!end-if
 #!if [ -n "@@milestone@@" ]
-	select @@masterpfx@@_MS_@@milestone@@
+	select @@masterpfx@@_@@milestone@@_or_later
 #!end-if
 
 #!end-foreach
 endchoice
+#!end-if
 
 #!if [ "@@nforks@@" -ge 2 ]
 endif
@@ -139,10 +141,10 @@ config @@pfx@@_VERSION
 #!end-foreach
 
 #!foreach milestone
-config @@masterpfx@@_MS_@@ms_kcfg@@
+config @@masterpfx@@_@@ms_kcfg@@_or_later
 	bool
 #!if [ -n "@@ms_prev@@" ]
-	select @@masterpfx@@_MS_@@ms_prev@@
+	select @@masterpfx@@_@@ms_prev@@_or_later
 #!end-if
 
 #!end-foreach
diff --git a/packages/autoconf/2.65/version.desc b/packages/autoconf/2.65/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/autoconf/2.65/version.desc
diff --git a/packages/autoconf/2.69/version.desc b/packages/autoconf/2.69/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/autoconf/2.69/version.desc
diff --git a/packages/autoconf/package.desc b/packages/autoconf/package.desc
new file mode 100644
index 0000000..bfec125
--- /dev/null
+++ b/packages/autoconf/package.desc
@@ -0,0 +1 @@
+repository="git git://git.sv.gnu.org/autoconf"
diff --git a/packages/autoconf/version.desc b/packages/autoconf/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/autoconf/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/automake/1.11.1/version.desc b/packages/automake/1.11.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/automake/1.11.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/automake/1.11.6/version.desc b/packages/automake/1.11.6/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/automake/1.11.6/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/automake/1.14/version.desc b/packages/automake/1.14/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/automake/1.14/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/automake/1.15/version.desc b/packages/automake/1.15/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/automake/1.15/version.desc
diff --git a/packages/automake/package.desc b/packages/automake/package.desc
new file mode 100644
index 0000000..ba73596
--- /dev/null
+++ b/packages/automake/package.desc
@@ -0,0 +1 @@
+repository="git https://git.savannah.gnu.org/git/automake.git"
diff --git a/packages/cloog/0.18.0/version.desc b/packages/cloog/0.18.0/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/cloog/0.18.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/cloog/0.18.1/version.desc b/packages/cloog/0.18.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/cloog/0.18.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/cloog/0.18.4/version.desc b/packages/cloog/0.18.4/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/cloog/0.18.4/version.desc
diff --git a/packages/cloog/package.desc b/packages/cloog/package.desc
new file mode 100644
index 0000000..c5b98b7
--- /dev/null
+++ b/packages/cloog/package.desc
@@ -0,0 +1,3 @@
+name="CLooG"
+repository="git git://repo.or.cz/cloog.git"
+milestones="0.18"
diff --git a/patches/duma/2_5_15/100-cross-compile.patch b/packages/duma/2_5_15/100-cross-compile.patch
index cc95160..cc95160 100644
--- a/patches/duma/2_5_15/100-cross-compile.patch
+++ b/packages/duma/2_5_15/100-cross-compile.patch
diff --git a/patches/duma/2_5_15/110-separate_cpp.patch b/packages/duma/2_5_15/110-separate_cpp.patch
index 4bbccc7..4bbccc7 100644
--- a/patches/duma/2_5_15/110-separate_cpp.patch
+++ b/packages/duma/2_5_15/110-separate_cpp.patch
diff --git a/patches/duma/2_5_15/200-cpp11-new-operator.patch b/packages/duma/2_5_15/200-cpp11-new-operator.patch
index 900333e..900333e 100644
--- a/patches/duma/2_5_15/200-cpp11-new-operator.patch
+++ b/packages/duma/2_5_15/200-cpp11-new-operator.patch
diff --git a/packages/duma/2_5_15/version.desc b/packages/duma/2_5_15/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/duma/2_5_15/version.desc
diff --git a/packages/duma/package.desc b/packages/duma/package.desc
new file mode 100644
index 0000000..a48afdd
--- /dev/null
+++ b/packages/duma/package.desc
@@ -0,0 +1 @@
+repository="cvs :pserver:anonymous@duma.cvs.sourceforge.net:/cvsroot/duma"
diff --git a/packages/elf2flt/package.desc b/packages/elf2flt/package.desc
new file mode 100644
index 0000000..a3b9dc2
--- /dev/null
+++ b/packages/elf2flt/package.desc
@@ -0,0 +1,2 @@
+repository="git https://github.com/uclinux-dev/elf2flt.git"
+repository_cset="6d80ab6c93409e796f85da404bde84b841231531"
diff --git a/packages/expat/2.1.1/version.desc b/packages/expat/2.1.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/expat/2.1.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/expat/2.2.1/version.desc b/packages/expat/2.2.1/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/expat/2.2.1/version.desc
diff --git a/packages/expat/package.desc b/packages/expat/package.desc
new file mode 100644
index 0000000..f9e53c6
--- /dev/null
+++ b/packages/expat/package.desc
@@ -0,0 +1 @@
+repository="git https://github.com/libexpat/libexpat.git"
diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc
index ce6c216..81afb5b 100644
--- a/packages/gcc/package.desc
+++ b/packages/gcc/package.desc
@@ -1,4 +1,4 @@
 repository="svn svn://gcc.gnu.org/svn/gcc"
 download_url="TBD other mirrors ftp://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.${format}"
 origin="GNU"
-milestones="5"
+milestones="4.8 4.9 5 6 7"
diff --git a/packages/gdb-linaro/7.3-2011.12/version.desc b/packages/gdb-linaro/7.3-2011.12/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb-linaro/7.3-2011.12/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb-linaro/7.4-2012.06/version.desc b/packages/gdb-linaro/7.4-2012.06/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb-linaro/7.4-2012.06/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb-linaro/7.5-2012.12/version.desc b/packages/gdb-linaro/7.5-2012.12/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb-linaro/7.5-2012.12/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb-linaro/7.6.1-2013.10/version.desc b/packages/gdb-linaro/7.6.1-2013.10/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb-linaro/7.6.1-2013.10/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb-linaro/7.7-2014.05/version.desc b/packages/gdb-linaro/7.7-2014.05/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb-linaro/7.7-2014.05/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb-linaro/7.7.1-2014.06-1/version.desc b/packages/gdb-linaro/7.7.1-2014.06-1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb-linaro/7.7.1-2014.06-1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb-linaro/7.8-2014.09/version.desc b/packages/gdb-linaro/7.8-2014.09/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb-linaro/7.8-2014.09/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb-linaro/package.desc b/packages/gdb-linaro/package.desc
new file mode 100644
index 0000000..1b9bd68
--- /dev/null
+++ b/packages/gdb-linaro/package.desc
@@ -0,0 +1,5 @@
+master="gdb"
+repository="git https://git.linaro.org/toolchain/binutils-gdb.git"
+download="TBD"
+origin="Linaro"
+experimental="yes"
diff --git a/patches/gdb/6.8a/100-dwarf-stack-overflow.patch b/packages/gdb/6.8a/100-dwarf-stack-overflow.patch
index 344d5a3..344d5a3 100644
--- a/patches/gdb/6.8a/100-dwarf-stack-overflow.patch
+++ b/packages/gdb/6.8a/100-dwarf-stack-overflow.patch
diff --git a/patches/gdb/6.8a/110-security-errata-20050610.patch b/packages/gdb/6.8a/110-security-errata-20050610.patch
index 27e8174..27e8174 100644
--- a/patches/gdb/6.8a/110-security-errata-20050610.patch
+++ b/packages/gdb/6.8a/110-security-errata-20050610.patch
diff --git a/patches/gdb/6.8a/120-tdep-opcode-include-workaround.patch b/packages/gdb/6.8a/120-tdep-opcode-include-workaround.patch
index 61fdef4..61fdef4 100644
--- a/patches/gdb/6.8a/120-tdep-opcode-include-workaround.patch
+++ b/packages/gdb/6.8a/120-tdep-opcode-include-workaround.patch
diff --git a/patches/gdb/6.8a/130-reg-no-longer-active.patch b/packages/gdb/6.8a/130-reg-no-longer-active.patch
index 1c7e7e0..1c7e7e0 100644
--- a/patches/gdb/6.8a/130-reg-no-longer-active.patch
+++ b/packages/gdb/6.8a/130-reg-no-longer-active.patch
diff --git a/patches/gdb/6.8a/140-sim-ppc-have-config-h.patch b/packages/gdb/6.8a/140-sim-ppc-have-config-h.patch
index f3723b5..f3723b5 100644
--- a/patches/gdb/6.8a/140-sim-ppc-have-config-h.patch
+++ b/packages/gdb/6.8a/140-sim-ppc-have-config-h.patch
diff --git a/patches/gdb/6.8a/150-handle-stpcpy-define.patch b/packages/gdb/6.8a/150-handle-stpcpy-define.patch
index 88d703f..88d703f 100644
--- a/patches/gdb/6.8a/150-handle-stpcpy-define.patch
+++ b/packages/gdb/6.8a/150-handle-stpcpy-define.patch
diff --git a/packages/gdb/6.8a/version.desc b/packages/gdb/6.8a/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/6.8a/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gdb/7.0a/100-sim-ppc-have-config-h.patch b/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch
index f3723b5..f3723b5 100644
--- a/patches/gdb/7.0a/100-sim-ppc-have-config-h.patch
+++ b/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch
diff --git a/packages/gdb/7.0.1a/version.desc b/packages/gdb/7.0.1a/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.0.1a/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gdb/7.0.1a/100-sim-ppc-have-config-h.patch b/packages/gdb/7.0a/100-sim-ppc-have-config-h.patch
index f3723b5..f3723b5 100644
--- a/patches/gdb/7.0.1a/100-sim-ppc-have-config-h.patch
+++ b/packages/gdb/7.0a/100-sim-ppc-have-config-h.patch
diff --git a/packages/gdb/7.0a/version.desc b/packages/gdb/7.0a/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.0a/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gdb/8.0/100-musl_fix.patch b/packages/gdb/7.10.1/100-musl_fix.patch
index c0c1e0a..c0c1e0a 100644
--- a/patches/gdb/8.0/100-musl_fix.patch
+++ b/packages/gdb/7.10.1/100-musl_fix.patch
diff --git a/patches/gdb/7.10/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch b/packages/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
index 1182a45..1182a45 100644
--- a/patches/gdb/7.10/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
+++ b/packages/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
diff --git a/patches/gdb/8.0/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..982bd7f 100644
--- a/patches/gdb/8.0/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch
diff --git a/patches/gdb/8.0/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch
index 506a57c..506a57c 100644
--- a/patches/gdb/8.0/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch
diff --git a/packages/gdb/7.10.1/version.desc b/packages/gdb/7.10.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.10.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gdb/7.10/10-setns-handling.patch b/packages/gdb/7.10/10-setns-handling.patch
index e2647ad..e2647ad 100644
--- a/patches/gdb/7.10/10-setns-handling.patch
+++ b/packages/gdb/7.10/10-setns-handling.patch
diff --git a/patches/gdb/7.12.1/100-musl_fix.patch b/packages/gdb/7.10/100-musl_fix.patch
index c0c1e0a..c0c1e0a 100644
--- a/patches/gdb/7.12.1/100-musl_fix.patch
+++ b/packages/gdb/7.10/100-musl_fix.patch
diff --git a/patches/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch b/packages/gdb/7.10/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
index 1182a45..1182a45 100644
--- a/patches/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
+++ b/packages/gdb/7.10/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
diff --git a/patches/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.10/111-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..982bd7f 100644
--- a/patches/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.10/111-xtensa-make-sure-ar_base-is-initialized.patch
diff --git a/patches/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.10/112-WIP-end-of-prologue-detection-hack.patch
index 506a57c..506a57c 100644
--- a/patches/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.10/112-WIP-end-of-prologue-detection-hack.patch
diff --git a/packages/gdb/7.10/version.desc b/packages/gdb/7.10/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.10/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gdb/7.11.1/100-musl_fix.patch b/packages/gdb/7.11.1/100-musl_fix.patch
index c0c1e0a..c0c1e0a 100644
--- a/patches/gdb/7.11.1/100-musl_fix.patch
+++ b/packages/gdb/7.11.1/100-musl_fix.patch
diff --git a/patches/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch
index ff59907..ff59907 100644
--- a/patches/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch
diff --git a/patches/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..982bd7f 100644
--- a/patches/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch
diff --git a/patches/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch
index 506a57c..506a57c 100644
--- a/patches/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch
diff --git a/packages/gdb/7.11.1/version.desc b/packages/gdb/7.11.1/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/gdb/7.11.1/version.desc
diff --git a/patches/gdb/7.10/100-musl_fix.patch b/packages/gdb/7.12.1/100-musl_fix.patch
index c0c1e0a..c0c1e0a 100644
--- a/patches/gdb/7.10/100-musl_fix.patch
+++ b/packages/gdb/7.12.1/100-musl_fix.patch
diff --git a/patches/gdb/8.0/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch
index cd7a4c6..cd7a4c6 100644
--- a/patches/gdb/8.0/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch
diff --git a/patches/gdb/7.10/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..982bd7f 100644
--- a/patches/gdb/7.10/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch
diff --git a/patches/gdb/7.10/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch
index 506a57c..506a57c 100644
--- a/patches/gdb/7.10/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch
diff --git a/patches/gdb/8.0/200-allow-android.patch b/packages/gdb/7.12.1/200-allow-android.patch
index 7954477..7954477 100644
--- a/patches/gdb/8.0/200-allow-android.patch
+++ b/packages/gdb/7.12.1/200-allow-android.patch
diff --git a/packages/gdb/7.12.1/version.desc b/packages/gdb/7.12.1/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/gdb/7.12.1/version.desc
diff --git a/packages/gdb/7.1a/version.desc b/packages/gdb/7.1a/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.1a/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gdb/7.2a/100-sim-ppc-lz-fix.patch b/packages/gdb/7.2a/100-sim-ppc-lz-fix.patch
index 6f08ef8..6f08ef8 100644
--- a/patches/gdb/7.2a/100-sim-ppc-lz-fix.patch
+++ b/packages/gdb/7.2a/100-sim-ppc-lz-fix.patch
diff --git a/packages/gdb/7.2a/version.desc b/packages/gdb/7.2a/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.2a/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.3.1/version.desc b/packages/gdb/7.3.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.3.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.3a/version.desc b/packages/gdb/7.3a/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.3a/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gdb/7.4.1/00_all_ptrace_setsiginfo.patch b/packages/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
index 81a92db..81a92db 100644
--- a/patches/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
+++ b/packages/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
diff --git a/patches/gdb/7.4.1/05_all_readline-headers.patch b/packages/gdb/7.4.1/05_all_readline-headers.patch
index e65adf6..e65adf6 100644
--- a/patches/gdb/7.4.1/05_all_readline-headers.patch
+++ b/packages/gdb/7.4.1/05_all_readline-headers.patch
diff --git a/packages/gdb/7.4.1/version.desc b/packages/gdb/7.4.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.4.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.4/version.desc b/packages/gdb/7.4/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.4/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.5.1/version.desc b/packages/gdb/7.5.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.5.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.6.1/version.desc b/packages/gdb/7.6.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.6.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.7.1/version.desc b/packages/gdb/7.7.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.7.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.7/version.desc b/packages/gdb/7.7/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.8.1/version.desc b/packages/gdb/7.8.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.8.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.8/version.desc b/packages/gdb/7.8/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.9.1/version.desc b/packages/gdb/7.9.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.9.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gdb/7.9/version.desc b/packages/gdb/7.9/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gdb/7.9/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gdb/7.10.1/100-musl_fix.patch b/packages/gdb/8.0/100-musl_fix.patch
index c0c1e0a..c0c1e0a 100644
--- a/patches/gdb/7.10.1/100-musl_fix.patch
+++ b/packages/gdb/8.0/100-musl_fix.patch
diff --git a/patches/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/8.0/101-uclibc-no-gettimeofday-clobber.patch
index cd7a4c6..cd7a4c6 100644
--- a/patches/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/8.0/101-uclibc-no-gettimeofday-clobber.patch
diff --git a/patches/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/8.0/111-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..982bd7f 100644
--- a/patches/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/8.0/111-xtensa-make-sure-ar_base-is-initialized.patch
diff --git a/patches/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/8.0/112-WIP-end-of-prologue-detection-hack.patch
index 506a57c..506a57c 100644
--- a/patches/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/8.0/112-WIP-end-of-prologue-detection-hack.patch
diff --git a/patches/gdb/7.12.1/200-allow-android.patch b/packages/gdb/8.0/200-allow-android.patch
index 7954477..7954477 100644
--- a/patches/gdb/7.12.1/200-allow-android.patch
+++ b/packages/gdb/8.0/200-allow-android.patch
diff --git a/packages/gdb/8.0/version.desc b/packages/gdb/8.0/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/gdb/8.0/version.desc
diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc
new file mode 100644
index 0000000..4753dc1
--- /dev/null
+++ b/packages/gdb/package.desc
@@ -0,0 +1,3 @@
+origin="GNU"
+repository="git ssh://sourceware.org/git/binutils-gdb.git"
+milestones="7.0 7.2"
diff --git a/patches/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch
index dacdfb1..dacdfb1 100644
--- a/patches/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch
+++ b/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch
diff --git a/patches/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
index 4624cb5..4624cb5 100644
--- a/patches/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
+++ b/packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
diff --git a/patches/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
index 3487302..3487302 100644
--- a/patches/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
+++ b/packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
diff --git a/patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch b/packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch
index 7f980ac..7f980ac 100644
--- a/patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch
+++ b/packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch
diff --git a/patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch b/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch
index caaf0a0..caaf0a0 100644
--- a/patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch
+++ b/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch
diff --git a/packages/gettext/0.19.7/version.desc b/packages/gettext/0.19.7/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gettext/0.19.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch
index dacdfb1..dacdfb1 100644
--- a/patches/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch
+++ b/packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch
diff --git a/patches/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
index 8c6b94f..8c6b94f 100644
--- a/patches/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
+++ b/packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
diff --git a/patches/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
index 3487302..3487302 100644
--- a/patches/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
+++ b/packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
diff --git a/packages/gettext/0.19.8.1/version.desc b/packages/gettext/0.19.8.1/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/gettext/0.19.8.1/version.desc
diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc
new file mode 100644
index 0000000..6554419
--- /dev/null
+++ b/packages/gettext/package.desc
@@ -0,0 +1 @@
+repository="git https://git.savannah.gnu.org/git/gettext.git"
diff --git a/patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch b/packages/gmp/4.3.0/100-multiplicity-that-does-not-fit-an-int.patch
index f60e88f..f60e88f 100644
--- a/patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
+++ b/packages/gmp/4.3.0/100-multiplicity-that-does-not-fit-an-int.patch
diff --git a/patches/gmp/4.3.1/110-unbounded-alloc.patch b/packages/gmp/4.3.0/110-unbounded-alloc.patch
index 78e0588..78e0588 100644
--- a/patches/gmp/4.3.1/110-unbounded-alloc.patch
+++ b/packages/gmp/4.3.0/110-unbounded-alloc.patch
diff --git a/packages/gmp/4.3.0/version.desc b/packages/gmp/4.3.0/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/4.3.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gmp/4.3.0/100-multiplicity-that-does-not-fit-an-int.patch b/packages/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
index f60e88f..f60e88f 100644
--- a/patches/gmp/4.3.0/100-multiplicity-that-does-not-fit-an-int.patch
+++ b/packages/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
diff --git a/patches/gmp/4.3.0/110-unbounded-alloc.patch b/packages/gmp/4.3.1/110-unbounded-alloc.patch
index 78e0588..78e0588 100644
--- a/patches/gmp/4.3.0/110-unbounded-alloc.patch
+++ b/packages/gmp/4.3.1/110-unbounded-alloc.patch
diff --git a/packages/gmp/4.3.1/version.desc b/packages/gmp/4.3.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/4.3.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gmp/4.3.2/version.desc b/packages/gmp/4.3.2/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/4.3.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gmp/5.0.1/100-fix-tests-ABI-long-long.patch b/packages/gmp/5.0.1/100-fix-tests-ABI-long-long.patch
index b6e303e..b6e303e 100644
--- a/patches/gmp/5.0.1/100-fix-tests-ABI-long-long.patch
+++ b/packages/gmp/5.0.1/100-fix-tests-ABI-long-long.patch
diff --git a/patches/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch b/packages/gmp/5.0.1/110-get-mpn_sub_1-size-argument-right.patch
index 2e0a1af..2e0a1af 100644
--- a/patches/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch
+++ b/packages/gmp/5.0.1/110-get-mpn_sub_1-size-argument-right.patch
diff --git a/patches/gmp/5.0.2/120-fix-r0-clobbering-issue.patch b/packages/gmp/5.0.1/120-fix-r0-clobbering-issue.patch
index d12d6b2..d12d6b2 100644
--- a/patches/gmp/5.0.2/120-fix-r0-clobbering-issue.patch
+++ b/packages/gmp/5.0.1/120-fix-r0-clobbering-issue.patch
diff --git a/packages/gmp/5.0.1/version.desc b/packages/gmp/5.0.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/5.0.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gmp/5.0.1/110-get-mpn_sub_1-size-argument-right.patch b/packages/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch
index 2e0a1af..2e0a1af 100644
--- a/patches/gmp/5.0.1/110-get-mpn_sub_1-size-argument-right.patch
+++ b/packages/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch
diff --git a/patches/gmp/5.0.1/120-fix-r0-clobbering-issue.patch b/packages/gmp/5.0.2/120-fix-r0-clobbering-issue.patch
index d12d6b2..d12d6b2 100644
--- a/patches/gmp/5.0.1/120-fix-r0-clobbering-issue.patch
+++ b/packages/gmp/5.0.2/120-fix-r0-clobbering-issue.patch
diff --git a/packages/gmp/5.0.2/version.desc b/packages/gmp/5.0.2/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/5.0.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gmp/5.1.1/100-fix-bulldozer-piledriver.patch b/packages/gmp/5.1.1/100-fix-bulldozer-piledriver.patch
index f6faca1..f6faca1 100644
--- a/patches/gmp/5.1.1/100-fix-bulldozer-piledriver.patch
+++ b/packages/gmp/5.1.1/100-fix-bulldozer-piledriver.patch
diff --git a/patches/gmp/5.1.1/110-mpz_powm_ui.patch b/packages/gmp/5.1.1/110-mpz_powm_ui.patch
index f0d240c..f0d240c 100644
--- a/patches/gmp/5.1.1/110-mpz_powm_ui.patch
+++ b/packages/gmp/5.1.1/110-mpz_powm_ui.patch
diff --git a/patches/gmp/5.1.1/120-fix-mpn_sbpi1_div_qr_sec.patch b/packages/gmp/5.1.1/120-fix-mpn_sbpi1_div_qr_sec.patch
index 13a50ad..13a50ad 100644
--- a/patches/gmp/5.1.1/120-fix-mpn_sbpi1_div_qr_sec.patch
+++ b/packages/gmp/5.1.1/120-fix-mpn_sbpi1_div_qr_sec.patch
diff --git a/patches/gmp/5.1.1/130-do-not-clobber-f16-f18.patch b/packages/gmp/5.1.1/130-do-not-clobber-f16-f18.patch
index 9f9f470..9f9f470 100644
--- a/patches/gmp/5.1.1/130-do-not-clobber-f16-f18.patch
+++ b/packages/gmp/5.1.1/130-do-not-clobber-f16-f18.patch
diff --git a/packages/gmp/5.1.1/version.desc b/packages/gmp/5.1.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/5.1.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gmp/5.1.3/version.desc b/packages/gmp/5.1.3/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/5.1.3/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gmp/6.0.0a/version.desc b/packages/gmp/6.0.0a/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/6.0.0a/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/gmp/6.1.0/100-fix-broadwell-skylake.patch b/packages/gmp/6.1.0/100-fix-broadwell-skylake.patch
index 9afd339..9afd339 100644
--- a/patches/gmp/6.1.0/100-fix-broadwell-skylake.patch
+++ b/packages/gmp/6.1.0/100-fix-broadwell-skylake.patch
diff --git a/packages/gmp/6.1.0/version.desc b/packages/gmp/6.1.0/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/gmp/6.1.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/gmp/6.1.2/version.desc b/packages/gmp/6.1.2/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/gmp/6.1.2/version.desc
diff --git a/packages/gmp/package.desc b/packages/gmp/package.desc
new file mode 100644
index 0000000..8a97436
--- /dev/null
+++ b/packages/gmp/package.desc
@@ -0,0 +1,2 @@
+repository="hg https://gmplib.org/repo/gmp/"
+milestones="5.1"
diff --git a/packages/isl/0.11.1/version.desc b/packages/isl/0.11.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/isl/0.11.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/isl/0.12.2/version.desc b/packages/isl/0.12.2/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/isl/0.12.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/isl/0.14/version.desc b/packages/isl/0.14/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/isl/0.14/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/isl/0.15/version.desc b/packages/isl/0.15/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/isl/0.15/version.desc
diff --git a/packages/isl/0.16.1/version.desc b/packages/isl/0.16.1/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/isl/0.16.1/version.desc
diff --git a/packages/isl/0.17.1/version.desc b/packages/isl/0.17.1/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/isl/0.17.1/version.desc
diff --git a/packages/isl/0.18/version.desc b/packages/isl/0.18/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/isl/0.18/version.desc
diff --git a/packages/isl/package.desc b/packages/isl/package.desc
new file mode 100644
index 0000000..5fc14ab
--- /dev/null
+++ b/packages/isl/package.desc
@@ -0,0 +1,2 @@
+repository="git git://repo.or.cz/isl.git"
+milestones="0.12 0.14"
diff --git a/patches/libelf/0.8.13/100-fix-64-bit-detection.patch b/packages/libelf/0.8.12/100-fix-64-bit-detection.patch
index 7995443..7995443 100644
--- a/patches/libelf/0.8.13/100-fix-64-bit-detection.patch
+++ b/packages/libelf/0.8.12/100-fix-64-bit-detection.patch
diff --git a/packages/libelf/0.8.12/version.desc b/packages/libelf/0.8.12/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/libelf/0.8.12/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/libelf/0.8.12/100-fix-64-bit-detection.patch b/packages/libelf/0.8.13/100-fix-64-bit-detection.patch
index 7995443..7995443 100644
--- a/patches/libelf/0.8.12/100-fix-64-bit-detection.patch
+++ b/packages/libelf/0.8.13/100-fix-64-bit-detection.patch
diff --git a/packages/libelf/0.8.13/version.desc b/packages/libelf/0.8.13/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/libelf/0.8.13/version.desc
diff --git a/packages/libelf/package.desc b/packages/libelf/package.desc
new file mode 100644
index 0000000..b015c2d
--- /dev/null
+++ b/packages/libelf/package.desc
@@ -0,0 +1,2 @@
+# FIXME No public repository and no new releases.
+# Consider switching to/adding project elftoolchain?
diff --git a/patches/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch b/packages/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch
index 382c841..382c841 100644
--- a/patches/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch
+++ b/packages/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch
diff --git a/packages/libiconv/1.14/version.desc b/packages/libiconv/1.14/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/libiconv/1.14/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/libiconv/1.15/version.desc b/packages/libiconv/1.15/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/libiconv/1.15/version.desc
diff --git a/packages/libiconv/package.desc b/packages/libiconv/package.desc
new file mode 100644
index 0000000..eb8318e
--- /dev/null
+++ b/packages/libiconv/package.desc
@@ -0,0 +1 @@
+repository="git https://git.savannah.gnu.org/git/libiconv.git"
diff --git a/patches/libtool/2.4.6/2.4.5-pass-ldflags.patch b/packages/libtool/2.4.6/2.4.5-pass-ldflags.patch
index d35e343..d35e343 100644
--- a/patches/libtool/2.4.6/2.4.5-pass-ldflags.patch
+++ b/packages/libtool/2.4.6/2.4.5-pass-ldflags.patch
diff --git a/packages/libtool/2.4.6/version.desc b/packages/libtool/2.4.6/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/libtool/2.4.6/version.desc
diff --git a/packages/libtool/package.desc b/packages/libtool/package.desc
new file mode 100644
index 0000000..995546e
--- /dev/null
+++ b/packages/libtool/package.desc
@@ -0,0 +1 @@
+repository="git git://git.savannah.gnu.org/libtool.git"
diff --git a/patches/ltrace/0.5.3/100-allow-cross-compile.patch b/packages/ltrace/0.5.3/100-allow-cross-compile.patch
index 58572cd..58572cd 100644
--- a/patches/ltrace/0.5.3/100-allow-cross-compile.patch
+++ b/packages/ltrace/0.5.3/100-allow-cross-compile.patch
diff --git a/patches/ltrace/0.5.3/110-alpha-support.patch b/packages/ltrace/0.5.3/110-alpha-support.patch
index 838b84b..838b84b 100644
--- a/patches/ltrace/0.5.3/110-alpha-support.patch
+++ b/packages/ltrace/0.5.3/110-alpha-support.patch
diff --git a/patches/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch b/packages/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch
index 483c743..483c743 100644
--- a/patches/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch
+++ b/packages/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch
diff --git a/patches/ltrace/0.5.3/130-add-sysdep.patch b/packages/ltrace/0.5.3/130-add-sysdep.patch
index 6fd8d26..6fd8d26 100644
--- a/patches/ltrace/0.5.3/130-add-sysdep.patch
+++ b/packages/ltrace/0.5.3/130-add-sysdep.patch
diff --git a/patches/ltrace/0.5.3/140-mips-remove-CP.patch b/packages/ltrace/0.5.3/140-mips-remove-CP.patch
index 4532a8f..4532a8f 100644
--- a/patches/ltrace/0.5.3/140-mips-remove-CP.patch
+++ b/packages/ltrace/0.5.3/140-mips-remove-CP.patch
diff --git a/patches/ltrace/0.5.3/140-mips.patch b/packages/ltrace/0.5.3/140-mips.patch
index b01b7a9..b01b7a9 100644
--- a/patches/ltrace/0.5.3/140-mips.patch
+++ b/packages/ltrace/0.5.3/140-mips.patch
diff --git a/patches/ltrace/0.5.3/150-allow-configurable-arch.patch b/packages/ltrace/0.5.3/150-allow-configurable-arch.patch
index 7208ca8..7208ca8 100644
--- a/patches/ltrace/0.5.3/150-allow-configurable-arch.patch
+++ b/packages/ltrace/0.5.3/150-allow-configurable-arch.patch
diff --git a/patches/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch b/packages/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch
index b57a166..b57a166 100644
--- a/patches/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch
+++ b/packages/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch
diff --git a/patches/ltrace/0.5.3/170-lib-supcc.patch b/packages/ltrace/0.5.3/170-lib-supcc.patch
index 8842b91..8842b91 100644
--- a/patches/ltrace/0.5.3/170-lib-supcc.patch
+++ b/packages/ltrace/0.5.3/170-lib-supcc.patch
diff --git a/patches/ltrace/0.5.3/180-libltrace-genindex.patch b/packages/ltrace/0.5.3/180-libltrace-genindex.patch
index 0b1629b..0b1629b 100644
--- a/patches/ltrace/0.5.3/180-libltrace-genindex.patch
+++ b/packages/ltrace/0.5.3/180-libltrace-genindex.patch
diff --git a/patches/ltrace/0.5.3/190-ar-configurable.patch b/packages/ltrace/0.5.3/190-ar-configurable.patch
index 28856a3..28856a3 100644
--- a/patches/ltrace/0.5.3/190-ar-configurable.patch
+++ b/packages/ltrace/0.5.3/190-ar-configurable.patch
diff --git a/patches/ltrace/0.5.3/200-configure-hostos.patch b/packages/ltrace/0.5.3/200-configure-hostos.patch
index 36563f4..36563f4 100644
--- a/patches/ltrace/0.5.3/200-configure-hostos.patch
+++ b/packages/ltrace/0.5.3/200-configure-hostos.patch
diff --git a/packages/ltrace/0.5.3/version.desc b/packages/ltrace/0.5.3/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/ltrace/0.5.3/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/ltrace/0.7.3/001-avoid-libstdc++.patch b/packages/ltrace/0.7.3/001-avoid-libstdc++.patch
index 9cbf557..9cbf557 100644
--- a/patches/ltrace/0.7.3/001-avoid-libstdc++.patch
+++ b/packages/ltrace/0.7.3/001-avoid-libstdc++.patch
diff --git a/patches/ltrace/0.7.3/002-printf-p.patch b/packages/ltrace/0.7.3/002-printf-p.patch
index 10631d9..10631d9 100644
--- a/patches/ltrace/0.7.3/002-printf-p.patch
+++ b/packages/ltrace/0.7.3/002-printf-p.patch
diff --git a/patches/ltrace/0.7.3/003-alpha-debug.h.patch b/packages/ltrace/0.7.3/003-alpha-debug.h.patch
index 237026d..237026d 100644
--- a/patches/ltrace/0.7.3/003-alpha-debug.h.patch
+++ b/packages/ltrace/0.7.3/003-alpha-debug.h.patch
diff --git a/patches/ltrace/0.7.3/004-compile-warning.patch b/packages/ltrace/0.7.3/004-compile-warning.patch
index ad65829..ad65829 100644
--- a/patches/ltrace/0.7.3/004-compile-warning.patch
+++ b/packages/ltrace/0.7.3/004-compile-warning.patch
diff --git a/patches/ltrace/0.7.3/005-sparc-ftbfs.patch b/packages/ltrace/0.7.3/005-sparc-ftbfs.patch
index 266a8e6..266a8e6 100644
--- a/patches/ltrace/0.7.3/005-sparc-ftbfs.patch
+++ b/packages/ltrace/0.7.3/005-sparc-ftbfs.patch
diff --git a/patches/ltrace/0.7.3/006-unexpected-breakpoint.patch b/packages/ltrace/0.7.3/006-unexpected-breakpoint.patch
index 443bee4..443bee4 100644
--- a/patches/ltrace/0.7.3/006-unexpected-breakpoint.patch
+++ b/packages/ltrace/0.7.3/006-unexpected-breakpoint.patch
diff --git a/patches/ltrace/0.7.3/007-gcc-5.patch b/packages/ltrace/0.7.3/007-gcc-5.patch
index 4c62f85..4c62f85 100644
--- a/patches/ltrace/0.7.3/007-gcc-5.patch
+++ b/packages/ltrace/0.7.3/007-gcc-5.patch
diff --git a/patches/ltrace/0.7.3/008-glibc-2.24.patch b/packages/ltrace/0.7.3/008-glibc-2.24.patch
index 85b008b..85b008b 100644
--- a/patches/ltrace/0.7.3/008-glibc-2.24.patch
+++ b/packages/ltrace/0.7.3/008-glibc-2.24.patch
diff --git a/packages/ltrace/0.7.3/version.desc b/packages/ltrace/0.7.3/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/ltrace/0.7.3/version.desc
diff --git a/packages/ltrace/package.desc b/packages/ltrace/package.desc
new file mode 100644
index 0000000..d80e7ce
--- /dev/null
+++ b/packages/ltrace/package.desc
@@ -0,0 +1 @@
+repository="git git://git.debian.org/git/collab-maint/ltrace.git"
diff --git a/packages/m4/1.4.13/version.desc b/packages/m4/1.4.13/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/m4/1.4.13/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/m4/1.4.17/version.desc b/packages/m4/1.4.17/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/m4/1.4.17/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/m4/1.4.18/version.desc b/packages/m4/1.4.18/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/m4/1.4.18/version.desc
diff --git a/packages/m4/package.desc b/packages/m4/package.desc
new file mode 100644
index 0000000..555cdd1
--- /dev/null
+++ b/packages/m4/package.desc
@@ -0,0 +1 @@
+repository="git git://git.sv.gnu.org/m4"
diff --git a/packages/make/3.81/version.desc b/packages/make/3.81/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/make/3.81/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/make/4.0/version.desc b/packages/make/4.0/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/make/4.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/make/4.1/version.desc b/packages/make/4.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/make/4.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/make/4.2.1/version.desc b/packages/make/4.2.1/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/make/4.2.1/version.desc
diff --git a/packages/make/package.desc b/packages/make/package.desc
new file mode 100644
index 0000000..b093324
--- /dev/null
+++ b/packages/make/package.desc
@@ -0,0 +1 @@
+repository="git https://git.savannah.gnu.org/git/make.git"
diff --git a/packages/mpc/0.7/version.desc b/packages/mpc/0.7/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpc/0.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpc/0.8.1/100-fix-build-with-mpfr-3_0_9.diff b/packages/mpc/0.8.1/100-fix-build-with-mpfr-3_0_9.diff
index 88e1517..88e1517 100644
--- a/patches/mpc/0.8.1/100-fix-build-with-mpfr-3_0_9.diff
+++ b/packages/mpc/0.8.1/100-fix-build-with-mpfr-3_0_9.diff
diff --git a/packages/mpc/0.8.1/version.desc b/packages/mpc/0.8.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpc/0.8.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/mpc/0.8.2/version.desc b/packages/mpc/0.8.2/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpc/0.8.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/mpc/0.9/version.desc b/packages/mpc/0.9/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpc/0.9/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/mpc/1.0.1/version.desc b/packages/mpc/1.0.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpc/1.0.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/mpc/1.0.2/version.desc b/packages/mpc/1.0.2/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpc/1.0.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/mpc/1.0.3/version.desc b/packages/mpc/1.0.3/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/mpc/1.0.3/version.desc
diff --git a/packages/mpc/1.0/version.desc b/packages/mpc/1.0/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpc/1.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/mpc/package.desc b/packages/mpc/package.desc
new file mode 100644
index 0000000..2a7e47c
--- /dev/null
+++ b/packages/mpc/package.desc
@@ -0,0 +1 @@
+repository="git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git"
diff --git a/patches/mpfr/2.4.0/100-printf-hh-ll.patch b/packages/mpfr/2.4.0/100-printf-hh-ll.patch
index e2a9f81..e2a9f81 100644
--- a/patches/mpfr/2.4.0/100-printf-hh-ll.patch
+++ b/packages/mpfr/2.4.0/100-printf-hh-ll.patch
diff --git a/patches/mpfr/2.4.0/110-mpfr_snprintf.patch b/packages/mpfr/2.4.0/110-mpfr_snprintf.patch
index 92af137..92af137 100644
--- a/patches/mpfr/2.4.0/110-mpfr_snprintf.patch
+++ b/packages/mpfr/2.4.0/110-mpfr_snprintf.patch
diff --git a/packages/mpfr/2.4.0/version.desc b/packages/mpfr/2.4.0/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/2.4.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpfr/2.4.1/100-remainder-neg.patch b/packages/mpfr/2.4.1/100-remainder-neg.patch
index ae92788..ae92788 100644
--- a/patches/mpfr/2.4.1/100-remainder-neg.patch
+++ b/packages/mpfr/2.4.1/100-remainder-neg.patch
diff --git a/patches/mpfr/2.4.1/110-assert.patch b/packages/mpfr/2.4.1/110-assert.patch
index c6b6aac..c6b6aac 100644
--- a/patches/mpfr/2.4.1/110-assert.patch
+++ b/packages/mpfr/2.4.1/110-assert.patch
diff --git a/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch b/packages/mpfr/2.4.1/120-cast-to-void-ptr.patch
index e85136a..e85136a 100644
--- a/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch
+++ b/packages/mpfr/2.4.1/120-cast-to-void-ptr.patch
diff --git a/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch b/packages/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch
index 08e21f2..08e21f2 100644
--- a/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch
+++ b/packages/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch
diff --git a/patches/mpfr/2.4.1/140-zeta_ui-shift.patch b/packages/mpfr/2.4.1/140-zeta_ui-shift.patch
index 710c698..710c698 100644
--- a/patches/mpfr/2.4.1/140-zeta_ui-shift.patch
+++ b/packages/mpfr/2.4.1/140-zeta_ui-shift.patch
diff --git a/patches/mpfr/2.4.1/150-test-tmul.patch b/packages/mpfr/2.4.1/150-test-tmul.patch
index 8b757d3..8b757d3 100644
--- a/patches/mpfr/2.4.1/150-test-tmul.patch
+++ b/packages/mpfr/2.4.1/150-test-tmul.patch
diff --git a/packages/mpfr/2.4.1/version.desc b/packages/mpfr/2.4.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/2.4.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpfr/2.4.2/100-sin_cos_underflow.patch b/packages/mpfr/2.4.2/100-sin_cos_underflow.patch
index 2721517..2721517 100644
--- a/patches/mpfr/2.4.2/100-sin_cos_underflow.patch
+++ b/packages/mpfr/2.4.2/100-sin_cos_underflow.patch
diff --git a/patches/mpfr/2.4.2/110-longlong.h.patch b/packages/mpfr/2.4.2/110-longlong.h.patch
index fa85d8e..fa85d8e 100644
--- a/patches/mpfr/2.4.2/110-longlong.h.patch
+++ b/packages/mpfr/2.4.2/110-longlong.h.patch
diff --git a/patches/mpfr/2.4.2/120-gmp5.patch b/packages/mpfr/2.4.2/120-gmp5.patch
index 3ce4952..3ce4952 100644
--- a/patches/mpfr/2.4.2/120-gmp5.patch
+++ b/packages/mpfr/2.4.2/120-gmp5.patch
diff --git a/packages/mpfr/2.4.2/version.desc b/packages/mpfr/2.4.2/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/2.4.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpfr/3.0.0/110-mpfr_out_str.patch b/packages/mpfr/3.0.0/110-mpfr_out_str.patch
index da98aab..da98aab 100644
--- a/patches/mpfr/3.0.0/110-mpfr_out_str.patch
+++ b/packages/mpfr/3.0.0/110-mpfr_out_str.patch
diff --git a/patches/mpfr/3.0.0/120-alloca.patch b/packages/mpfr/3.0.0/120-alloca.patch
index af6dfb2..af6dfb2 100644
--- a/patches/mpfr/3.0.0/120-alloca.patch
+++ b/packages/mpfr/3.0.0/120-alloca.patch
diff --git a/patches/mpfr/3.0.0/130-gamma_underflow.patch b/packages/mpfr/3.0.0/130-gamma_underflow.patch
index cf8a936..cf8a936 100644
--- a/patches/mpfr/3.0.0/130-gamma_underflow.patch
+++ b/packages/mpfr/3.0.0/130-gamma_underflow.patch
diff --git a/patches/mpfr/3.0.0/140-mpfr_cmp_set_ui_si.patch b/packages/mpfr/3.0.0/140-mpfr_cmp_set_ui_si.patch
index 67d6a6a..67d6a6a 100644
--- a/patches/mpfr/3.0.0/140-mpfr_cmp_set_ui_si.patch
+++ b/packages/mpfr/3.0.0/140-mpfr_cmp_set_ui_si.patch
diff --git a/patches/mpfr/3.0.0/150-tcan_round.patch b/packages/mpfr/3.0.0/150-tcan_round.patch
index 292e7a5..292e7a5 100644
--- a/patches/mpfr/3.0.0/150-tcan_round.patch
+++ b/packages/mpfr/3.0.0/150-tcan_round.patch
diff --git a/patches/mpfr/3.0.0/160-mpfr_sub1.patch b/packages/mpfr/3.0.0/160-mpfr_sub1.patch
index 2ce98e9..2ce98e9 100644
--- a/patches/mpfr/3.0.0/160-mpfr_sub1.patch
+++ b/packages/mpfr/3.0.0/160-mpfr_sub1.patch
diff --git a/patches/mpfr/3.0.0/170-mpfr_set_ld.patch b/packages/mpfr/3.0.0/170-mpfr_set_ld.patch
index 9209afe..9209afe 100644
--- a/patches/mpfr/3.0.0/170-mpfr_set_ld.patch
+++ b/packages/mpfr/3.0.0/170-mpfr_set_ld.patch
diff --git a/patches/mpfr/3.0.0/180-macros.patch b/packages/mpfr/3.0.0/180-macros.patch
index 58a490f..58a490f 100644
--- a/patches/mpfr/3.0.0/180-macros.patch
+++ b/packages/mpfr/3.0.0/180-macros.patch
diff --git a/packages/mpfr/3.0.0/version.desc b/packages/mpfr/3.0.0/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/3.0.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpfr/3.0.1/110-asin_exprange.patch b/packages/mpfr/3.0.1/110-asin_exprange.patch
index d79a6f9..d79a6f9 100644
--- a/patches/mpfr/3.0.1/110-asin_exprange.patch
+++ b/packages/mpfr/3.0.1/110-asin_exprange.patch
diff --git a/patches/mpfr/3.0.1/120-rec_sqrt-carry.patch b/packages/mpfr/3.0.1/120-rec_sqrt-carry.patch
index 0367d84..0367d84 100644
--- a/patches/mpfr/3.0.1/120-rec_sqrt-carry.patch
+++ b/packages/mpfr/3.0.1/120-rec_sqrt-carry.patch
diff --git a/patches/mpfr/3.0.1/130-atan-expo-range.patch b/packages/mpfr/3.0.1/130-atan-expo-range.patch
index 251b837..251b837 100644
--- a/patches/mpfr/3.0.1/130-atan-expo-range.patch
+++ b/packages/mpfr/3.0.1/130-atan-expo-range.patch
diff --git a/patches/mpfr/3.0.1/140-texp-zero.patch b/packages/mpfr/3.0.1/140-texp-zero.patch
index fd74087..fd74087 100644
--- a/patches/mpfr/3.0.1/140-texp-zero.patch
+++ b/packages/mpfr/3.0.1/140-texp-zero.patch
diff --git a/packages/mpfr/3.0.1/version.desc b/packages/mpfr/3.0.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/3.0.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpfr/3.1.0/110-mpfr_unlikely.patch b/packages/mpfr/3.1.0/110-mpfr_unlikely.patch
index 437b1a2..437b1a2 100644
--- a/patches/mpfr/3.1.0/110-mpfr_unlikely.patch
+++ b/packages/mpfr/3.1.0/110-mpfr_unlikely.patch
diff --git a/patches/mpfr/3.1.0/120-lib-search-path.patch b/packages/mpfr/3.1.0/120-lib-search-path.patch
index 4714ac9..4714ac9 100644
--- a/patches/mpfr/3.1.0/120-lib-search-path.patch
+++ b/packages/mpfr/3.1.0/120-lib-search-path.patch
diff --git a/patches/mpfr/3.1.0/130-vasprintf.patch b/packages/mpfr/3.1.0/130-vasprintf.patch
index aa1cfbc..aa1cfbc 100644
--- a/patches/mpfr/3.1.0/130-vasprintf.patch
+++ b/packages/mpfr/3.1.0/130-vasprintf.patch
diff --git a/patches/mpfr/3.1.0/140-gmp41compat.patch b/packages/mpfr/3.1.0/140-gmp41compat.patch
index 4b1ba08..4b1ba08 100644
--- a/patches/mpfr/3.1.0/140-gmp41compat.patch
+++ b/packages/mpfr/3.1.0/140-gmp41compat.patch
diff --git a/patches/mpfr/3.1.0/150-logging-freeze.patch b/packages/mpfr/3.1.0/150-logging-freeze.patch
index c664cee..c664cee 100644
--- a/patches/mpfr/3.1.0/150-logging-freeze.patch
+++ b/packages/mpfr/3.1.0/150-logging-freeze.patch
diff --git a/patches/mpfr/3.1.0/160-logging-varfmt.patch b/packages/mpfr/3.1.0/160-logging-varfmt.patch
index 0f4bfad..0f4bfad 100644
--- a/patches/mpfr/3.1.0/160-logging-varfmt.patch
+++ b/packages/mpfr/3.1.0/160-logging-varfmt.patch
diff --git a/patches/mpfr/3.1.0/170-large-prec.patch b/packages/mpfr/3.1.0/170-large-prec.patch
index 08e7b57..08e7b57 100644
--- a/patches/mpfr/3.1.0/170-large-prec.patch
+++ b/packages/mpfr/3.1.0/170-large-prec.patch
diff --git a/patches/mpfr/3.1.0/180-__gmp_const.patch b/packages/mpfr/3.1.0/180-__gmp_const.patch
index 94444b6..94444b6 100644
--- a/patches/mpfr/3.1.0/180-__gmp_const.patch
+++ b/packages/mpfr/3.1.0/180-__gmp_const.patch
diff --git a/patches/mpfr/3.1.0/190-gamma-underflow.patch b/packages/mpfr/3.1.0/190-gamma-underflow.patch
index 3de1d19..3de1d19 100644
--- a/patches/mpfr/3.1.0/190-gamma-underflow.patch
+++ b/packages/mpfr/3.1.0/190-gamma-underflow.patch
diff --git a/patches/mpfr/3.1.0/200-gamma-overunderflow.patch b/packages/mpfr/3.1.0/200-gamma-overunderflow.patch
index e6d6051..e6d6051 100644
--- a/patches/mpfr/3.1.0/200-gamma-overunderflow.patch
+++ b/packages/mpfr/3.1.0/200-gamma-overunderflow.patch
diff --git a/packages/mpfr/3.1.0/version.desc b/packages/mpfr/3.1.0/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/3.1.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpfr/3.1.1/110-get_decimal64.patch b/packages/mpfr/3.1.1/110-get_decimal64.patch
index d73a3d7..d73a3d7 100644
--- a/patches/mpfr/3.1.1/110-get_decimal64.patch
+++ b/packages/mpfr/3.1.1/110-get_decimal64.patch
diff --git a/patches/mpfr/3.1.1/120-strtofr-ternary-value.patch b/packages/mpfr/3.1.1/120-strtofr-ternary-value.patch
index 76dbc45..76dbc45 100644
--- a/patches/mpfr/3.1.1/120-strtofr-ternary-value.patch
+++ b/packages/mpfr/3.1.1/120-strtofr-ternary-value.patch
diff --git a/patches/mpfr/3.1.1/130-gmp51-compat.patch b/packages/mpfr/3.1.1/130-gmp51-compat.patch
index ecf7537..ecf7537 100644
--- a/patches/mpfr/3.1.1/130-gmp51-compat.patch
+++ b/packages/mpfr/3.1.1/130-gmp51-compat.patch
diff --git a/packages/mpfr/3.1.1/version.desc b/packages/mpfr/3.1.1/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/3.1.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpfr/3.1.2/110-exp_2.patch b/packages/mpfr/3.1.2/110-exp_2.patch
index 731ea92..731ea92 100644
--- a/patches/mpfr/3.1.2/110-exp_2.patch
+++ b/packages/mpfr/3.1.2/110-exp_2.patch
diff --git a/patches/mpfr/3.1.2/120-fits-smallneg.patch b/packages/mpfr/3.1.2/120-fits-smallneg.patch
index b229c18..b229c18 100644
--- a/patches/mpfr/3.1.2/120-fits-smallneg.patch
+++ b/packages/mpfr/3.1.2/120-fits-smallneg.patch
diff --git a/patches/mpfr/3.1.2/130-clang-divby0.patch b/packages/mpfr/3.1.2/130-clang-divby0.patch
index 8e0cd8e..8e0cd8e 100644
--- a/patches/mpfr/3.1.2/130-clang-divby0.patch
+++ b/packages/mpfr/3.1.2/130-clang-divby0.patch
diff --git a/patches/mpfr/3.1.2/140-printf-alt0.patch b/packages/mpfr/3.1.2/140-printf-alt0.patch
index 2451f36..2451f36 100644
--- a/patches/mpfr/3.1.2/140-printf-alt0.patch
+++ b/packages/mpfr/3.1.2/140-printf-alt0.patch
diff --git a/patches/mpfr/3.1.2/150-custom_init_set.patch b/packages/mpfr/3.1.2/150-custom_init_set.patch
index 669b91d..669b91d 100644
--- a/patches/mpfr/3.1.2/150-custom_init_set.patch
+++ b/packages/mpfr/3.1.2/150-custom_init_set.patch
diff --git a/patches/mpfr/3.1.2/160-li2-return.patch b/packages/mpfr/3.1.2/160-li2-return.patch
index 50cd04d..50cd04d 100644
--- a/patches/mpfr/3.1.2/160-li2-return.patch
+++ b/packages/mpfr/3.1.2/160-li2-return.patch
diff --git a/patches/mpfr/3.1.2/170-exp3.patch b/packages/mpfr/3.1.2/170-exp3.patch
index 378c3bf..378c3bf 100644
--- a/patches/mpfr/3.1.2/170-exp3.patch
+++ b/packages/mpfr/3.1.2/170-exp3.patch
diff --git a/patches/mpfr/3.1.2/180-gmp6-compat.patch b/packages/mpfr/3.1.2/180-gmp6-compat.patch
index 2245c7c..2245c7c 100644
--- a/patches/mpfr/3.1.2/180-gmp6-compat.patch
+++ b/packages/mpfr/3.1.2/180-gmp6-compat.patch
diff --git a/patches/mpfr/3.1.2/190-div-overflow.patch b/packages/mpfr/3.1.2/190-div-overflow.patch
index 6ff7c4a..6ff7c4a 100644
--- a/patches/mpfr/3.1.2/190-div-overflow.patch
+++ b/packages/mpfr/3.1.2/190-div-overflow.patch
diff --git a/patches/mpfr/3.1.2/200-vasprintf.patch b/packages/mpfr/3.1.2/200-vasprintf.patch
index 43848f7..43848f7 100644
--- a/patches/mpfr/3.1.2/200-vasprintf.patch
+++ b/packages/mpfr/3.1.2/200-vasprintf.patch
diff --git a/patches/mpfr/3.1.2/210-strtofr.patch b/packages/mpfr/3.1.2/210-strtofr.patch
index 462162e..462162e 100644
--- a/patches/mpfr/3.1.2/210-strtofr.patch
+++ b/packages/mpfr/3.1.2/210-strtofr.patch
diff --git a/packages/mpfr/3.1.2/version.desc b/packages/mpfr/3.1.2/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/3.1.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mpfr/3.1.3/110-lngamma-and-doc.patch b/packages/mpfr/3.1.3/110-lngamma-and-doc.patch
index d7e1cbf..d7e1cbf 100644
--- a/patches/mpfr/3.1.3/110-lngamma-and-doc.patch
+++ b/packages/mpfr/3.1.3/110-lngamma-and-doc.patch
diff --git a/patches/mpfr/3.1.3/120-muldiv-2exp-overflow.patch b/packages/mpfr/3.1.3/120-muldiv-2exp-overflow.patch
index df711fd..df711fd 100644
--- a/patches/mpfr/3.1.3/120-muldiv-2exp-overflow.patch
+++ b/packages/mpfr/3.1.3/120-muldiv-2exp-overflow.patch
diff --git a/patches/mpfr/3.1.3/130-muldiv-2exp-underflow.patch b/packages/mpfr/3.1.3/130-muldiv-2exp-underflow.patch
index c7be09f..c7be09f 100644
--- a/patches/mpfr/3.1.3/130-muldiv-2exp-underflow.patch
+++ b/packages/mpfr/3.1.3/130-muldiv-2exp-underflow.patch
diff --git a/patches/mpfr/3.1.3/140-frexp.patch b/packages/mpfr/3.1.3/140-frexp.patch
index e0d5e09..e0d5e09 100644
--- a/patches/mpfr/3.1.3/140-frexp.patch
+++ b/packages/mpfr/3.1.3/140-frexp.patch
diff --git a/patches/mpfr/3.1.3/150-divhigh-basecase.patch b/packages/mpfr/3.1.3/150-divhigh-basecase.patch
index ef8d891..ef8d891 100644
--- a/patches/mpfr/3.1.3/150-divhigh-basecase.patch
+++ b/packages/mpfr/3.1.3/150-divhigh-basecase.patch
diff --git a/patches/mpfr/3.1.3/160-jn.patch b/packages/mpfr/3.1.3/160-jn.patch
index e7d04fa..e7d04fa 100644
--- a/patches/mpfr/3.1.3/160-jn.patch
+++ b/packages/mpfr/3.1.3/160-jn.patch
diff --git a/patches/mpfr/3.1.3/170-zeta.patch b/packages/mpfr/3.1.3/170-zeta.patch
index 12faf1d..12faf1d 100644
--- a/patches/mpfr/3.1.3/170-zeta.patch
+++ b/packages/mpfr/3.1.3/170-zeta.patch
diff --git a/patches/mpfr/3.1.3/180-sqrt.patch b/packages/mpfr/3.1.3/180-sqrt.patch
index 4887009..4887009 100644
--- a/patches/mpfr/3.1.3/180-sqrt.patch
+++ b/packages/mpfr/3.1.3/180-sqrt.patch
diff --git a/patches/mpfr/3.1.3/190-si-ops.patch b/packages/mpfr/3.1.3/190-si-ops.patch
index e4df233..e4df233 100644
--- a/patches/mpfr/3.1.3/190-si-ops.patch
+++ b/packages/mpfr/3.1.3/190-si-ops.patch
diff --git a/patches/mpfr/3.1.3/200-can_round.patch b/packages/mpfr/3.1.3/200-can_round.patch
index 6c0f79a..6c0f79a 100644
--- a/patches/mpfr/3.1.3/200-can_round.patch
+++ b/packages/mpfr/3.1.3/200-can_round.patch
diff --git a/patches/mpfr/3.1.3/210-fits.patch b/packages/mpfr/3.1.3/210-fits.patch
index 888389c..888389c 100644
--- a/patches/mpfr/3.1.3/210-fits.patch
+++ b/packages/mpfr/3.1.3/210-fits.patch
diff --git a/patches/mpfr/3.1.3/220-root.patch b/packages/mpfr/3.1.3/220-root.patch
index 9cd62a7..9cd62a7 100644
--- a/patches/mpfr/3.1.3/220-root.patch
+++ b/packages/mpfr/3.1.3/220-root.patch
diff --git a/patches/mpfr/3.1.3/230-gamma.patch b/packages/mpfr/3.1.3/230-gamma.patch
index 47d4e41..47d4e41 100644
--- a/patches/mpfr/3.1.3/230-gamma.patch
+++ b/packages/mpfr/3.1.3/230-gamma.patch
diff --git a/patches/mpfr/3.1.3/240-rem1.patch b/packages/mpfr/3.1.3/240-rem1.patch
index 9d5e3c1..9d5e3c1 100644
--- a/patches/mpfr/3.1.3/240-rem1.patch
+++ b/packages/mpfr/3.1.3/240-rem1.patch
diff --git a/patches/mpfr/3.1.3/250-agm-eq.patch b/packages/mpfr/3.1.3/250-agm-eq.patch
index e59e914..e59e914 100644
--- a/patches/mpfr/3.1.3/250-agm-eq.patch
+++ b/packages/mpfr/3.1.3/250-agm-eq.patch
diff --git a/patches/mpfr/3.1.3/260-sum.patch b/packages/mpfr/3.1.3/260-sum.patch
index 6fae047..6fae047 100644
--- a/patches/mpfr/3.1.3/260-sum.patch
+++ b/packages/mpfr/3.1.3/260-sum.patch
diff --git a/patches/mpfr/3.1.3/270-cmp_d.patch b/packages/mpfr/3.1.3/270-cmp_d.patch
index f22e27a..f22e27a 100644
--- a/patches/mpfr/3.1.3/270-cmp_d.patch
+++ b/packages/mpfr/3.1.3/270-cmp_d.patch
diff --git a/packages/mpfr/3.1.3/version.desc b/packages/mpfr/3.1.3/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/mpfr/3.1.3/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/mpfr/3.1.5/version.desc b/packages/mpfr/3.1.5/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/mpfr/3.1.5/version.desc
diff --git a/packages/mpfr/package.desc b/packages/mpfr/package.desc
new file mode 100644
index 0000000..edd604a
--- /dev/null
+++ b/packages/mpfr/package.desc
@@ -0,0 +1 @@
+repository="svn https://scm.gforge.inria.fr/anonscm/svn/mpfr"
diff --git a/patches/ncurses/6.0/100-ncurses-6.0-20150810.patch b/packages/ncurses/6.0/100-ncurses-6.0-20150810.patch
index 76f238f..76f238f 100644
--- a/patches/ncurses/6.0/100-ncurses-6.0-20150810.patch
+++ b/packages/ncurses/6.0/100-ncurses-6.0-20150810.patch
diff --git a/patches/ncurses/6.0/110-ncurses-6.0-20150815.patch b/packages/ncurses/6.0/110-ncurses-6.0-20150815.patch
index 21fe06e..21fe06e 100644
--- a/patches/ncurses/6.0/110-ncurses-6.0-20150815.patch
+++ b/packages/ncurses/6.0/110-ncurses-6.0-20150815.patch
diff --git a/patches/ncurses/6.0/120-ncurses-6.0-20150822.patch b/packages/ncurses/6.0/120-ncurses-6.0-20150822.patch
index 202ffe8..202ffe8 100644
--- a/patches/ncurses/6.0/120-ncurses-6.0-20150822.patch
+++ b/packages/ncurses/6.0/120-ncurses-6.0-20150822.patch
diff --git a/patches/ncurses/6.0/130-ncurses-6.0-20150905.patch b/packages/ncurses/6.0/130-ncurses-6.0-20150905.patch
index 76dd45c..76dd45c 100644
--- a/patches/ncurses/6.0/130-ncurses-6.0-20150905.patch
+++ b/packages/ncurses/6.0/130-ncurses-6.0-20150905.patch
diff --git a/patches/ncurses/6.0/140-ncurses-6.0-20150912.patch b/packages/ncurses/6.0/140-ncurses-6.0-20150912.patch
index 4d698f4..4d698f4 100644
--- a/patches/ncurses/6.0/140-ncurses-6.0-20150912.patch
+++ b/packages/ncurses/6.0/140-ncurses-6.0-20150912.patch
diff --git a/patches/ncurses/6.0/150-ncurses-6.0-20150919.patch b/packages/ncurses/6.0/150-ncurses-6.0-20150919.patch
index 13646a7..13646a7 100644
--- a/patches/ncurses/6.0/150-ncurses-6.0-20150919.patch
+++ b/packages/ncurses/6.0/150-ncurses-6.0-20150919.patch
diff --git a/patches/ncurses/6.0/160-ncurses-6.0-20150926.patch b/packages/ncurses/6.0/160-ncurses-6.0-20150926.patch
index d675a26..d675a26 100644
--- a/patches/ncurses/6.0/160-ncurses-6.0-20150926.patch
+++ b/packages/ncurses/6.0/160-ncurses-6.0-20150926.patch
diff --git a/patches/ncurses/6.0/170-ncurses-6.0-20151010.patch b/packages/ncurses/6.0/170-ncurses-6.0-20151010.patch
index 1f9e949..1f9e949 100644
--- a/patches/ncurses/6.0/170-ncurses-6.0-20151010.patch
+++ b/packages/ncurses/6.0/170-ncurses-6.0-20151010.patch
diff --git a/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch b/packages/ncurses/6.0/180-ncurses-6.0-20151017.patch
index 6bb1cd3..6bb1cd3 100644
--- a/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch
+++ b/packages/ncurses/6.0/180-ncurses-6.0-20151017.patch
diff --git a/patches/ncurses/6.0/190-ncurses-6.0-20151024.patch b/packages/ncurses/6.0/190-ncurses-6.0-20151024.patch
index 61f922f..61f922f 100644
--- a/patches/ncurses/6.0/190-ncurses-6.0-20151024.patch
+++ b/packages/ncurses/6.0/190-ncurses-6.0-20151024.patch
diff --git a/patches/ncurses/6.0/200-ncurses-6.0-20151101.patch b/packages/ncurses/6.0/200-ncurses-6.0-20151101.patch
index 7cae284..7cae284 100644
--- a/patches/ncurses/6.0/200-ncurses-6.0-20151101.patch
+++ b/packages/ncurses/6.0/200-ncurses-6.0-20151101.patch
diff --git a/patches/ncurses/6.0/210-ncurses-6.0-20151107.patch b/packages/ncurses/6.0/210-ncurses-6.0-20151107.patch
index f2567c9..f2567c9 100644
--- a/patches/ncurses/6.0/210-ncurses-6.0-20151107.patch
+++ b/packages/ncurses/6.0/210-ncurses-6.0-20151107.patch
diff --git a/patches/ncurses/6.0/999-create-run_tic.patch b/packages/ncurses/6.0/999-create-run_tic.patch
index 7c4fb0d..7c4fb0d 100644
--- a/patches/ncurses/6.0/999-create-run_tic.patch
+++ b/packages/ncurses/6.0/999-create-run_tic.patch
diff --git a/packages/ncurses/6.0/version.desc b/packages/ncurses/6.0/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/ncurses/6.0/version.desc
diff --git a/packages/ncurses/package.desc b/packages/ncurses/package.desc
new file mode 100644
index 0000000..8b966f1
--- /dev/null
+++ b/packages/ncurses/package.desc
@@ -0,0 +1 @@
+# No public repository for ncurses
diff --git a/patches/strace/4.10/001_aarch64_rt_sigreturn.patch b/packages/strace/4.10/001_aarch64_rt_sigreturn.patch
index 6b7bbe3..6b7bbe3 100644
--- a/patches/strace/4.10/001_aarch64_rt_sigreturn.patch
+++ b/packages/strace/4.10/001_aarch64_rt_sigreturn.patch
diff --git a/patches/strace/4.10/002_arm_mmap2.patch b/packages/strace/4.10/002_arm_mmap2.patch
index 41953e2..41953e2 100644
--- a/patches/strace/4.10/002_arm_mmap2.patch
+++ b/packages/strace/4.10/002_arm_mmap2.patch
diff --git a/patches/strace/4.10/003_aarch64_arch_regs.patch b/packages/strace/4.10/003_aarch64_arch_regs.patch
index e5153b5..e5153b5 100644
--- a/patches/strace/4.10/003_aarch64_arch_regs.patch
+++ b/packages/strace/4.10/003_aarch64_arch_regs.patch
diff --git a/patches/strace/4.10/004_stat64-v.test.patch b/packages/strace/4.10/004_stat64-v.test.patch
index 53383e3..53383e3 100644
--- a/patches/strace/4.10/004_stat64-v.test.patch
+++ b/packages/strace/4.10/004_stat64-v.test.patch
diff --git a/patches/strace/4.10/005_select_test.patch b/packages/strace/4.10/005_select_test.patch
index cb56ec6..cb56ec6 100644
--- a/patches/strace/4.10/005_select_test.patch
+++ b/packages/strace/4.10/005_select_test.patch
diff --git a/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch b/packages/strace/4.10/006_fix_aarch64_ioctl_decoding.patch
index a270349..a270349 100644
--- a/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch
+++ b/packages/strace/4.10/006_fix_aarch64_ioctl_decoding.patch
diff --git a/patches/strace/4.10/007_fix_bexecve64_test.patch b/packages/strace/4.10/007_fix_bexecve64_test.patch
index 6dc9b46..6dc9b46 100644
--- a/patches/strace/4.10/007_fix_bexecve64_test.patch
+++ b/packages/strace/4.10/007_fix_bexecve64_test.patch
diff --git a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch b/packages/strace/4.10/008_decode_mips_indirect_syscall.patch
index d2d7217..d2d7217 100644
--- a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch
+++ b/packages/strace/4.10/008_decode_mips_indirect_syscall.patch
diff --git a/patches/strace/4.10/009-upstream-musl_includes.patch b/packages/strace/4.10/009-upstream-musl_includes.patch
index c68f8d8..c68f8d8 100644
--- a/patches/strace/4.10/009-upstream-musl_includes.patch
+++ b/packages/strace/4.10/009-upstream-musl_includes.patch
diff --git a/patches/strace/4.10/010-use-host-ioctl.patch b/packages/strace/4.10/010-use-host-ioctl.patch
index e9c34d3..e9c34d3 100644
--- a/patches/strace/4.10/010-use-host-ioctl.patch
+++ b/packages/strace/4.10/010-use-host-ioctl.patch
diff --git a/packages/strace/4.10/version.desc b/packages/strace/4.10/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.10/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/strace/4.11/010-use-host-ioctl.patch b/packages/strace/4.11/010-use-host-ioctl.patch
index 5155200..5155200 100644
--- a/patches/strace/4.11/010-use-host-ioctl.patch
+++ b/packages/strace/4.11/010-use-host-ioctl.patch
diff --git a/packages/strace/4.11/version.desc b/packages/strace/4.11/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.11/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/strace/4.12/010-use-host-ioctl.patch b/packages/strace/4.12/010-use-host-ioctl.patch
index bd5a40e..bd5a40e 100644
--- a/patches/strace/4.12/010-use-host-ioctl.patch
+++ b/packages/strace/4.12/010-use-host-ioctl.patch
diff --git a/packages/strace/4.12/version.desc b/packages/strace/4.12/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.12/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/strace/4.13/010-use-host-ioctl.patch b/packages/strace/4.13/010-use-host-ioctl.patch
index 40ebbf3..40ebbf3 100644
--- a/patches/strace/4.13/010-use-host-ioctl.patch
+++ b/packages/strace/4.13/010-use-host-ioctl.patch
diff --git a/packages/strace/4.13/version.desc b/packages/strace/4.13/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.13/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/strace/4.14/010-use-host-ioctl.patch b/packages/strace/4.14/010-use-host-ioctl.patch
index 2c7671f..2c7671f 100644
--- a/patches/strace/4.14/010-use-host-ioctl.patch
+++ b/packages/strace/4.14/010-use-host-ioctl.patch
diff --git a/packages/strace/4.14/version.desc b/packages/strace/4.14/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.14/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/strace/4.15/010-use-host-ioctl.patch b/packages/strace/4.15/010-use-host-ioctl.patch
index 71d380a..71d380a 100644
--- a/patches/strace/4.15/010-use-host-ioctl.patch
+++ b/packages/strace/4.15/010-use-host-ioctl.patch
diff --git a/packages/strace/4.15/version.desc b/packages/strace/4.15/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/strace/4.15/version.desc
diff --git a/packages/strace/4.16/version.desc b/packages/strace/4.16/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/strace/4.16/version.desc
diff --git a/patches/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch b/packages/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch
index ebbf69a..ebbf69a 100644
--- a/patches/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch
+++ b/packages/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch
diff --git a/patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch b/packages/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch
index 2f47dc9..2f47dc9 100644
--- a/patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch
+++ b/packages/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch
diff --git a/patches/strace/4.5.18/140-statfs64-check.patch b/packages/strace/4.5.18/140-statfs64-check.patch
index 758966b..758966b 100644
--- a/patches/strace/4.5.18/140-statfs64-check.patch
+++ b/packages/strace/4.5.18/140-statfs64-check.patch
diff --git a/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch b/packages/strace/4.5.18/160-fix-check-for-linux-netlink.patch
index e12b4e4..e12b4e4 100644
--- a/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch
+++ b/packages/strace/4.5.18/160-fix-check-for-linux-netlink.patch
diff --git a/patches/strace/4.5.18/160-undef-syscall.patch b/packages/strace/4.5.18/160-undef-syscall.patch
index c7dcb07..c7dcb07 100644
--- a/patches/strace/4.5.18/160-undef-syscall.patch
+++ b/packages/strace/4.5.18/160-undef-syscall.patch
diff --git a/patches/strace/4.5.18/170-no_cachectl.patch b/packages/strace/4.5.18/170-no_cachectl.patch
index a8fab23..a8fab23 100644
--- a/patches/strace/4.5.18/170-no_cachectl.patch
+++ b/packages/strace/4.5.18/170-no_cachectl.patch
diff --git a/patches/strace/4.5.18/180-arm-EABI-syscalls.patch b/packages/strace/4.5.18/180-arm-EABI-syscalls.patch
index 1f28450..1f28450 100644
--- a/patches/strace/4.5.18/180-arm-EABI-syscalls.patch
+++ b/packages/strace/4.5.18/180-arm-EABI-syscalls.patch
diff --git a/patches/strace/4.5.18/900-autoreconf.patch b/packages/strace/4.5.18/900-autoreconf.patch
index cff775f..cff775f 100644
--- a/patches/strace/4.5.18/900-autoreconf.patch
+++ b/packages/strace/4.5.18/900-autoreconf.patch
diff --git a/packages/strace/4.5.18/version.desc b/packages/strace/4.5.18/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.5.18/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch b/packages/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch
index a555fc2..a555fc2 100644
--- a/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch
+++ b/packages/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch
diff --git a/patches/strace/4.5.19/130-statfs64-check.patch b/packages/strace/4.5.19/130-statfs64-check.patch
index 0959bdd..0959bdd 100644
--- a/patches/strace/4.5.19/130-statfs64-check.patch
+++ b/packages/strace/4.5.19/130-statfs64-check.patch
diff --git a/patches/strace/4.5.19/150-undef-syscall.patch b/packages/strace/4.5.19/150-undef-syscall.patch
index 7d65e1d..7d65e1d 100644
--- a/patches/strace/4.5.19/150-undef-syscall.patch
+++ b/packages/strace/4.5.19/150-undef-syscall.patch
diff --git a/patches/strace/4.5.19/160-fix-check-for-linux-netlink.patch b/packages/strace/4.5.19/160-fix-check-for-linux-netlink.patch
index d8c6b2a..d8c6b2a 100644
--- a/patches/strace/4.5.19/160-fix-check-for-linux-netlink.patch
+++ b/packages/strace/4.5.19/160-fix-check-for-linux-netlink.patch
diff --git a/patches/strace/4.5.19/170-update-configure.patch b/packages/strace/4.5.19/170-update-configure.patch
index 5d12276..5d12276 100644
--- a/patches/strace/4.5.19/170-update-configure.patch
+++ b/packages/strace/4.5.19/170-update-configure.patch
diff --git a/packages/strace/4.5.19/version.desc b/packages/strace/4.5.19/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.5.19/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/strace/4.5.20/version.desc b/packages/strace/4.5.20/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.5.20/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/strace/4.6/version.desc b/packages/strace/4.6/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.6/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/strace/4.7/version.desc b/packages/strace/4.7/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch b/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
index 49a71e1..49a71e1 100644
--- a/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
+++ b/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
diff --git a/packages/strace/4.8/version.desc b/packages/strace/4.8/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/strace/4.9/version.desc b/packages/strace/4.9/version.desc
new file mode 100644
index 0000000..026d275
--- /dev/null
+++ b/packages/strace/4.9/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/strace/package.desc b/packages/strace/package.desc
new file mode 100644
index 0000000..9960dff
--- /dev/null
+++ b/packages/strace/package.desc
@@ -0,0 +1 @@
+repository="git https://git.code.sf.net/p/strace/code"
diff --git a/patches/zlib/1.2.11/100-make-check-fail.patch b/packages/zlib/1.2.11/100-make-check-fail.patch
index 3852206..3852206 100644
--- a/patches/zlib/1.2.11/100-make-check-fail.patch
+++ b/packages/zlib/1.2.11/100-make-check-fail.patch
diff --git a/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch b/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch
index 6704e3e..6704e3e 100644
--- a/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch
+++ b/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch
diff --git a/patches/zlib/1.2.11/120-mingw-static-only.patch b/packages/zlib/1.2.11/120-mingw-static-only.patch
index 9eef00b..9eef00b 100644
--- a/patches/zlib/1.2.11/120-mingw-static-only.patch
+++ b/packages/zlib/1.2.11/120-mingw-static-only.patch
diff --git a/packages/zlib/1.2.11/version.desc b/packages/zlib/1.2.11/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/zlib/1.2.11/version.desc
diff --git a/packages/zlib/package.desc b/packages/zlib/package.desc
new file mode 100644
index 0000000..eea24eb
--- /dev/null
+++ b/packages/zlib/package.desc
@@ -0,0 +1 @@
+repository="git https://github.com/madler/zlib.git"
diff --git a/patches/ltrace/0.5.2/100-allow-cross-compile.patch b/patches/ltrace/0.5.2/100-allow-cross-compile.patch
deleted file mode 100644
index 10440ad..0000000
--- a/patches/ltrace/0.5.2/100-allow-cross-compile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -durN ltrace-0.5.2.orig/Makefile.in ltrace-0.5.2/Makefile.in
---- ltrace-0.5.2.orig/Makefile.in	2009-05-21 19:14:54.000000000 +0200
-+++ ltrace-0.5.2/Makefile.in	2009-06-27 15:30:34.000000000 +0200
-@@ -2,8 +2,14 @@
- # ltrace's Makefile.in
- #
- 
--#OS		:= $(shell uname -s)
- OS		:= @HOST_OS@
-+ARCH		:= $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/      \
-+						   -e s/sun4u/sparc64/  \
-+						   -e s/arm.*/arm/      \
-+						   -e s/sa110/arm/      \
-+						   -e s/ppc64/ppc/      \
-+						   -e s/s390x/s390/)
-+export ARCH
- 
- TOPDIR		= $(shell pwd)
- 
-diff -durN ltrace-0.5.2.orig/configure ltrace-0.5.2/configure
---- ltrace-0.5.2.orig/configure	2009-05-21 19:14:57.000000000 +0200
-+++ ltrace-0.5.2/configure	2009-06-27 15:30:34.000000000 +0200
-@@ -660,6 +660,7 @@
- host_cpu
- host_vendor
- host_os
-+HOST_ARCH
- HOST_OS
- CC
- CFLAGS
-@@ -1823,6 +1824,7 @@
- case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- 
- 
-+HOST_ARCH="$host_cpu"
- case "$host_os" in
-   linux-gnu*) host_os=linux-gnu
- esac
-@@ -5406,6 +5408,7 @@
- host_cpu!$host_cpu$ac_delim
- host_vendor!$host_vendor$ac_delim
- host_os!$host_os$ac_delim
-+HOST_ARCH!$HOST_ARCH$ac_delim
- HOST_OS!$HOST_OS$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
-@@ -5426,7 +5429,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -durN ltrace-0.5.2.orig/configure.ac ltrace-0.5.2/configure.ac
---- ltrace-0.5.2.orig/configure.ac	2009-05-21 19:14:54.000000000 +0200
-+++ ltrace-0.5.2/configure.ac	2009-06-27 15:30:34.000000000 +0200
-@@ -11,6 +11,8 @@
- esac
- HOST_OS="$host_os"
- AC_SUBST(HOST_OS)
-+HOST_ARCH="$host_cpu"
-+AC_SUBST(HOST_ARCH)
- 
- dnl Checks for programs.
- AC_PROG_CC
-diff -durN ltrace-0.5.2.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.2/sysdeps/linux-gnu/Makefile
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/Makefile	2009-05-21 19:14:54.000000000 +0200
-+++ ltrace-0.5.2/sysdeps/linux-gnu/Makefile	2009-06-27 15:30:34.000000000 +0200
-@@ -1,6 +1,3 @@
--ARCH		:=	$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
--			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
--
- CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
- 
- OBJ		=	events.o trace.o proc.o breakpoint.o
diff --git a/patches/ltrace/0.5.2/110-alpha-support.patch b/patches/ltrace/0.5.2/110-alpha-support.patch
deleted file mode 100644
index f121ca1..0000000
--- a/patches/ltrace/0.5.2/110-alpha-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN ltrace-0.5.2.orig/Makefile.in ltrace-0.5.2/Makefile.in
---- ltrace-0.5.2.orig/Makefile.in	2009-06-27 15:34:04.000000000 +0200
-+++ ltrace-0.5.2/Makefile.in	2009-06-27 15:34:27.000000000 +0200
-@@ -5,6 +5,7 @@
- OS		:= @HOST_OS@
- ARCH		:= $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/      \
- 						   -e s/sun4u/sparc64/  \
-+						   -e s/alpha.*/alpha/  \
- 						   -e s/arm.*/arm/      \
- 						   -e s/sa110/arm/      \
- 						   -e s/ppc64/ppc/      \
diff --git a/patches/ltrace/0.5.2/120-debian-ltrace-0.5.2-2.patch b/patches/ltrace/0.5.2/120-debian-ltrace-0.5.2-2.patch
deleted file mode 100644
index 6d62315..0000000
--- a/patches/ltrace/0.5.2/120-debian-ltrace-0.5.2-2.patch
+++ /dev/null
@@ -1,240 +0,0 @@
---- ltrace-0.5.2.orig/TODO
-+++ ltrace-0.5.2/TODO
-@@ -37,3 +37,4 @@
- * debug: change "-d" option to be something like "-d elf,events", or "-d breakpoints"
- * Find out if a process is sharing memory with its parent?
- * When using -p, find out if that process is sharing memory with other procs
-+* After a clone(), syscalls may be seen as sysrets in s390 (see trace.c:syscall_p())
---- ltrace-0.5.2.orig/process_event.c
-+++ ltrace-0.5.2/process_event.c
-@@ -170,7 +170,7 @@
- 			enable_breakpoint(proc->pid, proc->breakpoint_being_enabled);
- 			proc->breakpoint_being_enabled = NULL;
- 		}
--		if (proc->parent->state == STATE_ATTACHED && options.follow) {
-+		if (options.follow) {
- 			proc->state = STATE_ATTACHED;
- 		} else {
- 			proc->state = STATE_IGNORED;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/ppc/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/ppc/trace.c
-@@ -50,9 +50,9 @@
- 			*sysnum =
- 			    (int)ptrace(PTRACE_PEEKUSER, proc->pid,
- 					sizeof(long) * PT_R0, 0);
--			if (proc->callstack_depth > 0
--			    && proc->callstack[proc->callstack_depth -
--					       1].is_syscall) {
-+			if (proc->callstack_depth > 0 &&
-+					proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+					proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 				return 2;
- 			}
- 			return 1;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/i386/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/i386/trace.c
-@@ -32,7 +32,8 @@
- 		*sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, 4 * ORIG_EAX, 0);
- 
- 		if (proc->callstack_depth > 0 &&
--		    proc->callstack[proc->callstack_depth - 1].is_syscall) {
-+				proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+				proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 			return 2;
- 		}
- 
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/ia64/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/ia64/trace.c
-@@ -106,8 +106,8 @@
- 		if (insn == 0x1000000000 || insn == 0x1ffffffffff) {
- 			*sysnum = r15;
- 			if (proc->callstack_depth > 0 &&
--			    proc->callstack[proc->callstack_depth -
--					    1].is_syscall) {
-+				proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+				proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 				return 2;
- 			}
- 			return 1;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/m68k/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/m68k/trace.c
-@@ -36,9 +36,8 @@
- 		if (*sysnum >= 0) {
- 			depth = proc->callstack_depth;
- 			if (depth > 0 &&
--			    proc->callstack[depth - 1].is_syscall &&
--			    proc->callstack[depth - 1].c_un.syscall ==
--			    *sysnum) {
-+					proc->callstack[depth - 1].is_syscall &&
-+					proc->callstack[depth - 1].c_un.syscall == *sysnum) {
- 				return 2;
- 			} else {
- 				return 1;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/alpha/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/alpha/trace.c
-@@ -36,8 +36,9 @@
- 			return 0;
- 		*sysnum =
- 		    ptrace(PTRACE_PEEKUSER, proc->pid, 0 /* REG_R0 */ , 0);
--		if (proc->callstack_depth > 0
--		    && proc->callstack[proc->callstack_depth - 1].is_syscall) {
-+		if (proc->callstack_depth > 0 &&
-+		    proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+			proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 			return 2;
- 		}
- 		if (*sysnum >= 0 && *sysnum < 500) {
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/sparc/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/sparc/trace.c
-@@ -33,9 +33,9 @@
- 		insn = ptrace(PTRACE_PEEKTEXT, proc->pid, ip, 0);
- 		if ((insn & 0xc1f8007f) == 0x81d00010) {
- 			*sysnum = ((proc_archdep *) proc->arch_ptr)->regs.r_g1;
--			if ((proc->callstack_depth > 0)
--			    && proc->callstack[proc->callstack_depth -
--					       1].is_syscall) {
-+			if (proc->callstack_depth > 0 &&
-+					proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+					proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 				return 2;
- 			} else if (*sysnum >= 0) {
- 				return 1;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/mipsel/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/mipsel/trace.c
-@@ -60,33 +60,34 @@
- int
- syscall_p(Process *proc, int status, int *sysnum) {
- 	if (WIFSTOPPED(status)
--	    && WSTOPSIG(status) == (SIGTRAP | proc->tracesysgood)) {
--       /* get the user's pc (plus 8) */
--       long pc = (long)get_instruction_pointer(proc);
--       /* fetch the SWI instruction */
--       int insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 4, 0);
--       int num = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 8, 0);
--       
--/*
--  On a mipsel,  syscall looks like:
--  24040fa1    li v0, 0x0fa1   # 4001 --> _exit syscall
--  0000000c    syscall
-- */
--      if(insn!=0x0000000c){
--          return 0;
--      }
--
--      *sysnum = (num & 0xFFFF) - 4000;
--      /* if it is a syscall, return 1 or 2 */
--      if (proc->callstack_depth > 0 &&
--          proc->callstack[proc->callstack_depth - 1].is_syscall) {
--          return 2;
--      }
--      
--      if (*sysnum >= 0) {
--          return 1;
--      }
--   }
-+			&& WSTOPSIG(status) == (SIGTRAP | proc->tracesysgood)) {
-+		/* get the user's pc (plus 8) */
-+		long pc = (long)get_instruction_pointer(proc);
-+		/* fetch the SWI instruction */
-+		int insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 4, 0);
-+		int num = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 8, 0);
-+
-+		/*
-+		   On a mipsel,  syscall looks like:
-+		   24040fa1    li v0, 0x0fa1   # 4001 --> _exit syscall
-+		   0000000c    syscall
-+		 */
-+		if(insn!=0x0000000c){
-+			return 0;
-+		}
-+
-+		*sysnum = (num & 0xFFFF) - 4000;
-+		/* if it is a syscall, return 1 or 2 */
-+		if (proc->callstack_depth > 0 &&
-+				proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+				proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
-+			return 2;
-+		}
-+
-+		if (*sysnum >= 0) {
-+			return 1;
-+		}
-+	}
- 	return 0;
- }
- /**
-@@ -119,34 +120,34 @@
- */
- long
- gimme_arg(enum tof type, Process *proc, int arg_num, arg_type_info *info) {
--    long ret;
--    debug(2,"type %d arg %d",type,arg_num);
--    if (type == LT_TOF_FUNCTION || type == LT_TOF_SYSCALL){
--        if(arg_num <4){
--            ret=ptrace(PTRACE_PEEKUSER,proc->pid,off_a0+arg_num,0);
--            debug(2,"ret = %#lx",ret);
--            return ret;
--        } else {
--            // If we need this, I think we can look at [sp+16] for arg_num==4.
--            CP;
--            return 0;
--        }
--    } 
--    if(arg_num>=0){
--       fprintf(stderr,"args on return?");
--    }
--    if(type == LT_TOF_FUNCTIONR) {
--        return  ptrace(PTRACE_PEEKUSER,proc->pid,off_v0,0);
--    }
--    if (type == LT_TOF_SYSCALLR) {
--        unsigned a3=ptrace(PTRACE_PEEKUSER, proc->pid,off_a3,0);
--        unsigned v0=ptrace(PTRACE_PEEKUSER, proc->pid,off_v0,0);
--        if(!a3){
--            return v0;
--        }
--        return -1;
--    }
--    fprintf(stderr, "gimme_arg called with wrong arguments\n");
-+	long ret;
-+	debug(2,"type %d arg %d",type,arg_num);
-+	if (type == LT_TOF_FUNCTION || type == LT_TOF_SYSCALL){
-+		if(arg_num <4){
-+			ret=ptrace(PTRACE_PEEKUSER,proc->pid,off_a0+arg_num,0);
-+			debug(2,"ret = %#lx",ret);
-+			return ret;
-+		} else {
-+			// If we need this, I think we can look at [sp+16] for arg_num==4.
-+			CP;
-+			return 0;
-+		}
-+	} 
-+	if(arg_num>=0){
-+		fprintf(stderr,"args on return?");
-+	}
-+	if(type == LT_TOF_FUNCTIONR) {
-+		return  ptrace(PTRACE_PEEKUSER,proc->pid,off_v0,0);
-+	}
-+	if (type == LT_TOF_SYSCALLR) {
-+		unsigned a3=ptrace(PTRACE_PEEKUSER, proc->pid,off_a3,0);
-+		unsigned v0=ptrace(PTRACE_PEEKUSER, proc->pid,off_v0,0);
-+		if(!a3){
-+			return v0;
-+		}
-+		return -1;
-+	}
-+	fprintf(stderr, "gimme_arg called with wrong arguments\n");
- 	return 0;
- }
- 
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/x86_64/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/x86_64/trace.c
-@@ -41,7 +41,8 @@
- 		*sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, 8 * ORIG_RAX, 0);
- 
- 		if (proc->callstack_depth > 0 &&
--		    proc->callstack[proc->callstack_depth - 1].is_syscall) {
-+				proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+				proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 			return 2;
- 		}
- 
diff --git a/patches/ltrace/0.5.2/130-fix-build-with-exotic-linux-host-OS.patch b/patches/ltrace/0.5.2/130-fix-build-with-exotic-linux-host-OS.patch
deleted file mode 100644
index 20396d6..0000000
--- a/patches/ltrace/0.5.2/130-fix-build-with-exotic-linux-host-OS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN ltrace-0.5.2.orig/configure ltrace-0.5.2/configure
---- ltrace-0.5.2.orig/configure	2009-09-14 18:47:45.000000000 +0200
-+++ ltrace-0.5.2/configure	2009-09-14 18:49:18.000000000 +0200
-@@ -1829,6 +1829,9 @@
-   linux-gnu*) host_os=linux-gnu
- esac
- HOST_OS="$host_os"
-+case "${HOST_OS}" in
-+  linux-*) HOST_OS=linux-gnu;;
-+esac
- 
- 
- ac_ext=c
-diff -durN ltrace-0.5.2.orig/configure.ac ltrace-0.5.2/configure.ac
---- ltrace-0.5.2.orig/configure.ac	2009-09-14 18:47:45.000000000 +0200
-+++ ltrace-0.5.2/configure.ac	2009-09-14 18:49:18.000000000 +0200
-@@ -10,6 +10,9 @@
-   linux-gnu*) host_os=linux-gnu
- esac
- HOST_OS="$host_os"
-+case "${HOST_OS}" in
-+  linux-*) HOST_OS=linux-gnu;;
-+esac
- AC_SUBST(HOST_OS)
- HOST_ARCH="$host_cpu"
- AC_SUBST(HOST_ARCH)
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index e6a4875..0fc5875 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -84,7 +84,9 @@ do_gmp_backend() {
 
     CT_DoLog EXTRA "Configuring GMP"
 
-    if [ ! "${CT_GMP_5_0_2_or_later}" = "y" ]; then
+    # FIXME is it needed even for older versions? They seem to compile fine
+    # without it.
+    if [ "${CT_GMP_HAS_MPBSD}" = "y" ]; then
         extra_config+=("--enable-mpbsd")
     fi
 
diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh
index ef93bbd..0b8777b 100644
--- a/scripts/build/companion_libs/121-isl.sh
+++ b/scripts/build/companion_libs/121-isl.sh
@@ -86,12 +86,12 @@ do_isl_backend() {
 
     CT_DoLog EXTRA "Configuring ISL"
 
-    if [ "${CT_ISL_V_0_12_or_later}" != "y" ]; then
+    if [ "${CT_ISL_NEEDS_WITH_GMP}" != "y" ]; then
         extra_config+=("--with-libgmp-prefix=${prefix}")
         extra_config+=("--with-libgmpxx-prefix=${prefix}")
     fi
 
-    if [ "${CT_ISL_V_0_14_or_later}" != "y" ]; then
+    if [ "${CT_ISL_HAS_WITH_PIPLIB}" != "y" ]; then
         extra_config+=("--with-piplib=no")
     fi
 
diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh
index b21b028..6090b27 100644
--- a/scripts/build/companion_libs/130-cloog.sh
+++ b/scripts/build/companion_libs/130-cloog.sh
@@ -85,7 +85,7 @@ do_cloog_backend() {
         eval "${arg// /\\ }"
     done
 
-    if [ "${CT_CLOOG_0_18_or_later}" = y ]; then
+    if [ "${CT_CLOOG_HAS_WITH_GMP_ISL_OSL}" = y ]; then
         cloog_opts+=( --with-gmp=system --with-gmp-prefix="${prefix}" )
         cloog_opts+=( --with-isl=system --with-isl-prefix="${prefix}" )
         cloog_opts+=( --without-osl )