gentoo resync : 15.12.2019

22 files changed, 132 insertions, 168 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 3c14964d6274..35d53dad485c 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 3907a57aecbe..0abd9422222f 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -7,6 +7,6 @@ AUX apcupsd.powerfail.init 397 BLAKE2B 472512906536753d3054d275707764a98094c1486
 AUX apcupsd.service 111 BLAKE2B bf2ac8161af5b971642298c30b08ad78d289044bb2452bdef39b31119b60eceb0a14add7c00262132bb80dbf1964103242452cb8d9b815d6ec82c204100ea184 SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889
 DIST apcupsd-3.14.13.tar.gz 1935043 BLAKE2B 56d8fb9c6a055b20c2d99867e43b6a2d6ebe1d55c724d8a6701d9baa569a14f600cb03c6176380c6c42c46ac610f43136a4b52c47c8b86bc41966d4091481e95 SHA512 74f7763de268626e24f9dd99090b01d5bff35c2fde769039104105ec27941673d1613c41fcac11e3d97d2fe5c364bcc0459847fcba5d2f7f1aac85795d6d8570
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
-EBUILD apcupsd-3.14.13.ebuild 3948 BLAKE2B ff8354a4b10634cd6a3180e4cf7bfe31bfa08896eda745bd4b5d96202d2aefe83ffac02c407af45c2f1f834ad0fc30ae10c695dab2c3de9faaea6df28290e7a6 SHA512 76cd11e927a31fdd2119224ccd35b1689d2c32030b14802db4d9bfae89cf4ad44fd94f4bbdbd7f67e66530754f5809834c77d4a357a819fbe667bb296f7e540d
+EBUILD apcupsd-3.14.13.ebuild 3926 BLAKE2B f4837f2028991afef254ed500cb53965721f636d1dc31178e6d0c5fda70c217364fc05901f8f55fb0351b2b0cb39913bcee9afc9d25b5b7858bad9f2144c2c13 SHA512 bbb936f89db544af0604dc497408eac4ccb859c9f3879540dcc9c79f17d8945bd28e44e8ce480a0a964112c894b6498b0f4b49ff82245b4ef862f1282a79e7c5
 EBUILD apcupsd-3.14.14-r2.ebuild 4044 BLAKE2B 07ef99ec65e4285bd4a1d2c87458394c0c7fb30dc0ca367ca6f1457d95c1ecfb8ecace6ebadfa57360c0f5f2ef0ad49d9effc15a87d0f6885868c01862f14eba SHA512 d6d644422ac1953b7afea59bb99ac5e34eea8047e363d15299e3382014b4ee6fce6301ac13cd192dfa46eb7bcde491df4d45b5174d3c6353a764f0d63d393cc8
 MISC metadata.xml 1259 BLAKE2B ca28cef92e8edcea0aaeece78cadb43ad8ad836297d8e857540558877a7781922f50c05b018d1a9f7d0753ddfb0a99aff84d16051fdfe5f0d407b79509058a35 SHA512 ba5660026926c0334a47aa3f84bfc0a4ef745db2170a1d773547cf495101cf1274cc24d71d3afa46fa62ebcb49e0913e92e9a0efe4cb70a349f77538b7f60eff
diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
index cbebbb1a5c2d..a888ac246e8b 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -74,7 +74,7 @@ src_compile() {
 	# the text files in the distribution, but I wouldn't count on them
 	# doing that anytime soon.
 	MANPAGER=$(type -p cat) \
-		emake || die "emake failed"
+		emake
 }
 
 src_install() {
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 4e7eaaa9602e..04316790e197 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -3,4 +3,4 @@ AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776
 DIST bbswitch-0.8.tar.gz 15800 BLAKE2B d9a16d2ca8baebcbc7ad1d8c1daeb9822ed4ea797ff297848e7087d2a0b142b7cd1333d12346fcde85ad06ddb0640e0d6e299d00e0e8e6c7f96d0a409a08d1c6 SHA512 11ab163931feb6c0e202d04c4552b848e999fedea9990390c26b28abdb4a69081ccfb5a22d1e390cc274f1c0cfc9adedc719c5fece14738b17aaa93e28865b7c
 EBUILD bbswitch-0.8-r2.ebuild 1058 BLAKE2B 2de38efe1b1c147057e59b52b0138f12ff8b2c885ddbc3b467a5a91fac589ff7f682ae0887c9a1e86a752637a79da35a9fc98c5a4cf57a2cc01c022f1c3ed926 SHA512 02d646717a882a6c2ca1687c4a718ed0a7e09b741d599794af873543093ace6d7749edc7c05cca1854e35f9793ae2f77c37336df0228b7554ea056bd5858e6c3
 EBUILD bbswitch-9999.ebuild 1060 BLAKE2B 1e0d64798d692efb54aaae8c3abf8fef445b383d7758aa78c4622440206108893d5bb9bc40c715a5534935b029d7240d53dc29d3a3af899db48493f75267320b SHA512 51d60415904a06222a4c8ad6eeb353bbd659dd22a25d189d97e95e51e29f04b16aa770714d40f7b384a9538158a63447bf4ae7f1341df1dcdb2358d2892c7a6a
-MISC metadata.xml 979 BLAKE2B 94694c70d21a40b08bc585ec4cc226d1f33302d4da70137737cb40e08e24584204069fdaafd8a3e99662dad0d5b097c696ae4be1ea51832f290011e09b8280bd SHA512 018a41f0d913f5b7e6c405770b200650c117a3a37d905ed58b4025631bb3bba5e00e64ccd4eeabdd30ab38f4764832403c687a46ab3a7d76aec5b40462c6b403
+MISC metadata.xml 975 BLAKE2B 37f16c518caa9f2dd7a10d312365f59ced2bee2b22d446d256f0ed49b499dd457bee37a90285ace9fbb7fc3fce3c4ac9547aa3ee1e2126ff063c534d4f7cf9d5 SHA512 8281867207c08d1383eb9b5c770637b7cb0174d08859f3838155d80c2a6bf69f40946354f548d2ab7e4461529483755e0a666759708ec5debcd3487a11219f39
diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index 4c90e0a75de3..da24f96bb4da 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -10,8 +10,8 @@
 		<name>NP-Hardass</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>gentoo@mva.name</email>
-		<name>Vadim A. Misbakh-Soloviov</name>
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>rei4dan@gmail.com</email>
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 61803b988a6c..e1ec020930fd 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,12 +1,11 @@
 AUX cflags-strip.patch 423 BLAKE2B aaa63551049273cc00abb0bb71da662e7c44ae7843cbeac60625cf75db872a68d23adfc439080ed2641d00693ff474e594f82b3a03e2173801d5e549b7430ebe SHA512 546c6c8187638cae094a428226c9c7463168b66fb1d16ffb05167a2bb5fb8792c08b6a68e71cbabaaa95aac352ca5ad4c1fce0a3a6fded6863b40c1ed1a5b4c0
 AUX conf.d-r2 1616 BLAKE2B 94083b666d5ad43270ec458488b9a6070a33d0d0611a6430e9d44eddc663197cc715c173d1ca1a67a15e012dbd60a08677d85f2e771bbefff7fc9ef4a4b16b88 SHA512 63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c
+AUX cpupower-5.4-cflags.patch 900 BLAKE2B 6ee752113b03bcd9665937eaf1270337baaef7c6d08503373c2d0890a58fe329d4ae3f1fc40dc80cafdbba94e1f41c87d11530855f8f1b26f67c14f63dc54ec9 SHA512 e765ad5141bbffb27ca357a71dd1360636fa5965d4058f209cb6b5ff3bbe7d8f15c270cb6a1f0dfde4bebe47adf96169f1e9dff9a41dceca080229aebc0a1677
 AUX cpupower-frequency-set.service 151 BLAKE2B ff5a2460bf2080868157ea2b975b9d401f2b47e2c8e77d29ac1528f6b85246394e72d57a88dfacb0242fc1e563eefd0a102d2d6dae877c6e779383a0b163a8f3 SHA512 dcd6bb5dee338113683c2e222df23195857f44f5430569b3c454078d0650c15fa2fa3876dccd6ee4652d0fd409f925205d0d3e57344487a64945c67a3b0dee67
 AUX cpupower-frequency-set.service.conf 41 BLAKE2B b1349f0dc39ee39e7c1442374bd92e069509f106c80206c4a606d732acd2cc6205e2032eb98e4890ef006a8bda5fd65d18b83881aa55008a55375d0bc170efe2 SHA512 d99b78a5ab4f7b4e8fe92bc0b2cd722cd55e97e234027a0eba37eb39739e2a470bfc369efa9cf7846bf1a6d588d9d5d5d9efbb90a68aac2f687ddeb833e291f1
 AUX init.d-r4 804 BLAKE2B b143305b3f117afa49967de098f54419d5f57b86dee7e7153b7adb02331a88d3b90a0a085ee189c0b6de70050de4a1249d481d23816764aad34d416f041f78b3 SHA512 7f6992b17376c0bedb403586e123200272d293b15819260cacd182c19ecdb2da635b177fe3d621ad8605a4ff046fd23669e67ea0bd8f00c9e4339d3ac72d2ddf
 DIST cpupower-4.13.0.tar.xz 67812 BLAKE2B 3b94b18bb57b0499a96d57ca26a48f528bf993e0f1ed7eb6d2949c879de8796501629bd0978946eae925d86dd3204a1cab0c99f1c3a8b51731dfbdb61451e990 SHA512 5e7095e2741eae920a097864926931afb2656e492b504f203c40c24ddc5aee5014c7689b220225171b5ea10c69b70774fb2a979d05ea56ef1fa063f3097626c7
-DIST cpupower-4.9.0.tar.xz 67620 BLAKE2B 0aad0114af52b939f83d80ba89be49a061f46a7597ae2e2f27ee6134dbcb425beefd613b0c3f0217003b700cf9b81cd7538575938e9a867138a78eb6a0247f3e SHA512 67137bd7166a34f131332a5165384ebca5b97deb1c92e6d557195da4be4fecb0c5902159f748ea454461ad2181a778c32b4e4dfd1f8ce7e6a3ec41f553f23677
-DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009
-EBUILD cpupower-3.18.ebuild 1614 BLAKE2B 3629f1141e4517165df4472467ce66105fdba03790541f749a34a7dbf5ee54de5f590528af3a2f9514f63eec3512bda2c50fcdcde94e5026ea99d6025fc93db7 SHA512 7e6444d9f6a14374c190038ae53a3c13b9ab19fec9d3ad57fd495af9f9ccf2938563bacac1d5a3c928d4e783096cb14a8ce9867a799836a7dd7f003292cc65bb
-EBUILD cpupower-4.13.0.ebuild 1729 BLAKE2B 3dc42588fff8c7d26d8b028740e87e9a2e58340d1be6b69229ac3c9bf8092ed6927ee4db70b3aafb696d9803a35887ef416bc3b3d19c2ec543cf1a80538144ad SHA512 6a3054016fc9ecbb3d45a81bf945341ba718e76ff8a26f92df48e164bd0d5434173abb77c93b21b5a9a189f886b3e3f8f6fe2b51eecd281322ebc2bb091bd594
-EBUILD cpupower-4.9.0-r1.ebuild 1460 BLAKE2B cba65257b62d4c552d31d972a044ef6870c8390707ab9c85507379580dd32cf0d1feade9a097a0733b8344d7f8096d04794367f0f7c3e0b2bbb48cbcb5df1adc SHA512 e96a435498faf21b6427fbc5bf72ff2d40190b79354a5db11c8f8d4b505d4749b302f55f066396c8d358a55bdb4dbfb3b86d904f291862fb7ad0b24e78705b93
-MISC metadata.xml 434 BLAKE2B e7c13d7d29993f586d49a6333dccd91f748122e8ca6764bcf1286c46a0d4c197ef5a314889d89bd02a8f39f0122e362f2fed458df9d3bc0f3a793d73f7a23308 SHA512 9ce805896548834fd7c83f53af781432efcfc9a2d272ccb8ae93e57159507940570323a0fbc9d95097c71496cfb2b508d0c4f14bfebd9641140d5317005b2705
+DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+EBUILD cpupower-4.13.0.ebuild 1660 BLAKE2B bb54f0810ff4d44a068d1e8e009e8d96daef318e60bc73df9e79dbc2bead8336daf2cd4ee3a6a21db7c4b00c2c655d166576cb0c91bdf63f742dd9064871ee6d SHA512 a819a13af0d6baca8c3e87afb350fad329d909e31945e492a38c559a7783bc2ca4630ec1a7c2ebfd191e331bb6b8beaacd6ac5fc19bd1ec4f13df6868774bb8a
+EBUILD cpupower-5.4.ebuild 1645 BLAKE2B 025dfcb9d74ee02f9d2b083ed7246630b9e5c7aee114446c54caf4d57b005ef8a388add25e98ffecb86ed01deaffda390a268e8e52d7d44383e4aa5224f2c899 SHA512 60e837f09d331399c171ee695f04ff083ebc7e33a7ced62c7b9fb50b0ec4d2181ec306b7f2ff0b7250014311dd6050f35352d14f1a8dd20ca16621b46c0e7329
+MISC metadata.xml 340 BLAKE2B a03552056a3b361eecd25b085c5f3fe60af7d1dbef9bb74682066b2d87c92b91a7a3d5cb53d1cbb88d85f81982a4b7ee4f8c5ff15c1fd06a266447f2d309ffd9 SHA512 af0ccc6342a6f6095d2bf06f764729e2a3eaa885d95da97462e15e3f5d139d3260e4c6e981e1d1194f4c0b64d3216decf223f854ad80e580092af8235399e054
diff --git a/sys-power/cpupower/cpupower-3.18.ebuild b/sys-power/cpupower/cpupower-3.18.ebuild
deleted file mode 100644
index 0dcdb330bbc9..000000000000
--- a/sys-power/cpupower/cpupower-3.18.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Shows and sets processor power related values"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/linux-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="cpufreq_bench debug nls"
-
-# File collision w/ headers of the deprecated cpufrequtils
-RDEPEND="sys-apps/pciutils
-	!<sys-apps/linux-misc-apps-3.6-r2
-	!sys-power/cpufrequtils"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/linux-${PV}/tools/power/${PN}
-
-pkg_setup() {
-	myemakeargs=(
-		DEBUG=$(usex debug true false)
-		V=1
-		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
-		NLS=$(usex nls true false)
-		docdir=/usr/share/doc/${PF}/${PN}
-		mandir=/usr/share/man
-		libdir=/usr/$(get_libdir)
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC)"
-		STRIP=true
-		LDFLAGS="${LDFLAGS}"
-		OPTIMIZATION="${CFLAGS}"
-		)
-}
-
-src_unpack() {
-	tar -xf "${DISTDIR}"/linux-${PV}.tar.xz \
-		linux-${PV}/tools/power/${PN} \
-		linux-${PV}/Makefile \
-		|| die
-}
-
-src_prepare() {
-	# -Wl,--as-needed compat
-	local libs="-lcpupower -lrt $($(tc-getPKG_CONFIG) --libs-only-l libpci)"
-	sed -i \
-		-e "/$libs/{ s,${libs},,g; s,\$, ${libs},g;}" \
-		-e "s:-O1 -g::" \
-		Makefile || die
-}
-
-src_compile() {
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${myemakeargs[@]}" install
-	dodoc README ToDo
-
-	newconfd "${FILESDIR}"/conf.d-r2 ${PN}
-	newinitd "${FILESDIR}"/init.d-r4 ${PN}
-}
diff --git a/sys-power/cpupower/cpupower-4.13.0.ebuild b/sys-power/cpupower/cpupower-4.13.0.ebuild
index 88366fc8d73a..b3ea8ec6d435 100644
--- a/sys-power/cpupower/cpupower-4.13.0.ebuild
+++ b/sys-power/cpupower/cpupower-4.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="cpufreq_bench nls"
+IUSE="nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
 RDEPEND="sys-apps/pciutils
@@ -38,7 +38,6 @@ src_configure() {
 	export confdir="${EPREFIX}/etc"
 	export V=1
 	export NLS=$(usex nls true false)
-	export CPUFREQ_BENCH=$(usex cpufreq_bench true false)
 }
 
 src_compile() {
diff --git a/sys-power/cpupower/cpupower-4.9.0-r1.ebuild b/sys-power/cpupower/cpupower-4.9.0-r1.ebuild
deleted file mode 100644
index 308a7d815fea..000000000000
--- a/sys-power/cpupower/cpupower-4.9.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# eutils: strip-linguas
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="Shows and sets processor power related values"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="cpufreq_bench debug nls"
-
-# File collision w/ headers of the deprecated cpufrequtils
-RDEPEND="sys-apps/pciutils
-	!<sys-apps/linux-misc-apps-3.6-r2
-	!sys-power/cpufrequtils"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	myemakeargs=(
-		DEBUG=$(usex debug true false)
-		V=1
-		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
-		NLS=$(usex nls true false)
-		docdir=/usr/share/doc/${PF}/${PN}
-		mandir=/usr/share/man
-		libdir=/usr/$(get_libdir)
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC)"
-		STRIP=true
-		OPTIMIZATION=
-		VERSION=${PV}
-	)
-
-	if [[ -n ${LINGUAS+set} ]]; then
-		strip-linguas -i po
-		myemakeargs+=( LANGUAGES="${LINGUAS}" )
-	fi
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${myemakeargs[@]}" install
-	doheader lib/cpupower.h
-	dodoc README ToDo
-
-	newconfd "${FILESDIR}"/conf.d-r2 cpupower
-	newinitd "${FILESDIR}"/init.d-r4 cpupower
-
-	systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
-	systemd_install_serviced "${FILESDIR}"/cpupower-frequency-set.service.conf
-}
diff --git a/sys-power/cpupower/cpupower-5.4.ebuild b/sys-power/cpupower/cpupower-5.4.ebuild
new file mode 100644
index 000000000000..d45b53b560a1
--- /dev/null
+++ b/sys-power/cpupower/cpupower-5.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Shows and sets processor power related values"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+# File collision w/ headers of the deprecated cpufrequtils
+RDEPEND="sys-apps/pciutils
+	!<sys-apps/linux-misc-apps-3.6-r2
+	!sys-power/cpufrequtils"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/cpupower-5.4-cflags.patch"
+)
+
+S="${WORKDIR}/linux-${PV}"
+
+src_configure() {
+	export bindir="${EPREFIX}/usr/bin"
+	export sbindir="${EPREFIX}/usr/sbin"
+	export mandir="${EPREFIX}/usr/share/man"
+	export includedir="${EPREFIX}/usr/include"
+	export libdir="${EPREFIX}/usr/$(get_libdir)"
+	export localedir="${EPREFIX}/usr/share/locale"
+	export docdir="${EPREFIX}/usr/share/doc/${PF}"
+	export confdir="${EPREFIX}/etc"
+	export V=1
+	export NLS=$(usex nls true false)
+}
+
+src_compile() {
+	myemakeargs=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC)"
+		VERSION=${PV}
+	)
+
+	cd tools/power/cpupower || die
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	cd tools/power/cpupower || die
+	emake "${myemakeargs[@]}" DESTDIR="${D}" install
+	doheader lib/cpupower.h
+	einstalldocs
+
+	newconfd "${FILESDIR}"/conf.d-r2 cpupower
+	newinitd "${FILESDIR}"/init.d-r4 cpupower
+
+	systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
+	systemd_install_serviced "${FILESDIR}"/cpupower-frequency-set.service.conf
+}
diff --git a/sys-power/cpupower/files/cpupower-5.4-cflags.patch b/sys-power/cpupower/files/cpupower-5.4-cflags.patch
new file mode 100644
index 000000000000..f21435a0cd02
--- /dev/null
+++ b/sys-power/cpupower/files/cpupower-5.4-cflags.patch
@@ -0,0 +1,32 @@
+From 6ae1f1b03aaaee6a9a56040d3ba7af6bf6648ad6 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 27 Nov 2019 10:51:15 -0500
+Subject: [PATCH] Respect user CFLAGS
+
+---
+ tools/power/cpupower/Makefile | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
+index c8622497ef23..f17e8c94da16 100644
+--- a/tools/power/cpupower/Makefile
++++ b/tools/power/cpupower/Makefile
+@@ -178,14 +178,7 @@ else
+ endif
+ export QUIET ECHO
+ 
+-# if DEBUG is enabled, then we do not strip or optimize
+-ifeq ($(strip $(DEBUG)),true)
+-	override CFLAGS += -O1 -g -DDEBUG
+-	STRIPCMD = /bin/true -Since_we_are_debugging
+-else
+-	override CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
+-	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+-endif
++STRIPCMD = true
+ 
+ 
+ # the actual make rules
+-- 
+2.24.0
+
diff --git a/sys-power/cpupower/metadata.xml b/sys-power/cpupower/metadata.xml
index 470032972666..5bcecc2e8484 100644
--- a/sys-power/cpupower/metadata.xml
+++ b/sys-power/cpupower/metadata.xml
@@ -5,9 +5,6 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
-	<use>
-		<flag name="cpufreq_bench">Build and install the cpufreq_bench binary</flag>
-	</use>
 	<slots>
 		<subslots>Subslots correspond to major version of libcpupower</subslots>
 	</slots>
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 6ea7fcbd5ff0..cc1c384f394e 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,4 +1,4 @@
 DIST hibernate-script-2.0-patches-5.tar.bz2 4203 BLAKE2B 4635f1e39c92b7d63de7fe0cf75903d0fd12763c63ac303f06015893268dda81727725cdb4ef055e1a266d9298598776b498f00f9f683a295abb4e9c97c29dbb SHA512 9e9c45c8f9bfde9bfb7d2ab229e355e635ae2f98cfdefa964c07401cdef5e57d0c58976bd491f82a3b9204af213c82f840e0a9b794b2869f2dfe7783dbdb4970
 DIST hibernate-script-2.0.tar.gz 84453 BLAKE2B 14b0b2fef2d3e84503a12feed935d44cb65be9e67a14686b5dad18cfa69177bd27dd9e287ffddb13533a005c6106fd81f85f78082a27f0170d26019421090ef9 SHA512 625efdf8bd8561dd9ab93c09436f2fb93edef2fbb0fb2d259727bacffab0b7bd4a6c99d445131390883be75658f6dd28f329fdaf4f03a7d218c0021223ac1a1e
 EBUILD hibernate-script-2.0-r6.ebuild 1817 BLAKE2B 972d42269effee28788c0d68f2d3c02f4b54389804de983fd1d46ef7f4a39c8c4d5a673debd29d7a2f1792c0d84da0595283ca8d6561fbe267a16b68b575082e SHA512 7b4fea0024d876735a929ff0f58f45da6fcfc4c4d20616e006c95c230268bb4197957aabb3fd5b5f13918a318588aca79dc2a6a3df83761c08fc6fdd1596c28e
-MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-power/hibernate-script/metadata.xml b/sys-power/hibernate-script/metadata.xml
index 041c1966b76b..7a38bb900964 100644
--- a/sys-power/hibernate-script/metadata.xml
+++ b/sys-power/hibernate-script/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index 4ac08cd4ff9e..0bd9ef1817f5 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -6,7 +6,7 @@ DIST acpica-unix-20190703.tar.gz 1845874 BLAKE2B bc217c40c1154fd562f28e0eb22e8bf
 DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54
 DIST acpitests-unix-20190215.tar.gz 2094957 BLAKE2B 3a31ae398650a1dc3ac70843c43868a35501cbe0376d1d2437a3568aad1fb63b3d83270653c009885b014894c69dcfff075bbf5d18290220067bcd1804a38097 SHA512 80060a61c80b01231b10e04dd65c2ab41d42824c439152cf128328890cee39ef597dc3f5bc535db4566cb322394bfce2760e1835df781d699818049cad5a4419
 DIST acpitests-unix-20190703.tar.gz 2009568 BLAKE2B 3d1a527c55a94390381e33a46111bed7ecd3761627b87e24d9345b0d38d9fbd32c371adab3f19a0ca05a99c4532491bc9b466805e231a5ecd8c7a6af346577fb SHA512 d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167
-EBUILD iasl-20180810.ebuild 3408 BLAKE2B 55cd534d44f56cad6a45bb5223da837517bf8cbe832b52e6e036a3a932e2b928f5e2422357b2a5162dadd3c8effaf8ec760cce5b0e688dbe2207f74dd677aa29 SHA512 8ff1157eafdb88435a0dacfd9c957d9ae062641f4c606be82ac21061a8ad87946940dbcc1fbf71d4b336bac081e2202380b1386b3aed06cd6c92273698ab60d4
-EBUILD iasl-20190215.ebuild 3411 BLAKE2B aee5c1fdd6979036ed51bb52cff942dd8dc6e3942cd69352d9a097e3234a39d99de84ef2ef52d8c8b1e4d48d3dfe1ead2c86d80dd5fe5ac14e347760d6a0a5a1 SHA512 b20518fd7588b838b30cdcd5274c5b6723b166868f283f13d55fc8897361a4d7e0e2670f8305fe214dee90716ceb8fbb4be40e2e8c53eac56c923dad4e85cd21
-EBUILD iasl-20190703.ebuild 3404 BLAKE2B 890addefef22ecadd6ff01b01464ea473a680ee4c8b5a430d2ab3c74d6a6ed4cde8f0685ae11b8ff70d09d54d1a6dfccf98e556a5676efed434db5e77b9aeab3 SHA512 e7d67d4d0a1c202b60aa4312737907f3a33123fdaa7655d1d47b9212dcb4c861b856c85659488de2ed046f8a06500bf20a60a451e853e251ad67ea928177ebe7
+EBUILD iasl-20180810.ebuild 3435 BLAKE2B 400308a08e9cf0fdf52e4e84e8eb5b8ec9ae39e7e742c9f3c27b22c91e6a0994e8e954e1fadc851afbcd6c83de89d94c562b7a1c1ebbeab501043cf00c9bc3cf SHA512 d5cb220695109f445ae74bdbe77c0450147521cce871a87c06230f20b346af755ceb9a4446ba971d72dd18c3f8be772948cf23f9d73a3727ecca689c32e34836
+EBUILD iasl-20190215.ebuild 3438 BLAKE2B 17294c7d9a8d9a8e88bb98a395be7896c2aff3dd349fda9e525357acdf88d3d57098669cc448bec2560c84955eb42b179f377e60532ee2b59dc392773bc62820 SHA512 b9b00cb63b5d8b538f0d281a859b6816099815bbe64133435361ea09f224496f34fdcfbd45b1ab412ff503bacf714795b7cf4accae7c72964ce7f4b9ef73f3c6
+EBUILD iasl-20190703.ebuild 3461 BLAKE2B b9f79fca4cedd7821f3d546ce9aade1393b5c87e01ef1f1c7b847f26b87fcc45821b06002f0fb572d996f1cc6c5d11cdd97f3745718fb26cd46ffc6bfd3db6ab SHA512 26675983cdb7a3e7e448171524be812035b41140e2f2e6007341e9552a9f7bf71e46d1d0964bf4a93ad0b8552348c9df8f5e4d63da2ed5a669fb7f6676144815
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/iasl-20180810.ebuild b/sys-power/iasl/iasl-20180810.ebuild
index d913d38a351e..2b0abd4a9ee8 100644
--- a/sys-power/iasl/iasl-20180810.ebuild
+++ b/sys-power/iasl/iasl-20180810.ebuild
@@ -17,6 +17,7 @@ LICENSE="iASL"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-devel/bison
 	sys-devel/flex"
diff --git a/sys-power/iasl/iasl-20190215.ebuild b/sys-power/iasl/iasl-20190215.ebuild
index 3de24d453ad5..2d2c166197db 100644
--- a/sys-power/iasl/iasl-20190215.ebuild
+++ b/sys-power/iasl/iasl-20190215.ebuild
@@ -17,6 +17,7 @@ LICENSE="iASL"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-devel/bison
 	sys-devel/flex"
diff --git a/sys-power/iasl/iasl-20190703.ebuild b/sys-power/iasl/iasl-20190703.ebuild
index d6153d6c1452..f9a87d8bd570 100644
--- a/sys-power/iasl/iasl-20190703.ebuild
+++ b/sys-power/iasl/iasl-20190703.ebuild
@@ -15,8 +15,9 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-devel/bison
 	sys-devel/flex"
@@ -44,7 +45,8 @@ src_prepare() {
 
 	find "${S}" -type f -name 'Makefile*' -print0 | \
 		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
+		sed -r -e 's:-\<Werror\>::g' -e "s:/usr:${EPREFIX}/usr:g" \
+		-i '{}' \
 		|| die
 
 	# BITS is tied to ARCH - please set appropriately if you add new keywords
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 567c88e6b383..1729dbe73c82 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -10,7 +10,7 @@ AUX nut-2.7.2-no-libdummy.patch 535 BLAKE2B f18f65ca92e834b5e085358a09c7363cf156
 AUX nut-openssl-1.1-support.patch 9719 BLAKE2B 2bfe29e9f984fe5ad7854a67f60705ca3c6203392c59654738a91c2f8b543efcd498ebc3747fb509c3bc6934dde0d42cf31418572b60a8cf39fea790338bbe37 SHA512 25d7f9b761a3f7f158edc524071023973edc1c7ee50fe7f4eb487ae4ac131e112ebba944c0df20cd15bf5d2b83394e03f2387be17b95b4d5d969fba3d08e5d84
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r1.ebuild 8990 BLAKE2B 6bc08488cf1d34acce75520ce232fb8d35eb495369ff5e6b8ad85ab34f0517ac7ca5a0a12b26507d63a2cd3494c03f33aa5e72a41ca9426767cb5b39f73bbb1d SHA512 8238f2d9a7e3df1cd670e66aa28b10ddc7a128d15757f58bd6c3952e9aace0b40c91a570582ff5d57a8e65a01de438e54ef1fbdd8059a666c98f2eeb45decd2a
+EBUILD nut-2.7.4-r1.ebuild 8934 BLAKE2B ebf3ac2d9e74098efd5dcf778c44c7cec1fb69df4692c0dba99d784467cb7ea0bcace95b925e0bcf2e62f65f01bfbea9e205238f1894c516661a95a4f9632a24 SHA512 331142b311dfa576d668746ffd318c08dbf27117eb75d92f2395b141802b4f92c2f81a1e7640c7d1b073274023e7d44001da538fdb2eabd4d8078b5acad931e3
 EBUILD nut-2.7.4-r2.ebuild 9720 BLAKE2B 9685414f8faa8a7565eb836d0e02671ad6d8e10f1038db98c43aa533e0fa1d2de6f1057ea9cea64887dcd1c29da7663ae1c72bf1b4c60b76fe5578b0ac9c4a25 SHA512 a1f6aad2acb0762ed0007b99ccf5af94b1d72c621adddf875b1f423d8041efb39091351ae3bd3bc172eac27214e1b5ae726967be7e3581790bfc65bf32e23060
 EBUILD nut-2.7.4-r3.ebuild 9760 BLAKE2B 9b6b485acf8f4e9713cc51875f44ef2d5d4fb20f3cac63ac85e9d4aee42609cf05410cca7106e4201ee82aaa47d5095559e21066edf588ef5a26b61dec1cbb7a SHA512 bea57a2a10f8e9f0f9a10be61100e472aabbfeaf6a745e884f06bd7000b8ab4166d215a539224d10d90076f98fea80a0905983727ceee0a7f1308258d8291476
 MISC metadata.xml 5329 BLAKE2B a97167cdd654c0a1cfc035fbab98a8c94150522b77651186f8c706ac2ebadac6b3e38c8c563a6fa16ac91fc8da760efd204ce3d3ce8e3e0c5239a9dd8c1adf4e SHA512 e57d635a530b16627fbc4807a07a227900189a8796285f309b710c4acb951c990b4f613dc9b3cbab71c480641d8ebfd942520a13e5712527d0058ca07c16b67d
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index 33146bc92d79..48deb79389f8 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -155,7 +155,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	find "${D}" -name '*.la' -exec rm -f {} +
 
@@ -174,19 +174,19 @@ src_install() {
 		mv "${i}" "${i/.sample/}"
 	done
 
-	dodoc AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING || die
+	dodoc AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING
 
 	newdoc lib/README README.lib || die
 	newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die
 
 	docinto cables
-	dodoc docs/cables/* || die
+	dodoc docs/cables/*
 
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd || die
-	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv || die
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon || die
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog || die
-	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail || die
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
+	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
 
 	keepdir /var/lib/nut
 
diff --git a/sys-power/pmtools/Manifest b/sys-power/pmtools/Manifest
index 5e36f607896d..7e406a02fbc9 100644
--- a/sys-power/pmtools/Manifest
+++ b/sys-power/pmtools/Manifest
@@ -3,5 +3,5 @@ AUX pmtools-20100123-acpixtract-pmtools.patch 1822 BLAKE2B 6d7f7de1f2807ae5a2309
 AUX pmtools-20100123-madt.patch 1191 BLAKE2B 46d74cafb71bea3a9c7391b3636da8d9dabda9f24fcf20ff0e9469e72cbdf44477a71a42b780f9d5ba442400381add000fce0fec588f37a62b72dce93475c546 SHA512 3984c4a26248a2b152009ab3703e3fd894abd8a12716aaa7f4913b8a8d922c2a60e7e987e401a0c93c56398b63c36013bcbf7b9c51d1c119f6aa7e67e2657594
 AUX pmtools-20101124-cflags-ldflags.patch 1743 BLAKE2B 65216ce6a9a347c2bc85a4ea8b891ede00d5dd6564541188cb4641747525fff801b5d20a5e2d21c1a37250ffb61f85db11e3beff07cc1bfb1107264a60f650a2 SHA512 63342f0f1f630eeb74dbe45eddd92b4be4794b34d93f691442bb6a761798d25967d93c73389ef0abace8a285efb91677493996948a34e981959782f493963dc0
 DIST pmtools-20110323.tar.gz 62002 BLAKE2B f1de2e266d72c8a69a61df0fc57bc0b27e9a4fc89f840e893b8fbb1bc93ec54dc5f502a1066d17d082341c99b829189911d558261409455fd1db368924fbea59 SHA512 81108c011b45c58c02013a3653c2d00bc2a9a9d80bf85438a193a4fed04a3fd2890d9cd4d64ab455e3e9c1613d35a6be59698395d9a27ca0a858e3935439bafd
-EBUILD pmtools-20110323-r1.ebuild 1319 BLAKE2B 80709a33fcb3813255fc41b24f90f764e8d084dd3c78397f3e54c9bfa1ea15b824199bf16f8d4a25ba9dfecf4067100693c391804d5f2d05298261493b1d0131 SHA512 34be174a0d6ecf3230bc4817777f84e3d299691d106e2d4fb934670b89f1f2b04fbb8a429a37b809e5fa68a8194082da2ce571841601d2132dd690a933dade3b
+EBUILD pmtools-20110323-r1.ebuild 1297 BLAKE2B ecd314dbc9b7fded4a35b6bbe94530e3afbb8e51e914cfad04c420d51be71559f135fb36443a14775e6364103fd383b4b145d20387c01312224390dafaad84a9 SHA512 6f0bb08192aaeae46343760ff2c26d9ef0fcf00cd897497e97943cd057f33b3d9a6a4bf4aa9864cf968980ba0f68b3e3daf99483d6d1c1c68ef9fc4c46b5ad92
 MISC metadata.xml 643 BLAKE2B e61f52f14ac46ff098eab04e4cf05b0b2e85f088d64f2f593d9d82c6fb26b3cbd467b2e5132a87f5ac53029e33cb4f4e8c10484c698c8adf3236b64629368ca5 SHA512 b5d35fb4bc2ad9062c9d089447521adcd717dd4b88ac54a49b56cc9a334ad9c6020ea66d5c0aaeb575b25143d1714f15e0b83025fe8859fd9f010091409a48f2
diff --git a/sys-power/pmtools/pmtools-20110323-r1.ebuild b/sys-power/pmtools/pmtools-20110323-r1.ebuild
index 705fa4ffcf16..2b6a541659eb 100644
--- a/sys-power/pmtools/pmtools-20110323-r1.ebuild
+++ b/sys-power/pmtools/pmtools-20110323-r1.ebuild
@@ -34,7 +34,7 @@ src_prepare() {
 
 src_compile() {
 	# respect user's LDFLAGS
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {