commit: 0d2ce1ced242c7c6c73b41172a95c6289d0f4abe Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Nov 28 23:57:57 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Nov 28 23:59:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2ce1ce
x11-misc/xbattbar: EAPI7->8, fix w/ upcoming clang16 Closes: https://bugs.gentoo.org/875059 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch | 8 ++++++++ x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 15 +++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch new file mode 100644 index 000000000000..8ee0b80ecb3b --- /dev/null +++ b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/875059 +--- a/xbattbar.c ++++ b/xbattbar.c +@@ -234,3 +234,3 @@ + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild index 660160d40073..ff02fcb15ecb 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -9,7 +9,7 @@ DESCRIPTION="Advanced Power Management battery status display for X" HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"; SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc x86" @@ -24,14 +24,13 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.4.5-Makefile.patch "${FILESDIR}"/${PN}-1.4.8-const.patch + "${FILESDIR}"/${PN}-1.4.9-implicit-int.patch ) src_prepare() { default - sed -i \ - -e "s:usr/lib:usr/$(get_libdir):" \ - xbattbar.c || die + sed -i "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" xbattbar.c || die } src_configure() { @@ -40,6 +39,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install - dodoc README + emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install + einstalldocs }
