diff --git a/media-tv/kodi/kodi-17.3-r1.ebuild b/media-tv/kodi/kodi-17.3-r1.ebuild
index b47d78e914970..17b5bb57e1e80 100644
--- a/media-tv/kodi/kodi-17.3-r1.ebuild
+++ b/media-tv/kodi/kodi-17.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -106,13 +106,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6-r6.ebuild b/media-tv/kodi/kodi-17.6-r6.ebuild
index 6b505c1116f31..c2446a8bac165 100644
--- a/media-tv/kodi/kodi-17.6-r6.ebuild
+++ b/media-tv/kodi/kodi-17.6-r6.ebuild
@@ -106,13 +106,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6-r7.ebuild b/media-tv/kodi/kodi-17.6-r7.ebuild
index 31259159e9df5..cd7898f209d6e 100644
--- a/media-tv/kodi/kodi-17.6-r7.ebuild
+++ b/media-tv/kodi/kodi-17.6-r7.ebuild
@@ -104,13 +104,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6-r8.ebuild b/media-tv/kodi/kodi-17.6-r8.ebuild
index 9fc40bceaebcc..add7aad92ba30 100644
--- a/media-tv/kodi/kodi-17.6-r8.ebuild
+++ b/media-tv/kodi/kodi-17.6-r8.ebuild
@@ -104,13 +104,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6-r9.ebuild b/media-tv/kodi/kodi-17.6-r9.ebuild
index 08e9b06a101c4..8c702b973d445 100644
--- a/media-tv/kodi/kodi-17.6-r9.ebuild
+++ b/media-tv/kodi/kodi-17.6-r9.ebuild
@@ -105,13 +105,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6.ebuild
index ed06b92fcf633..fe74f13692d16 100644
--- a/media-tv/kodi/kodi-17.6.ebuild
+++ b/media-tv/kodi/kodi-17.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -107,13 +107,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-18.0_beta5-r1.ebuild b/media-tv/kodi/kodi-18.0_beta5-r1.ebuild
index 4b9bc5d60e06d..d2347fadd6d4f 100644
--- a/media-tv/kodi/kodi-18.0_beta5-r1.ebuild
+++ b/media-tv/kodi/kodi-18.0_beta5-r1.ebuild
@@ -124,13 +124,8 @@ RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+	
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/xz-utils
diff --git a/media-tv/kodi/kodi-18.0_beta5.ebuild b/media-tv/kodi/kodi-18.0_beta5.ebuild
index 0648210f36aea..d4daa7b0eaa77 100644
--- a/media-tv/kodi/kodi-18.0_beta5.ebuild
+++ b/media-tv/kodi/kodi-18.0_beta5.ebuild
@@ -123,13 +123,7 @@ RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/xz-utils
diff --git a/media-tv/kodi/kodi-18.0_rc1.ebuild b/media-tv/kodi/kodi-18.0_rc1.ebuild
index 9a85a62c67c42..27441f8c5b82b 100644
--- a/media-tv/kodi/kodi-18.0_rc1.ebuild
+++ b/media-tv/kodi/kodi-18.0_rc1.ebuild
@@ -138,13 +138,8 @@ RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/xz-utils