diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 43866cf3be..4bfd5cd480 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -1 +1 @@
-DIST 0.169.1.tar.gz 357179 BLAKE2B d65b6b238aff7cd9c4e5e1509318bfcb4bccdb00c363485c4ae106fab40051f9e5f5b4b76baca3ac25b0cf64d66d0003b3580fcd930511aa6ea7c8d36d7f50e7 SHA512 9429864bcc61c47505c8924cdf35164289f55adf890bc6f28e3fb6063438a53722384594512e3c12662dffc1d31b84f2b292af873d72b3de552a27aa4403ab16
+DIST osc-0.169.1.tar.gz 357179 BLAKE2B d65b6b238aff7cd9c4e5e1509318bfcb4bccdb00c363485c4ae106fab40051f9e5f5b4b76baca3ac25b0cf64d66d0003b3580fcd930511aa6ea7c8d36d7f50e7 SHA512 9429864bcc61c47505c8924cdf35164289f55adf890bc6f28e3fb6063438a53722384594512e3c12662dffc1d31b84f2b292af873d72b3de552a27aa4403ab16
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 0bcb74822d..5e122dbcc8 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -9,5 +9,3 @@
     Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
   </longdescription>
 </pkgmetadata>
-
-<!-- vim:set sts=2 ts=2 sw=2 et: -->
diff --git a/dev-util/osc/osc-0.169.1.ebuild b/dev-util/osc/osc-0.169.1.ebuild
index cac3c5daa0..1b9a14e9a0 100644
--- a/dev-util/osc/osc-0.169.1.ebuild
+++ b/dev-util/osc/osc-0.169.1.ebuild
@@ -5,66 +5,62 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Command line tool for Open Build Service"
+HOMEPAGE="https://en.opensuse.org/openSUSE:OSC https://github.com/openSUSE/osc"
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/openSUSE/${PN}.git"
-	EXTRA_ECLASS="git-r3"
+
+	inherit git-r3
 else
-	SRC_URI="https://github.com/openSUSE/${PN}/archive/${PV}.tar.gz"
+	SRC_URI="https://github.com/openSUSE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	OBS_PROJECT="openSUSE:Tools"
+
+	KEYWORDS="~amd64 ~x86"
 fi
 
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Command line tool for Open Build Service"
-HOMEPAGE="https://en.opensuse.org/openSUSE:OSC"
-
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+# Test require config file: osc.oscerr.NoConfigfile
+RESTRICT="test"
 
 RDEPEND="
 	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-  $(python_gen_cond_dep '
-	  dev-python/m2crypto[${PYTHON_USEDEP}]
-  ')
+	$(python_gen_cond_dep '
+		dev-python/m2crypto[${PYTHON_USEDEP}]
+	')
 	${PYTHON_SINGLE_DEPS}
 "
 
 BDEPEND="
-        $(python_gen_cond_dep '
-          >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-        ')
-        test? (
-                ${RDEPEND}
-                $(python_gen_cond_dep '
-                  dev-python/path-py[${PYTHON_USEDEP}]
-                ')
-        )
-"
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	')
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/path-py[${PYTHON_USEDEP}]
+	')
+)"
 
 distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
+# Bug: https://bugs.gentoo.org/704520
+#distutils_enable_sphinx docs dev-python/alabaster
 
 src_install() {
 	distutils-r1_src_install
+
 	dosym osc-wrapper.py /usr/bin/osc
-	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
+	rm -f "${ED}/usr/share/doc/${PN}"*/TODO*
 	insinto /usr/share/bash-completion/completions
 	newins dist/complete.sh osc
 	insinto /usr/lib/osc
 	newins dist/osc.complete complete
 	insinto /usr/share/zsh/site-functions
-	newins ${FILESDIR}/osc.zsh_completion _osc
+	newins "${FILESDIR}/osc.zsh_completion" _osc
 }
-
-# vim:set sts=2 ts=2 sw=2 et: