Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/intel-undervolt/
Date: Fri, 30 Aug 2019 20:27:05
Message-Id: 1567196759.1e8bdd097c04f15d7bcfa95eb2589df60bb701d1.gyakovlev@gentoo
1 commit: 1e8bdd097c04f15d7bcfa95eb2589df60bb701d1
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 30 20:25:23 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 30 20:25:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e8bdd09
7
8 sys-power/intel-undervolt: sync live ebuild
9
10 Package-Manager: Portage-2.3.73, Repoman-2.3.17
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 .../intel-undervolt/intel-undervolt-9999.ebuild | 51 +++++++++++-----------
14 1 file changed, 25 insertions(+), 26 deletions(-)
15
16 diff --git a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
17 index 74c44d3fe53..3073fbb4c1b 100644
18 --- a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
19 +++ b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
20 @@ -18,45 +18,44 @@ fi
21
22 LICENSE="GPL-3"
23 SLOT="0"
24 -IUSE=""
25 +IUSE="elogind"
26
27 -DEPEND=""
28 -RDEPEND=""
29 -BDEPEND=""
30 +DEPEND="elogind? ( sys-auth/elogind )"
31 +
32 +RDEPEND="${DEPEND}"
33 +
34 +BDEPEND="virtual/pkgconfig"
35
36 CONFIG_CHECK="~INTEL_RAPL ~X86_MSR"
37
38 -src_prepare() {
39 - # respect CC, CFLAGS and avoid calling pkg-config
40 - sed -i \
41 - -e 's/^CC=/CC?=/' \
42 - -e 's/^CFLAGS=/CFLAGS?=/' \
43 - -e '/^UNITDIR=/d' \
44 - Makefile || die
45 +src_configure() {
46 + local myconf=(
47 + # it's a non-standard build system
48 + $(usex elogind --enable-elogind '')
49 + --enable-openrc
50 + --enable-systemd
51 + --unitdir="$(systemd_get_systemunitdir)"
52 + )
53
54 - default
55 + econf "${myconf[@]}"
56 }
57
58 src_compile() {
59
60 tc-export CC
61
62 - myemakeargs=(
63 - BINDIR="${EPREFIX}"/usr/bin
64 - SYSCONFDIR="${EPREFIX}"/etc
65 - UNITDIR="$(systemd_get_systemunitdir)"
66 + local myemakeargs=(
67 + CC="${CC}"
68 + CFLAGS="${CFLAGS}"
69 )
70 emake "${myemakeargs[@]}"
71 }
72
73 -src_install() {
74 - myemakeargs+=(
75 - DESTDIR="${D}"
76 - )
77 - emake "${myemakeargs[@]}" install
78 -
79 - newinitd "${FILESDIR}"/initd "${PN}"
80 - newconfd "${FILESDIR}"/confd "${PN}"
81 -
82 - einstalldocs
83 +pkg_postinst() {
84 +for v in ${REPLACING_VERSIONS}; do
85 + if [[ ${v} == 1.6 ]] ; then
86 + elog "openrc service has been renamed to intel-undervolt-loop"
87 + elog "please update your startup configuration"
88 + fi
89 +done
90 }