summaryrefslogtreecommitdiff
path: root/x11-misc/xbattbar
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-11-29 01:18:33 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-11-29 01:18:33 +0000
commit56767705335e747c2a8b3f3282e5c1a393352d54 (patch)
treedb29fcdff8c7ce293aa55e7ba797c1242cd601c0 /x11-misc/xbattbar
parentee2ff072f141c81ba073dc664091d2780d4e74e0 (diff)
gentoo auto-resync : 29:11:2022 - 01:18:33
Diffstat (limited to 'x11-misc/xbattbar')
-rw-r--r--x11-misc/xbattbar/Manifest3
-rw-r--r--x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch8
-rw-r--r--x11-misc/xbattbar/xbattbar-1.4.9.ebuild15
3 files changed, 17 insertions, 9 deletions
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index 8f467551c447..e7e74c1f34e0 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,5 +1,6 @@
AUX xbattbar-1.4.5-Makefile.patch 1869 BLAKE2B 98e103447e8bcad5f2ec1ec9d5138876bf6f741b79e9ba87ef2232df8e98544a0df7fb6886ede03ebd9b51e83204ed3ebc3dfa43fd547eae11ba513f34c3227b SHA512 b3da07fc8f01dc3716bbb2207b8245d56bd41818d3f36e521b8cde308d70f208022ea3bb6dffeb38cc82e6a9bfa03afcbd007b21ebf7ded78f56b02ac961e861
AUX xbattbar-1.4.8-const.patch 303 BLAKE2B d33ff7f8bc273e1ef3e493e2411b4aff025a36316163b31df52299a77c6409023b069a7ef2d2f55a189e2848b8e73d37a54a8957c9f71fdc3e51b6a48a179bda SHA512 987116af9d8e50b6ef96924199e5d348a9910030adbe2b2a8de0425107eee93cfe04740b343542c97edc6ed846bcff05724470b6fff1f5209c92c42e8648af0b
+AUX xbattbar-1.4.9-implicit-int.patch 152 BLAKE2B 12835f27a07ecb63d34364c0ab9e3419d1f9933f1c0944b5bada6fbb5e52730c087544024e68039f75f178c4d11756feff013cd35640dafb982ae59588a2790f SHA512 58e883cf4e1ef2d2540acbccf11c03665977e42087649fa5f888492560dfe68efbf3cd53fb8dcf80489656dc183bca692e2a7438f69b588b28aa8d7f9ad786c6
DIST xbattbar_1.4.9.orig.tar.gz 19105 BLAKE2B e33631f02266150fc494312c0a78cba145813e3f19ffa4a8fd46ce3adde3e50cb820617e5118a9bb6935fb7be26840e6a9525bf95e2f2fbf585e4e2542d35228 SHA512 e6d0efe0a97b2cb7d0c8a992b7a68a26155dfb625649a5fc8abc4bc37b2c286224185b57d6b2d3671f571690d278970976da5380c1d1bbcd9212e2001f9c40b8
-EBUILD xbattbar-1.4.9.ebuild 890 BLAKE2B 5a8c18d708c4516947a43fb3a70b8eaf1af59d2c323c027abedf59c04802d882c8658eb536c317012d1d648720e8243577ab43112968d55cb74b7153141da996 SHA512 2878dbf7bf1e03ab82e0b185d2bbb5c8f98e8d2f396c742e9278c18b7523e96c14e9c43a441b423046d04bbfeb3648c60e49ff20c44f0915af4d9671351f2153
+EBUILD xbattbar-1.4.9.ebuild 939 BLAKE2B 37ac0da9ae78968d6292a204ea75eafd92d0ed4e930074d583f5f9d4623f98d442663712914604239396b697de8085c0c17d48e8372a207f14d34ae809761188 SHA512 6f74d178314e0527aa546496a03e16852bebe7ba80c9c6e53e8f66b4a08d8658e33cff7bd6029c676cacabf13dba49a7ae238a4aa8dd5e2df7eec469583a4380
MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
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
}