[gentoo-commits] repo/gentoo:master commit in: sys-power/powermgmt-base/

[gentoo-commits] repo/gentoo:master commit in: sys-power/powermgmt-base/

[Mikle Kolyada]

commit:     608181808ca862b27d705304d84627fc430d362f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 14:27:41 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 14:27:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60818180

sys-power/powermgmt-base: migrate to sys-apps/kmod

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../{powermgmt-base-1.31.ebuild => powermgmt-base-1.31-r1.ebuild}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-power/powermgmt-base/powermgmt-base-1.31.ebuild b/sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild
similarity index 94%
rename from sys-power/powermgmt-base/powermgmt-base-1.31.ebuild
rename to sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild
index a4aebd1b9f2..974b6163925 100644
--- a/sys-power/powermgmt-base/powermgmt-base-1.31.ebuild
+++ b/sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ IUSE="+pm-utils"
 
 RDEPEND="!pm-utils? ( virtual/awk )
 	sys-apps/grep
-	virtual/modutils
+	sys-apps/kmod[tools]
 	pm-utils? ( >=sys-power/pm-utils-1.4.1 )"
 
 S=${WORKDIR}/${PN}

[gentoo-commits] repo/gentoo:master commit in: sys-power/powermgmt-base/

[David Seifert]

commit:     c0cdec47c79d092dd9863e19817fd64433833593
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Feb 21 10:56:19 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 10:56:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0cdec47

sys-power/powermgmt-base: Port to EAPI 7, drop pm-utils USE flag

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-power/powermgmt-base/metadata.xml              |  5 +----
 ....31-r1.ebuild => powermgmt-base-1.31-r2.ebuild} | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/sys-power/powermgmt-base/metadata.xml b/sys-power/powermgmt-base/metadata.xml
index 7e5225dfb55..7a38bb90096 100644
--- a/sys-power/powermgmt-base/metadata.xml
+++ b/sys-power/powermgmt-base/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-    <flag name="pm-utils">Adds support for on_ac_power through <pkg>sys-power/pm-utils</pkg></flag>
-  </use>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild b/sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild
similarity index 73%
rename from sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild
rename to sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild
index 974b6163925..cac5e37fe87 100644
--- a/sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild
+++ b/sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Script to test whether computer is running on AC power"
@@ -11,16 +12,17 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
-IUSE="+pm-utils"
 
-RDEPEND="!pm-utils? ( virtual/awk )
+RDEPEND="
+	virtual/awk
 	sys-apps/grep
-	sys-apps/kmod[tools]
-	pm-utils? ( >=sys-power/pm-utils-1.4.1 )"
+	sys-apps/kmod[tools]"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
 		src/Makefile || die
@@ -37,11 +39,7 @@ src_install() {
 
 	doman man/{acpi,apm}_available.1
 
-	if ! use pm-utils; then
-		doman man/on_ac_power.1
-	else
-		rm -f "${D}"/sbin/on_ac_power
-	fi
+	doman man/on_ac_power.1
 
 	newdoc debian/powermgmt-base.README.Debian README
 	dodoc debian/changelog