net-voip/telepathy-salut: Flatten twisted dep

mgorny · mgorny · commit 5c5feb5e66de · 2020-03-26T18:36:01.000+01:00
Signed-off-by: Michał Górny &lt;mgorny@gentoo.org&gt;
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -36,10 +36,7 @@ DEPEND="${RDEPEND}
 	test? (
 		>=dev-libs/check-0.9.4
 		net-libs/libgsasl
-		|| (
-			$(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
-			$(python_gen_any_dep 'dev-python/twisted-words[${PYTHON_USEDEP}]')
-		)
+		$(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
 	)
 "
 # FIXME: needs xmppstream python module
@@ -52,8 +49,7 @@ PATCHES=(
 
 python_check_deps() {
 	if use test ; then
-		 has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
-			|| has_version "dev-python/twisted-words[${PYTHON_USEDEP}]"
+		 has_version "dev-python/twisted[${PYTHON_USEDEP}]"
 	fi
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,7 @@ DEPEND="${RDEPEND}`
`36`	`36`	`test? (`
`37`	`37`	`>=dev-libs/check-0.9.4`
`38`	`38`	`net-libs/libgsasl`
`39`		`- \|\| (`
`40`		`- $(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')`
`41`		`- $(python_gen_any_dep 'dev-python/twisted-words[${PYTHON_USEDEP}]')`
`42`		`- )`
	`39`	`+ $(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')`
`43`	`40`	`)`
`44`	`41`	`"`
`45`	`42`	`# FIXME: needs xmppstream python module`
`@@ -52,8 +49,7 @@ PATCHES=(`
`52`	`49`
`53`	`50`	`python_check_deps() {`
`54`	`51`	`if use test ; then`
`55`		`- has_version "dev-python/twisted[${PYTHON_USEDEP}]" \`
`56`		`- \|\| has_version "dev-python/twisted-words[${PYTHON_USEDEP}]"`
	`52`	`+ has_version "dev-python/twisted[${PYTHON_USEDEP}]"`
`57`	`53`	`fi`
`58`	`54`	`}`
`59`	`55`