diff options
Diffstat (limited to 'x11-misc/xbatt')
| -rw-r--r-- | x11-misc/xbatt/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch | 8 | ||||
| -rw-r--r-- | x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild (renamed from x11-misc/xbatt/xbatt-1.3_rc1.ebuild) | 30 |
3 files changed, 27 insertions, 14 deletions
diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest index bc0a95557c7f..e85ab3736842 100644 --- a/x11-misc/xbatt/Manifest +++ b/x11-misc/xbatt/Manifest @@ -1,4 +1,5 @@ +AUX xbatt-1.2.1-clang16.patch 112 BLAKE2B 713802bda8be896d90b90cca1ec583cf1c436eae7d95c6478a167fa3e7d46cafa534770a06db84d42c3e842f75dfd0baa8a8af91acae469f9636415cd42a15aa SHA512 b0c154d3e356f09bc38da01a5aca1c7f13d053a0ede79c5d42aeeeb1cdc53908929d4a390f4a59ea232257c6efe2133860f0b6c22f8a83d45c7ebba5eea3384e AUX xbatt-1.2.1-implicits.patch 301 BLAKE2B 9e7a8b0f2a88ed56857a9f2836f4ac2b916323625e748f6d980d334dd958e6c0c8b442103af5312b1176d386c802d524c1e1b5f0012a18acfc73eb163c247e7f SHA512 defdd56e8a52147afc3f924a1e462bdce4c6200a7300f442a46cc1a4eaaa7ffdc0e52c70683f23774e20e6480c91e094db4f834073c71b1c30a3f4d24c145353 DIST xbatt-1.3pr1.tar.gz 14412 BLAKE2B 7dc44305ac966c41cee8e62a8bcaa0ea991b13b3f126d09c5e80e60bfd4d2becbf57a657d41ee0db36c8a5d9a0366e255c5c893895fd253eb39dcd60a9227b51 SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d -EBUILD xbatt-1.3_rc1.ebuild 971 BLAKE2B 0830f168c87812327d0d12b3f22b8381ecf192787f77bb7202138eea3c70fcde6030d71dd2610c34cade381f5d9478c3420a6876219f28778856ccfb1b0292f9 SHA512 2da6924c5d0f0b27641dfd29e41ba94d05bd02f77f4e80c57618b9313bf0322b5d6b9ea9fcca6e1a7ae823bf037c714b0df5a57985847e46a8141a4c25c44472 +EBUILD xbatt-1.3_rc1-r1.ebuild 1019 BLAKE2B 56790052696400fb14cb18e46973af522f7e3905ade06ccaa0f0f7d9eae529d6d71906b086a21a1024a25f596398979a25eb5775e0f7cdfd28eea5006df08f37 SHA512 f36320b6f59846d781cada3bed9200f2e6e48e4ee2838466e02052bf7c5388bb65f31b49b3ae47c217e6c8352f201c76608f49d39cb87b404212c609f86ef0e0 MISC metadata.xml 319 BLAKE2B 991d0f89b643d24c6fcea9a22d130a9e5ca23486e319c42517e2d07ac5f0680ea3989464cc3557c413556dd4b7eb938cea3dffa78031f06f358476cce132aff1 SHA512 536da7cc9bec7c9e42d88e736138d1efd55dc8d89adc74edfc6535f730f01937a7d3228528c6b78b9eb0e29b1807a2d4d4ca202595e2f693009221331981958c diff --git a/x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch b/x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch new file mode 100644 index 000000000000..9a7c03157738 --- /dev/null +++ b/x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/870412 +--- a/xbatt.c ++++ b/xbatt.c +@@ -223,3 +223,3 @@ + +-main( ++int main( + int argc, diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild index df26d01cbd2c..460d865a6a04 100644 --- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild +++ b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild @@ -1,13 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit toolchain-funcs eapi7-ver +EAPI=8 + +inherit toolchain-funcs MY_PV=${PV/_rc/pr} + DESCRIPTION="Notebook battery indicator for X" -HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/" -SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-$(ver_cut 1-2)" LICENSE="xbatt" SLOT="0" @@ -19,21 +22,22 @@ RDEPEND=" x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile - x11-libs/libXpm -" + x11-libs/libXpm" DEPEND=" ${RDEPEND} - x11-base/xorg-proto - >=x11-misc/imake-1.0.8-r1 -" + x11-base/xorg-proto" +BDEPEND=" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" + PATCHES=( "${FILESDIR}"/${PN}-1.2.1-implicits.patch + "${FILESDIR}"/${PN}-1.2.1-clang16.patch ) -S="${WORKDIR}"/${PN}-$(ver_cut 1-2) src_configure() { CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_compile() { @@ -46,5 +50,5 @@ src_compile() { src_install() { emake DESTDIR="${D}" install - dodoc README* + einstalldocs } |