diff --git a/app-shells/bash_completion/bash_completion-2.1.recipe b/app-shells/bash_completion/bash_completion-2.1.recipe
deleted file mode 100644
index 74ebebcdc..000000000
--- a/app-shells/bash_completion/bash_completion-2.1.recipe
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY="Tab-completion for the Bash shell"
-DESCRIPTION="Since v2.04, bash has allowed you to intelligently program \
-and extend its standard completion behavior to achieve complex command \
-lines with just a few keystrokes. Imagine typing ssh [Tab] and being \
-able to complete on hosts from your ~/.ssh/known_hosts files. Or typing \
-man 3 str [Tab] and getting a list of all string handling functions in \
-the UNIX manual. mount system: [Tab] would complete on all exported \
-file-systems from the host called system, while make [Tab] would complete \
-on all targets in Makefile. This project was conceived to produce \
-programmable completion routines for the most common Linux/UNIX commands, \
-reducing the amount of typing sysadmins and programmers need to do on \
-a daily basis."
-HOMEPAGE="http://bash-completion.alioth.debian.org/"
-COPYRIGHT="2006-2014 Debian Project"
-LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="http://bash-completion.alioth.debian.org/files/bash-completion-$portVersion.tar.bz2"
-CHECKSUM_SHA256="2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f"
-SOURCE_DIR="bash-completion-$portVersion"
-PATCHES="bash_completion-haiku.patch"
-
-ARCHITECTURES="any"
-
-GLOBAL_WRITABLE_FILES="
-	settings/profile.d/bash_completion.sh auto-merge
-	"
-USER_SETTINGS_FILES="
-	settings/profile.d/bash_completion.sh
-	"
-
-PROVIDES="
-	bash_completion = $portVersion
-	"
-REQUIRES="
-	cmd:bash
-	"
-
-BUILD_REQUIRES="
-	cmd:bash
-	"
-BUILD_PREREQUIRES="
-	haiku
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:awk
-	cmd:bash
-	cmd:make
-	"
-
-BUILD()
-{
-	aclocal
-	automake
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
diff --git a/app-shells/bash_completion/bash_completion-2.7.recipe b/app-shells/bash_completion/bash_completion-2.11.recipe
similarity index 91%
rename from app-shells/bash_completion/bash_completion-2.7.recipe
rename to app-shells/bash_completion/bash_completion-2.11.recipe
index 6b4ba41d8..2866227db 100644
--- a/app-shells/bash_completion/bash_completion-2.7.recipe
+++ b/app-shells/bash_completion/bash_completion-2.11.recipe
@@ -11,15 +11,15 @@ programmable completion routines for the most common Linux/UNIX commands, \
 reducing the amount of typing sysadmins and programmers need to do on \
 a daily basis."
 HOMEPAGE="https://github.com/scop/bash-completion"
-COPYRIGHT="2006-2017 Debian Project"
+COPYRIGHT="2006-2020 Debian Project"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/scop/bash-completion/releases/download/$portVersion/bash-completion-$portVersion.tar.xz"
-CHECKSUM_SHA256="41ba892d3f427d4a686de32673f35401bc947a7801f684127120cdb13641441e"
+CHECKSUM_SHA256="73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac"
 SOURCE_DIR="bash-completion-$portVersion"
 PATCHES="bash_completion-$portVersion.patchset"
 
-ARCHITECTURES="x86_64"
+ARCHITECTURES="any"
 
 PROVIDES="
 	bash_completion = $portVersion
diff --git a/app-shells/bash_completion/bash_completion-2.3.recipe b/app-shells/bash_completion/bash_completion-2.3.recipe
deleted file mode 100644
index 41e566636..000000000
--- a/app-shells/bash_completion/bash_completion-2.3.recipe
+++ /dev/null
@@ -1,65 +0,0 @@
-SUMMARY="Tab-completion for the Bash shell"
-DESCRIPTION="Since v2.04, bash has allowed you to intelligently program \
-and extend its standard completion behavior to achieve complex command \
-lines with just a few keystrokes. Imagine typing ssh [Tab] and being \
-able to complete on hosts from your ~/.ssh/known_hosts files. Or typing \
-man 3 str [Tab] and getting a list of all string handling functions in \
-the UNIX manual. mount system: [Tab] would complete on all exported \
-file-systems from the host called system, while make [Tab] would complete \
-on all targets in Makefile. This project was conceived to produce \
-programmable completion routines for the most common Linux/UNIX commands, \
-reducing the amount of typing sysadmins and programmers need to do on \
-a daily basis."
-HOMEPAGE="https://github.com/scop/bash-completion"
-COPYRIGHT="2006-2014 Debian Project"
-LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz"
-CHECKSUM_SHA256="b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9"
-SOURCE_DIR="bash-completion-$portVersion"
-PATCHES="bash_completion-$portVersion.patchset"
-
-ARCHITECTURES="!any"
-
-PROVIDES="
-	bash_completion = $portVersion
-	"
-REQUIRES="
-	cmd:bash
-	"
-BUILD_REQUIRES="
-	cmd:bash
-	"
-BUILD_PREREQUIRES="
-	haiku
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:awk
-	cmd:bash
-	cmd:make
-	"
-
-GLOBAL_WRITABLE_FILES="
-	settings/profile.d/bash_completion.sh auto-merge
-	"
-USER_SETTINGS_FILES="
-	settings/profile.d/bash_completion.sh
-	"
-
-BUILD()
-{
-	autoreconf -i
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
-
-#TEST()
-#{
-#	make check
-#}
diff --git a/app-shells/bash_completion/patches/bash_completion-haiku.patch b/app-shells/bash_completion/patches/bash_completion-2.11.patchset
similarity index 85%
rename from app-shells/bash_completion/patches/bash_completion-haiku.patch
rename to app-shells/bash_completion/patches/bash_completion-2.11.patchset
index f0e367b8a..09c2d3ae7 100644
--- a/app-shells/bash_completion/patches/bash_completion-haiku.patch
+++ b/app-shells/bash_completion/patches/bash_completion-2.11.patchset
@@ -1,31 +1,31 @@
-From 305b56f2c4e91c8502c253e4cfb2d83f46678dda Mon Sep 17 00:00:00 2001
+From c83f6af3e75d67aa7789c5656f872c4b3aaf49cc Mon Sep 17 00:00:00 2001
 From: Kostadin Damyanov <maxmight@gmail.com>
 Date: Wed, 23 Sep 2015 22:55:52 +0300
-Subject: [PATCH] Add pkgman and finddir support.
+Subject: [PATCH] Add pkgman and finddir support
 
 ---
  completions/Makefile.am |  4 +++-
  completions/finddir     | 17 +++++++++++++++++
- completions/pkgman      | 42 ++++++++++++++++++++++++++++++++++++++++++
+ completions/pkgman      | 42 +++++++++++++++++++++++++++++++++++++++++
  3 files changed, 62 insertions(+), 1 deletion(-)
  create mode 100644 completions/finddir
  create mode 100644 completions/pkgman
 
 diff --git a/completions/Makefile.am b/completions/Makefile.am
-index f312b3a..3c43796 100644
+index 723b42f..6a66739 100644
 --- a/completions/Makefile.am
 +++ b/completions/Makefile.am
-@@ -377,7 +377,9 @@ bashcomp_DATA = a2x \
- 		xz \
- 		xzdec \
- 		ypmatch \
--		yum-arch
-+		yum-arch \
+@@ -467,7 +467,9 @@ bashcomp_DATA = 2to3 \
+ 		_yum \
+ 		yum-arch \
+ 		zopfli \
+-		zopflipng
++		zopflipng \
 +		pkgman \
 +		finddir
  
- EXTRA_DIST = $(bashcomp_DATA) \
- 	     _mock _modules _subversion _udevadm _yum _yum-utils
+ EXTRA_DIST = $(bashcomp_DATA)
+ 
 diff --git a/completions/finddir b/completions/finddir
 new file mode 100644
 index 0000000..cf7f6e4
@@ -98,5 +98,5 @@ index 0000000..f1f942f
 +} &&
 +complete -F _pkgman pkgman
 -- 
-2.2.2
+2.30.0
 
diff --git a/app-shells/bash_completion/patches/bash_completion-2.3.patchset b/app-shells/bash_completion/patches/bash_completion-2.3.patchset
deleted file mode 100644
index 543df517e..000000000
--- a/app-shells/bash_completion/patches/bash_completion-2.3.patchset
+++ /dev/null
@@ -1,96 +0,0 @@
-From e2a76ee024fcf5ac70ebdd6bf875dd3010c193cc Mon Sep 17 00:00:00 2001
-From: Kostadin Damyanov <maxmight@gmail.com>
-Date: Wed, 23 Sep 2015 22:55:52 +0300
-Subject: Add pkgman and finddir support.
-
-
-diff --git a/completions/Makefile.am b/completions/Makefile.am
-index 99c283c..9279511 100644
---- a/completions/Makefile.am
-+++ b/completions/Makefile.am
-@@ -411,7 +411,10 @@ bashcomp_DATA = 2to3 \
- 		_yum \
- 		yum-arch \
- 		zopfli \
--		zopflipng
-+		zopflipng \
-+		pkgman \
-+		finddir
-+
-
- EXTRA_DIST = $(bashcomp_DATA)
-
-diff --git a/completions/finddir b/completions/finddir
-new file mode 100644
-index 0000000..cf7f6e4
---- /dev/null
-+++ b/completions/finddir
-@@ -0,0 +1,17 @@
-+_finddir()
-+{
-+	local cur words
-+	_init_completion || return
-+
-+	COMPREPLY=()
-+	cur=${COMP_WORDS[COMP_CWORD]}
-+
-+	if [[ "$cur" == -* ]]; then
-+		COMPREPLY=( $( compgen -W '-l -v' -- "$cur" ) )
-+	else
-+		COMPREPLY=( $( compgen -W '$( finddir -l )' -- "$cur" ) )
-+	fi
-+
-+	return 0
-+} &&
-+complete -F _finddir finddir
-diff --git a/completions/pkgman b/completions/pkgman
-new file mode 100644
-index 0000000..f1f942f
---- /dev/null
-+++ b/completions/pkgman
-@@ -0,0 +1,42 @@
-+_pkgman()
-+{
-+	local cur words
-+	_init_completion || return
-+
-+	COMPREPLY=()
-+	cur=${COMP_WORDS[COMP_CWORD]}
-+
-+	local special i
-+	for (( i=0; i < ${#words[@]}-1; i++ )); do
-+		if [[ ${words[i]} == @(install|uninstall) ]]; then
-+			special=${words[i]}
-+		fi
-+	done
-+
-+	if [[ -n $special ]]; then
-+		case $special in
-+			install)
-+				COMPREPLY=( $( compgen -W "$( pkgman search -a -D | awk 'NR>2 { print $2 }' )" -- "$cur" ) )
-+				return 0
-+				;;
-+			uninstall)
-+				COMPREPLY=( $( compgen -W "$( pkgman search -a -i | awk 'NR>2 { print $2 }' )" -- "$cur" ) )
-+				return 0
-+				;;
-+			*)
-+				return 0
-+				;;
-+		esac
-+	fi
-+
-+	if [[ "$cur" == -* ]]; then
-+		COMPREPLY=( $( compgen -W '-h --help' -- "$cur" ) )
-+	else
-+		COMPREPLY=( $( compgen -W 'full-sync install search \
-+			uninstall update add-repo drop-repo list-repos refresh \
-+			resolve-dependencies' -- "$cur" ) )
-+	fi
-+
-+	return 0
-+} &&
-+complete -F _pkgman pkgman
---
-2.2.2
-
diff --git a/app-shells/bash_completion/patches/bash_completion-2.7.patchset b/app-shells/bash_completion/patches/bash_completion-2.7.patchset
deleted file mode 100644
index 543df517e..000000000
--- a/app-shells/bash_completion/patches/bash_completion-2.7.patchset
+++ /dev/null
@@ -1,96 +0,0 @@
-From e2a76ee024fcf5ac70ebdd6bf875dd3010c193cc Mon Sep 17 00:00:00 2001
-From: Kostadin Damyanov <maxmight@gmail.com>
-Date: Wed, 23 Sep 2015 22:55:52 +0300
-Subject: Add pkgman and finddir support.
-
-
-diff --git a/completions/Makefile.am b/completions/Makefile.am
-index 99c283c..9279511 100644
---- a/completions/Makefile.am
-+++ b/completions/Makefile.am
-@@ -411,7 +411,10 @@ bashcomp_DATA = 2to3 \
- 		_yum \
- 		yum-arch \
- 		zopfli \
--		zopflipng
-+		zopflipng \
-+		pkgman \
-+		finddir
-+
-
- EXTRA_DIST = $(bashcomp_DATA)
-
-diff --git a/completions/finddir b/completions/finddir
-new file mode 100644
-index 0000000..cf7f6e4
---- /dev/null
-+++ b/completions/finddir
-@@ -0,0 +1,17 @@
-+_finddir()
-+{
-+	local cur words
-+	_init_completion || return
-+
-+	COMPREPLY=()
-+	cur=${COMP_WORDS[COMP_CWORD]}
-+
-+	if [[ "$cur" == -* ]]; then
-+		COMPREPLY=( $( compgen -W '-l -v' -- "$cur" ) )
-+	else
-+		COMPREPLY=( $( compgen -W '$( finddir -l )' -- "$cur" ) )
-+	fi
-+
-+	return 0
-+} &&
-+complete -F _finddir finddir
-diff --git a/completions/pkgman b/completions/pkgman
-new file mode 100644
-index 0000000..f1f942f
---- /dev/null
-+++ b/completions/pkgman
-@@ -0,0 +1,42 @@
-+_pkgman()
-+{
-+	local cur words
-+	_init_completion || return
-+
-+	COMPREPLY=()
-+	cur=${COMP_WORDS[COMP_CWORD]}
-+
-+	local special i
-+	for (( i=0; i < ${#words[@]}-1; i++ )); do
-+		if [[ ${words[i]} == @(install|uninstall) ]]; then
-+			special=${words[i]}
-+		fi
-+	done
-+
-+	if [[ -n $special ]]; then
-+		case $special in
-+			install)
-+				COMPREPLY=( $( compgen -W "$( pkgman search -a -D | awk 'NR>2 { print $2 }' )" -- "$cur" ) )
-+				return 0
-+				;;
-+			uninstall)
-+				COMPREPLY=( $( compgen -W "$( pkgman search -a -i | awk 'NR>2 { print $2 }' )" -- "$cur" ) )
-+				return 0
-+				;;
-+			*)
-+				return 0
-+				;;
-+		esac
-+	fi
-+
-+	if [[ "$cur" == -* ]]; then
-+		COMPREPLY=( $( compgen -W '-h --help' -- "$cur" ) )
-+	else
-+		COMPREPLY=( $( compgen -W 'full-sync install search \
-+			uninstall update add-repo drop-repo list-repos refresh \
-+			resolve-dependencies' -- "$cur" ) )
-+	fi
-+
-+	return 0
-+} &&
-+complete -F _pkgman pkgman
---
-2.2.2
-