Rename dev-python/{beautifulsoup → beautifulsoup4}

Signed-off-by: Michał Górny <mgorny@gentoo.org>

72 files changed, 99 insertions, 106 deletions

diff --git a/app-doc/cppman/cppman-0.5.1.ebuild b/app-doc/cppman/cppman-0.5.1.ebuild
index ec877b7bff5c..60a7000a55cc 100644
--- a/app-doc/cppman/cppman-0.5.1.ebuild
+++ b/app-doc/cppman/cppman-0.5.1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 RDEPEND="
 	sys-apps/groff
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 	')
 "
diff --git a/app-misc/anki/anki-2.1.15-r1.ebuild b/app-misc/anki/anki-2.1.15-r1.ebuild
index b5fc94f7294f..4b1316fe462e 100644
--- a/app-misc/anki/anki-2.1.15-r1.ebuild
+++ b/app-misc/anki/anki-2.1.15-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
 		>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
 		>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/decorator[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/app-text/calibre/calibre-5.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild
index 97757b4f3eed..023d6a32a358 100644
--- a/app-text/calibre/calibre-5.16.1-r1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-r1.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=sys-apps/dbus-1.10.8
 	$(python_gen_cond_dep '
 		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
 		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
 		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
diff --git a/app-text/calibre/calibre-5.25.0-r2.ebuild b/app-text/calibre/calibre-5.25.0-r2.ebuild
index e0bb47f48186..475b78a4790c 100644
--- a/app-text/calibre/calibre-5.25.0-r2.ebuild
+++ b/app-text/calibre/calibre-5.25.0-r2.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=sys-apps/dbus-1.10.8
 	$(python_gen_cond_dep '
 		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
 		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
 		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
index dacc96fc35c4..898b3da8d112 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
-	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
index 44b270442a57..31d7a461a061 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
-	>=dev-python/beautifulsoup-4.7[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.7[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/bandit/bandit-1.6.2-r1.ebuild b/dev-python/bandit/bandit-1.6.2-r1.ebuild
index e455e7f97a6a..c957733f8725 100644
--- a/dev-python/bandit/bandit-1.6.2-r1.ebuild
+++ b/dev-python/bandit/bandit-1.6.2-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
diff --git a/dev-python/bandit/bandit-1.7.0.ebuild b/dev-python/bandit/bandit-1.7.0.ebuild
index 5aa40dc0dd67..917f337ff285 100644
--- a/dev-python/bandit/bandit-1.7.0.ebuild
+++ b/dev-python/bandit/bandit-1.7.0.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 		>=dev-python/stestr-2.5.0
 		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup4/Manifest
index 4dede2d8d2dd..4dede2d8d2dd 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup4/Manifest
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.10.0.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
index 90b5dd8cdfb7..78187c60a289 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.10.0.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
@@ -6,13 +6,9 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
-MY_PN="${PN}4"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
 HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.9.3.ebuild
index efc93f3c7550..589f96740cb5 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.9.3.ebuild
@@ -7,13 +7,9 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
-MY_PN="${PN}4"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
 HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
diff --git a/dev-python/beautifulsoup/metadata.xml b/dev-python/beautifulsoup4/metadata.xml
index 227205f32598..227205f32598 100644
--- a/dev-python/beautifulsoup/metadata.xml
+++ b/dev-python/beautifulsoup4/metadata.xml
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild
index 72b25fc41302..6d0be009fe35 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/tldextract[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/lxml-4.6.3-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index 6e745baefa10..e0ce5bad3a36 100644
--- a/dev-python/lxml/lxml-4.6.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -95,6 +95,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
 	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
 }
diff --git a/dev-python/lxml/lxml-4.6.3.ebuild b/dev-python/lxml/lxml-4.6.3.ebuild
index 56111fe84a47..fc97e91c34bb 100644
--- a/dev-python/lxml/lxml-4.6.3.ebuild
+++ b/dev-python/lxml/lxml-4.6.3.ebuild
@@ -95,6 +95,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
 	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
 }
diff --git a/dev-python/micawber/micawber-0.5.4.ebuild b/dev-python/micawber/micawber-0.5.4.ebuild
index 87166df121a1..bcebcf389f48 100644
--- a/dev-python/micawber/micawber-0.5.4.ebuild
+++ b/dev-python/micawber/micawber-0.5.4.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 BDEPEND="
 	test? (
 		$(python_gen_impl_dep sqlite)
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/django[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
index 9e8a11b06fcb..a097bcd82d6c 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
@@ -25,7 +25,7 @@ PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
 # by first emerging with FEATURES="-test"
 BDEPEND="
 	test? ( ${PDEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pandas/pandas-1.2.3-r1.ebuild b/dev-python/pandas/pandas-1.2.3-r1.ebuild
index c8f0fca921c0..7fb2e473bcc8 100644
--- a/dev-python/pandas/pandas-1.2.3-r1.ebuild
+++ b/dev-python/pandas/pandas-1.2.3-r1.ebuild
@@ -28,7 +28,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -67,7 +67,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -88,7 +88,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
@@ -176,7 +176,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.2.4.ebuild b/dev-python/pandas/pandas-1.2.4.ebuild
index 74f03a0471fa..949852951883 100644
--- a/dev-python/pandas/pandas-1.2.4.ebuild
+++ b/dev-python/pandas/pandas-1.2.4.ebuild
@@ -28,7 +28,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -65,7 +65,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -86,7 +86,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
@@ -174,7 +174,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.2.5.ebuild b/dev-python/pandas/pandas-1.2.5.ebuild
index a55755019ca6..4d06d4f70ec3 100644
--- a/dev-python/pandas/pandas-1.2.5.ebuild
+++ b/dev-python/pandas/pandas-1.2.5.ebuild
@@ -28,7 +28,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -65,7 +65,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -86,7 +86,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
@@ -172,7 +172,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.3.0.ebuild b/dev-python/pandas/pandas-1.3.0.ebuild
index cf0c8aa8a43d..1bcde176494c 100644
--- a/dev-python/pandas/pandas-1.3.0.ebuild
+++ b/dev-python/pandas/pandas-1.3.0.ebuild
@@ -29,7 +29,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -66,7 +66,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
@@ -178,7 +178,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.3.1.ebuild b/dev-python/pandas/pandas-1.3.1.ebuild
index 922da786c996..db5cf8cfe606 100644
--- a/dev-python/pandas/pandas-1.3.1.ebuild
+++ b/dev-python/pandas/pandas-1.3.1.ebuild
@@ -29,7 +29,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -66,7 +66,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
@@ -178,7 +178,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.3.2.ebuild b/dev-python/pandas/pandas-1.3.2.ebuild
index cfd8cfcdb32f..dd278f44e3eb 100644
--- a/dev-python/pandas/pandas-1.3.2.ebuild
+++ b/dev-python/pandas/pandas-1.3.2.ebuild
@@ -29,7 +29,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -66,7 +66,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
@@ -178,7 +178,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
index c690200bee56..1bd76057e442 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/pytest-regressions[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
index f16a0025dd74..b7a5304d20e9 100644
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.3.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
 DEPEND="
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/webtest[${PYTHON_USEDEP}]
 	)"
@@ -39,5 +39,5 @@ python_test() {
 }
 
 pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup4
 }
diff --git a/dev-python/pyspelling/pyspelling-2.7.2.ebuild b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
index c22deee77eeb..ad241ebe9e03 100644
--- a/dev-python/pyspelling/pyspelling-2.7.2.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
@@ -27,7 +27,7 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
 
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspelling/pyspelling-2.7.3.ebuild b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
index 73d0ffb19840..ecc4d5168913 100644
--- a/dev-python/pyspelling/pyspelling-2.7.3.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
 
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild b/dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild
index 3be9c6d55400..9b6a7a9b8cbc 100644
--- a/dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild
+++ b/dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild
@@ -115,7 +115,7 @@ BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/soupsieve/soupsieve-2.2.1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
index a484c1b991b6..6faa3118027a 100644
--- a/dev-python/soupsieve/soupsieve-2.2.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x
 
 BDEPEND="
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		<dev-python/lxml-4.6.3-r1[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
index fcc594af6c7a..eae215832298 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/pytest-regressions[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/sphinx-testing[${PYTHON_USEDEP}]
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 9580a68bc44d..6b1ffd9087b4 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]"
 BDEPEND="
 	app-arch/unzip
 	test? (
diff --git a/dev-python/webtest/webtest-3.0.0.ebuild b/dev-python/webtest/webtest-3.0.0.ebuild
index 8e044a55a55a..209ac9463c78 100644
--- a/dev-python/webtest/webtest-3.0.0.ebuild
+++ b/dev-python/webtest/webtest-3.0.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/pastedeploy[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]"
 BDEPEND="
 	app-arch/unzip
 	test? (
diff --git a/dev-util/redo/redo-0.42a.ebuild b/dev-util/redo/redo-0.42a.ebuild
index 0d80a00e9098..f70842880856 100644
--- a/dev-util/redo/redo-0.42a.ebuild
+++ b/dev-util/redo/redo-0.42a.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
diff --git a/dev-util/redo/redo-0.42c.ebuild b/dev-util/redo/redo-0.42c.ebuild
index 0d80a00e9098..f70842880856 100644
--- a/dev-util/redo/redo-0.42c.ebuild
+++ b/dev-util/redo/redo-0.42c.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 340844257a28..be54c05a87b3 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
diff --git a/games-util/pyfa/pyfa-2.33.0.ebuild b/games-util/pyfa/pyfa-2.33.0.ebuild
index 91c42fe4412e..1bf3c9464b03 100644
--- a/games-util/pyfa/pyfa-2.33.0.ebuild
+++ b/games-util/pyfa/pyfa-2.33.0.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
 		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
 		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
diff --git a/games-util/pyfa/pyfa-2.37.0.ebuild b/games-util/pyfa/pyfa-2.37.0.ebuild
index 7f760faeb791..b053388c505f 100644
--- a/games-util/pyfa/pyfa-2.37.0.ebuild
+++ b/games-util/pyfa/pyfa-2.37.0.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
 		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
 		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 91c42fe4412e..1bf3c9464b03 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
 		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
 		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
diff --git a/media-gfx/hydrus/hydrus-450.ebuild b/media-gfx/hydrus/hydrus-450.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-450.ebuild
+++ b/media-gfx/hydrus/hydrus-450.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/hydrus/hydrus-451.ebuild b/media-gfx/hydrus/hydrus-451.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-451.ebuild
+++ b/media-gfx/hydrus/hydrus-451.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/hydrus/hydrus-452.ebuild b/media-gfx/hydrus/hydrus-452.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-452.ebuild
+++ b/media-gfx/hydrus/hydrus-452.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/hydrus/hydrus-453.ebuild b/media-gfx/hydrus/hydrus-453.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-453.ebuild
+++ b/media-gfx/hydrus/hydrus-453.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-sound/beets/beets-1.4.9-r6.ebuild b/media-sound/beets/beets-1.4.9-r6.ebuild
index 286afb9330e4..eb091e432e08 100644
--- a/media-sound/beets/beets-1.4.9-r6.ebuild
+++ b/media-sound/beets/beets-1.4.9-r6.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_USEDEP}]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 			dev-python/bluelet[${PYTHON_USEDEP}]
 			dev-python/discogs-client[${PYTHON_USEDEP}]
 			dev-python/flask[${PYTHON_USEDEP}]
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 18950a225ca1..e6e0f8dd5eb2 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_USEDEP}]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 			dev-python/bluelet[${PYTHON_USEDEP}]
 			dev-python/discogs-client[${PYTHON_USEDEP}]
 			dev-python/flask[${PYTHON_USEDEP}]
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 33ce3a4d44d7..401c080fe933 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/dbus-python
 		dev-python/pillow[${PYTHON_USEDEP}]
 		>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
index 4098e58934c5..0f4355032947 100644
--- a/media-sound/lollypop/lollypop-1.4.18.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.18.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/dbus-python
 		dev-python/gst-python[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/media-video/subliminal/subliminal-2.1.0-r1.ebuild b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
index 92763475c412..1bd69c0d6a9e 100644
--- a/media-video/subliminal/subliminal-2.1.0-r1.ebuild
+++ b/media-video/subliminal/subliminal-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ BDEPEND="
 RDEPEND="
 	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
 	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/click-4.0[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 5baa2d5e19fc..560187c90ba1 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ BDEPEND="
 RDEPEND="
 	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
 	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/click-4.0[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
index bfeb0f9c4f76..f087ac9b1512 100644
--- a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ IUSE="sqlite"
 RESTRICT="test"
 
 RDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
index ed64f325657c..d2bd5895f97a 100644
--- a/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
@@ -26,7 +26,7 @@ IUSE="sqlite"
 RESTRICT="test"
 
 RDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 79e7b5e8c15d..1d23dd82d824 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ IUSE="sqlite"
 RESTRICT="test"
 
 RDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
index ca117a1222a2..1ab07d830d90 100644
--- a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild
index 04d03cf4b9de..adf94467dd0c 100644
--- a/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
 	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
index 4558f9f72505..cef08b8a35a2 100644
--- a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
+++ b/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,6 @@ KEYWORDS="~amd64"
 
 DEPEND="dev-python/dnspython
 	dev-python/urllib3
-	dev-python/beautifulsoup"
+	dev-python/beautifulsoup4"
 RDEPEND="${DEPEND}"
 DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
index 4558f9f72505..cef08b8a35a2 100644
--- a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
+++ b/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,6 @@ KEYWORDS="~amd64"
 
 DEPEND="dev-python/dnspython
 	dev-python/urllib3
-	dev-python/beautifulsoup"
+	dev-python/beautifulsoup4"
 RDEPEND="${DEPEND}"
 DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
index cc2efd47c0b9..b984ebb2e0fc 100644
--- a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
+++ b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
@@ -16,6 +16,6 @@ KEYWORDS="~amd64"
 
 DEPEND="dev-python/dnspython
 	dev-python/urllib3
-	dev-python/beautifulsoup"
+	dev-python/beautifulsoup4"
 RDEPEND="${DEPEND}"
 DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/wapiti/wapiti-3.0.3.ebuild b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
index 6fb871db1895..c522a55d1d61 100644
--- a/net-analyzer/wapiti/wapiti-3.0.3.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="kerberos ntlm"
 
-RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
diff --git a/net-analyzer/wapiti/wapiti-3.0.4.ebuild b/net-analyzer/wapiti/wapiti-3.0.4.ebuild
index 4363743763ef..348231badfed 100644
--- a/net-analyzer/wapiti/wapiti-3.0.4.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.4.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="kerberos ntlm"
 
-RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
diff --git a/net-analyzer/wapiti/wapiti-3.0.5.ebuild b/net-analyzer/wapiti/wapiti-3.0.5.ebuild
index 4363743763ef..348231badfed 100644
--- a/net-analyzer/wapiti/wapiti-3.0.5.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.5.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="kerberos ntlm"
 
-RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 53d40bbaa97b..69ce960f21a3 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="kerberos ntlm"
 
-RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
diff --git a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210610.ebuild b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210610.ebuild
index 09cf4219cae2..f857aeab9d8d 100644
--- a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210610.ebuild
+++ b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210610.ebuild
@@ -17,7 +17,7 @@ SLOT=0
 
 RDEPEND="
 	net-irc/limnoria
-	dev-python/beautifulsoup
+	dev-python/beautifulsoup4
 "
 
 DOCS=(
diff --git a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210703.ebuild b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210703.ebuild
index 7130f90270df..5a1766f037f7 100644
--- a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210703.ebuild
+++ b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210703.ebuild
@@ -17,7 +17,7 @@ SLOT=0
 
 RDEPEND="
 	net-irc/limnoria
-	dev-python/beautifulsoup
+	dev-python/beautifulsoup4
 "
 
 DOCS=(
diff --git a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
index 1c68c3f4ba38..bf751073a211 100644
--- a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
+++ b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ RDEPEND="dev-python/django[${PYTHON_USEDEP}]
 BDEPEND="dev-python/isort[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/django-debug-toolbar[${PYTHON_USEDEP}]
 	)"
 
diff --git a/net-mail/postorius/postorius-1.3.3.ebuild b/net-mail/postorius/postorius-1.3.3.ebuild
index 366a5da93549..e78fe43d42ee 100644
--- a/net-mail/postorius/postorius-1.3.3.ebuild
+++ b/net-mail/postorius/postorius-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="net-mail/django-mailman3[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/vcrpy[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/isort[${PYTHON_USEDEP}]
 	)"
 
diff --git a/net-misc/buka/buka-3.0.1.ebuild b/net-misc/buka/buka-3.0.1.ebuild
index cf8d6a3cf224..1a1c68b1bdfe 100644
--- a/net-misc/buka/buka-3.0.1.ebuild
+++ b/net-misc/buka/buka-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/beautifulsoup
+RDEPEND="dev-python/beautifulsoup4
 	dev-python/requests
 	sys-process/parallel
 	net-misc/curl
diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
index f66bf007d07e..e50cdd4ab9ec 100644
--- a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
+++ b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
 DEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )"
 
 RDEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 "
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index 59da6b5d43f4..2e447cddc15e 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -9,3 +9,4 @@ move dev-python/python-musicbrainz-ngs dev-python/python-musicbrainzngs
 move dev-python/python-podman dev-python/podman-py
 move dev-python/u-msgpack dev-python/u-msgpack-python
 move sci-physics/geant-vmc sci-physics/geant4_vmc
+move dev-python/beautifulsoup dev-python/beautifulsoup4
diff --git a/www-misc/buku/buku-4.5.ebuild b/www-misc/buku/buku-4.5.ebuild
index 8091f25bdd67..378cb5f498bd 100644
--- a/www-misc/buku/buku-4.5.ebuild
+++ b/www-misc/buku/buku-4.5.ebuild
@@ -20,7 +20,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/www-misc/buku/buku-4.6-r1.ebuild b/www-misc/buku/buku-4.6-r1.ebuild
index 27a0923bc31d..953e902cbc90 100644
--- a/www-misc/buku/buku-4.6-r1.ebuild
+++ b/www-misc/buku/buku-4.6-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/www-misc/urlwatch/urlwatch-2.22.ebuild b/www-misc/urlwatch/urlwatch-2.22.ebuild
index fb04d721b518..3a12f2417299 100644
--- a/www-misc/urlwatch/urlwatch-2.22.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.22.ebuild
@@ -61,7 +61,7 @@ pkg_postinst() {
 		fi
 		elog "HTML parsing can be improved by installing one of the following packages"
 		elog "and changing the html2text subfilter parameter:"
-		elog "dev-python/beautifulsoup:4"
+		elog "dev-python/beautifulsoup4"
 		elog "app-text/html2text"
 		elog "dev-python/html2text"
 		elog "www-client/lynx"
diff --git a/www-misc/urlwatch/urlwatch-2.23.ebuild b/www-misc/urlwatch/urlwatch-2.23.ebuild
index 5328b1778a19..42129d86b8d9 100644
--- a/www-misc/urlwatch/urlwatch-2.23.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.23.ebuild
@@ -63,7 +63,7 @@ pkg_postinst() {
 		fi
 		elog "HTML parsing can be improved by installing one of the following packages"
 		elog "and changing the html2text subfilter parameter:"
-		elog "dev-python/beautifulsoup:4"
+		elog "dev-python/beautifulsoup4"
 		elog "app-text/html2text"
 		elog "dev-python/html2text"
 		elog "www-client/lynx"