diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:04:52 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:09:40 +0100 |
| commit | f12e46ab927aa235ee56ee9b4611af0b3ff7fb53 (patch) | |
| tree | 9a512df51ecaf68dfc92c3a1d21ba380c9108c4f | |
| parent | app-emulation/libguestfs: clean up patch (diff) | |
| download | gentoo-f12e46ab927aa235ee56ee9b4611af0b3ff7fb53.tar.gz gentoo-f12e46ab927aa235ee56ee9b4611af0b3ff7fb53.tar.bz2 gentoo-f12e46ab927aa235ee56ee9b4611af0b3ff7fb53.zip | |
app-laptop/ibam: respect ${PKG_CONFIG}, use PATCHES=()
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | app-laptop/ibam/files/ibam-0.5.2-build.patch | 2 | ||||
| -rw-r--r-- | app-laptop/ibam/ibam-0.5.2-r4.ebuild | 24 |
2 files changed, 11 insertions, 15 deletions
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch index 665e50798b18..57459f544e5b 100644 --- a/app-laptop/ibam/files/ibam-0.5.2-build.patch +++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch @@ -26,7 +26,7 @@ ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl - $(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp -+ $(CXX) $(CXXFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp ++ $(CXX) $(CXXFLAGS) -fPIC `${PKG_CONFIG} gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp krell1: ibam-krell1.so diff --git a/app-laptop/ibam/ibam-0.5.2-r4.ebuild b/app-laptop/ibam/ibam-0.5.2-r4.ebuild index 2076603b9f60..25d42e8d7193 100644 --- a/app-laptop/ibam/ibam-0.5.2-r4.ebuild +++ b/app-laptop/ibam/ibam-0.5.2-r4.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" PATCH_LEVEL="2.1" - inherit toolchain-funcs DESCRIPTION="Intelligent Battery Monitor" @@ -27,20 +26,17 @@ DEPEND=" ${RDEPEND} gkrellm? ( virtual/pkgconfig )" -src_prepare() { - eapply \ - "${FILESDIR}"/${P}-build.patch \ - "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff - - eapply debian/patches/02*.dpatch - eapply debian/patches/03*.dpatch - eapply debian/patches/05*.dpatch - - eapply_user -} +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff + "${S}"/debian/patches/02deviation.dpatch + "${S}"/debian/patches/03acpi-check.dpatch + "${S}"/debian/patches/05_sysfs_lenovo.dpatch +) src_compile() { - tc-export CXX + tc-export CXX PKG_CONFIG + emake use gkrellm && emake krell } |