[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/files/, x11-misc/xbattbar/
commit: 0d2ce1ced242c7c6c73b41172a95c6289d0f4abe Author: Ionen Wolkens gentoo org> AuthorDate: Mon Nov 28 23:57:57 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Nov 28 23:59:39 2022 + 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 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 ..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 }
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/, x11-misc/xbattbar/files/
commit: 5a2f8e82e4e907ae1c431a89b424fe5c84fda867 Author: Jakov Smolic sartura hr> AuthorDate: Thu Apr 29 21:56:41 2021 + Commit: Sam James gentoo org> CommitDate: Tue May 4 22:17:15 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2f8e82 x11-misc/xbattbar: Respect CFLAGS Closes: https://bugs.gentoo.org/726278 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: Sam James gentoo.org> ...r-1.4.5.patch => xbattbar-1.4.5-Makefile.patch} | 22 +++-- x11-misc/xbattbar/xbattbar-1.4.9.ebuild| 23 -- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch similarity index 62% rename from x11-misc/xbattbar/files/xbattbar-1.4.5.patch rename to x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch index 2602bb91187..0cd1ca00b44 100644 --- a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch +++ b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch @@ -1,27 +1,37 @@ --- a/Makefile +++ b/Makefile -@@ -11,16 +11,16 @@ +@@ -4,23 +4,23 @@ DESTDIR ?= / + + TARGET= xbattbar + APM_CHECK = xbattbar-check-apm +-CPPFLAGS = -D_FORTIFY_SOURCE=2 +-CFLAGS= -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security $(CPPFLAGS) +-LDFLAGS = -Wl,-z,relro ++CPPFLAGS ?= -D_FORTIFY_SOURCE=2 ++CFLAGS?= -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security ++LDFLAGS ?= -Wl,-z,relro + all: $(TARGET) $(APM_CHECK) $(TARGET): obj/xbattbar.o - gcc -o $@ $< -lX11 $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11) obj/xbattbar.o: xbattbar.c obj/stamp - gcc -MMD -o $@ -c $< $(CFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -o $@ -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -o $@ -c $< $(APM_CHECK): obj/xbattbar-check-apm.o - gcc -o $@ $< $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp - gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< obj/stamp: mkdir obj -@@ -32,12 +32,12 @@ +@@ -32,12 +32,12 @@ clean: install: $(TARGET) $(APM_CHECK) diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild index 8d25691b09a..660160d4007 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic multilib toolchain-funcs + +inherit flag-o-matic toolchain-funcs DESCRIPTION="Advanced Power Management battery status display for X" HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"; @@ -14,16 +15,14 @@ KEYWORDS="amd64 ppc x86" DEPEND=" dev-lang/perl - x11-libs/libX11 -" + x11-libs/libX11" RDEPEND=" ${DEPEND} - !ppc? ( >=sys-power/acpi-1.5 ) -" + !ppc? ( >=sys-power/acpi-1.5 )" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.4.5.patch + "${FILESDIR}"/${PN}-1.4.5-Makefile.patch "${FILESDIR}"/${PN}-1.4.8-const.patch ) @@ -33,17 +32,11 @@ src_prepare() { sed -i \ -e "s:usr/lib:usr/$(get_libdir):" \ xbattbar.c || die - - tc-export PKG_CONFIG } -src_compile() { - use kernel_linux && append-flags -Dlinux - - emake \ - CC=$(tc-getCC) \ - LIBDIR="$(get_libdir)" \ - LDFLAGS="${LDFLAGS}" +src_configure() { + tc-export CC PKG_CONFIG + use kernel_linux && append-cppflags -Dlinux } src_install() {
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: bb886480e5b17a808034602f7b0a90e29a749a52 Author: Michał Górny gentoo org> AuthorDate: Wed Sep 23 11:02:12 2020 + Commit: Michał Górny gentoo org> CommitDate: Wed Sep 23 11:07:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb886480 x11-misc/xbattbar: Remove old Signed-off-by: Michał Górny gentoo.org> x11-misc/xbattbar/Manifest | 1 - x11-misc/xbattbar/xbattbar-1.4.8.ebuild | 51 - 2 files changed, 52 deletions(-) diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest index 4c1741883e7..7ba85fedee8 100644 --- a/x11-misc/xbattbar/Manifest +++ b/x11-misc/xbattbar/Manifest @@ -1,2 +1 @@ -DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 DIST xbattbar_1.4.9.orig.tar.gz 19105 BLAKE2B e33631f02266150fc494312c0a78cba145813e3f19ffa4a8fd46ce3adde3e50cb820617e5118a9bb6935fb7be26840e6a9525bf95e2f2fbf585e4e2542d35228 SHA512 e6d0efe0a97b2cb7d0c8a992b7a68a26155dfb625649a5fc8abc4bc37b2c286224185b57d6b2d3671f571690d278970976da5380c1d1bbcd9212e2001f9c40b8 diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild deleted file mode 100644 index 07f440b75dc..000 --- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs - -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" -SLOT="0" -KEYWORDS="amd64 ppc x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - dev-lang/perl - x11-libs/libX11 -" -RDEPEND=" - ${DEPEND} - ${PYTHON_DEPS} - !ppc? ( >=sys-power/acpi-1.5 ) -" # ppc has APM - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.4.5.patch \ - "${FILESDIR}"/${PN}-1.4.8-const.patch - - sed -i \ - -e "s:usr/lib:usr/$(get_libdir):" \ - xbattbar.c || die - - tc-export PKG_CONFIG -} - -src_compile() { - use kernel_linux && append-flags -Dlinux - emake \ - CC=$(tc-getCC) \ - LIBDIR="$(get_libdir)" \ - LDFLAGS="${LDFLAGS}" - python_fix_shebang ${PN}-check-sys -} - -src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install - dodoc README -}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: 1ce9acd4ea94b7c5caeeca1711df6ff4d9d9bc4a Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:34:28 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:34:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce9acd4 x11-misc/xbattbar: x86 stable wrt bug #743577 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild index 32b4949750d..7b0f8988d5b 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" DEPEND=" dev-lang/perl
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: f499ad93652f5f1ee72f1683732a06553acf55b9 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:23:55 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:23:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f499ad93 x11-misc/xbattbar: ppc stable wrt bug #743577 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild index cbe38a53926..32b4949750d 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc ~x86" DEPEND=" dev-lang/perl
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: 2578e08bd66458c1211a38016b6a4653dfe942d3 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:17:38 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:17:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2578e08b x11-misc/xbattbar: amd64 stable wrt bug #743577 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild index e246e6005e6..cbe38a53926 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" DEPEND=" dev-lang/perl
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: b208ba235be6310abf4997e925ea467e8e478522 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Jan 2 10:13:02 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Jan 2 10:19:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b208ba23 x11-misc/xbattbar: Version 1.4.9 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jeroen Roovers gentoo.org> x11-misc/xbattbar/Manifest | 1 + x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 50 + 2 files changed, 51 insertions(+) diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest index bc459cb5132..4c1741883e7 100644 --- a/x11-misc/xbattbar/Manifest +++ b/x11-misc/xbattbar/Manifest @@ -1 +1,2 @@ DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 +DIST xbattbar_1.4.9.orig.tar.gz 19105 BLAKE2B e33631f02266150fc494312c0a78cba145813e3f19ffa4a8fd46ce3adde3e50cb820617e5118a9bb6935fb7be26840e6a9525bf95e2f2fbf585e4e2542d35228 SHA512 e6d0efe0a97b2cb7d0c8a992b7a68a26155dfb625649a5fc8abc4bc37b2c286224185b57d6b2d3671f571690d278970976da5380c1d1bbcd9212e2001f9c40b8 diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild new file mode 100644 index 000..e246e6005e6 --- /dev/null +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic multilib toolchain-funcs + +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" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND=" + dev-lang/perl + x11-libs/libX11 +" +RDEPEND=" + ${DEPEND} + !ppc? ( >=sys-power/acpi-1.5 ) +" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.5.patch + "${FILESDIR}"/${PN}-1.4.8-const.patch +) + +src_prepare() { + default + + sed -i \ + -e "s:usr/lib:usr/$(get_libdir):" \ + xbattbar.c || die + + tc-export PKG_CONFIG +} + +src_compile() { + use kernel_linux && append-flags -Dlinux + + emake \ + CC=$(tc-getCC) \ + LIBDIR="$(get_libdir)" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install + dodoc README +}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/, x11-misc/xbattbar/files/
commit: f1ee029cfcbe924cd0e6234171eb05b7174e892e Author: Mikle Kolyada gentoo org> AuthorDate: Wed May 9 15:14:33 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed May 9 15:14:33 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ee029c x11-misc/xbattbar: Drop old Package-Manager: Portage-2.3.24, Repoman-2.3.6 x11-misc/xbattbar/Manifest | 1 - x11-misc/xbattbar/files/xbattbar-1.4.3.patch | 38 -- x11-misc/xbattbar/xbattbar-1.4.3.ebuild | 41 3 files changed, 80 deletions(-) diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest index 2f80979989a..bc459cb5132 100644 --- a/x11-misc/xbattbar/Manifest +++ b/x11-misc/xbattbar/Manifest @@ -1,2 +1 @@ -DIST xbattbar_1.4.3.orig.tar.gz 15722 BLAKE2B 85a6dbce98ec0109360881763fdf57501e0db21ab2d614b583996d2164c0d8aed94f3e20968cb6c91cf34a7181c66efe94a6e6f32007f6dc26dd94c163bb9d46 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32 DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch deleted file mode 100644 index ad5b9e49c1f..000 --- a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch +++ /dev/null @@ -1,38 +0,0 @@ Makefile -+++ Makefile -@@ -8,16 +8,16 @@ - all: $(TARGET) $(APM_CHECK) - - $(TARGET): obj/xbattbar.o -- gcc -o $@ $< -lX11 -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11 - - obj/xbattbar.o: xbattbar.c obj/stamp -- gcc -MMD -o $@ -c $< -+ $(CC) $(CFLAGS) -MMD -o $@ -c $< - - $(APM_CHECK): obj/xbattbar-check-apm.o -- gcc -o $@ $< -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< - - obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp -- gcc -MMD -D$(OS_TYPE) -o $@ -c $< -+ $(CC) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< - - obj/stamp: - mkdir obj -@@ -29,11 +29,11 @@ - - - install: $(TARGET) $(APM_CHECK) -- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT) -+ install -d -m 0755 $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT) - install -d -m 0755 $(DESTDIR)/usr/bin - install -d -m 0755 $(DESTDIR)/usr/share/man/man1 -- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/ -- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/ -+ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/ -+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/ - install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/ - install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 - diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild deleted file mode 100644 index 50b76944e6f..000 --- a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit eutils flag-o-matic multilib toolchain-funcs - -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" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="" - -DEPEND="dev-lang/perl - x11-libs/libX11" -RDEPEND="${DEPEND} - !ppc? ( >=sys-power/acpi-1.5 )" # ppc has APM - -# XXX: Avoiding imake in purpose here. - -src_prepare() { - epatch "${FILESDIR}"/${P}.patch - - sed -i \ - -e "s:usr/lib:usr/$(get_libdir):" \ - xbattbar.c || die -} - -src_compile() { - [[ $(tc-arch) == amd64 ]] && export LIB_SUFFIX=64 - tc-export CC - use kernel_linux && append-flags -Dlinux - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc README -}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: b18ba57f661b37670f2fd81414862d25fdb48bc4 Author: Mikle Kolyada gentoo org> AuthorDate: Wed May 9 15:13:27 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed May 9 15:13:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18ba57f x11-misc/xbattbar: ppc stable wrt bug #648878 Package-Manager: Portage-2.3.24, Repoman-2.3.6 x11-misc/xbattbar/xbattbar-1.4.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild index 8e044840e00..07f440b75dc 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: aacfb6909157262d724803b29bb635799ce82d4c Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Mar 13 22:24:31 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Mar 13 22:26:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aacfb690 x11-misc/xbattbar: x86 stable (bug #648878) Package-Manager: Portage-2.3.24, Repoman-2.3.6 x11-misc/xbattbar/xbattbar-1.4.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild index eedb31688fa..8e044840e00 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: 4bbd174fb340c5596e5bfcff181e87a9aed26514 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Sep 23 06:41:12 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Sep 23 06:46:10 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bbd174f x11-misc/xbattbar: Use HTTPS. Package-Manager: Portage-2.3.10, Repoman-2.3.3 x11-misc/xbattbar/xbattbar-1.4.3.ebuild | 4 ++-- x11-misc/xbattbar/xbattbar-1.4.8.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild index 741039451f3..50b76944e6f 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=2 inherit eutils flag-o-matic multilib toolchain-funcs DESCRIPTION="Advanced Power Management battery status display for X" -HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"; +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" diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild index 1d21ccec6d0..1d3780e53a0 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild @@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 ) inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs DESCRIPTION="Advanced Power Management battery status display for X" -HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"; +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"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/
commit: 17e20326cd60fe845e058e412de087d8c6901973 Author: David Seifert gentoo org> AuthorDate: Fri Apr 21 07:06:57 2017 + Commit: David Seifert gentoo org> CommitDate: Fri Apr 21 07:06:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e20326 x11-misc/xbattbar: [QA] Add missing python metadata variables Package-Manager: Portage-2.3.5, Repoman-2.3.2 x11-misc/xbattbar/xbattbar-1.4.8.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild index 9482253d7c8..1d21ccec6d0 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,6 +12,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=" dev-lang/perl
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/files/, x11-misc/xbattbar/
commit: 3b16491e4dcaac0864cfe42d32cf72495777b508 Author: Harri Nieminen gmail com> AuthorDate: Mon Mar 6 15:12:47 2017 + Commit: David Seifert gentoo org> CommitDate: Tue Mar 7 09:12:12 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b16491e x11-misc/xbattbar: Remove old Package-Manager: Portage-2.3.4, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4142 x11-misc/xbattbar/Manifest | 2 -- x11-misc/xbattbar/files/xbattbar-1.4.4.patch | 40 --- x11-misc/xbattbar/xbattbar-1.4.4.ebuild | 43 - x11-misc/xbattbar/xbattbar-1.4.5.ebuild | 48 4 files changed, 133 deletions(-) diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest index f08aa2a917d..774f81bc99f 100644 --- a/x11-misc/xbattbar/Manifest +++ b/x11-misc/xbattbar/Manifest @@ -1,4 +1,2 @@ DIST xbattbar_1.4.3.orig.tar.gz 15722 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32 WHIRLPOOL a6639a36f2473d2f47b01ae698817e5a5054db853306c3d793c5e3f1951bf7c6a576c28174b21723c72f1e9fb133df0a12dfef9f930b6448550f46d375708ced -DIST xbattbar_1.4.4.orig.tar.gz 15922 SHA256 2e64855de0cef61f764a7eea81565f7a06fe82492db0b6a09662d6dd93b61448 SHA512 0cd09f4489d9ec551e202fc4791e250c5bf6fdb1801d9025662b79060eb7673c6e43dcf3c352370d42549587dd60879ccad6c6e401f86c7e2a641acbec176aa9 WHIRLPOOL 8eb4b95685ef92c783f9dbe26583cae9189490008630b92d32761548dea603b09cb2c0ed21f463694b7254aea9bd4dc60c835d2207a66812a9d33ef980b72740 -DIST xbattbar_1.4.5.orig.tar.gz 16191 SHA256 01b75b2f902d1315a08ec7ddfdcdafc7686cf88662bbf2be5bfcc892294c4b80 SHA512 cc9719e98dc038e0b5bbe1a13acea5cf6c15495b8a133b25663bd86688635bf6f3fefb360a27fb9f00b2012ba16f58bc6f63bfc8ee7eb227e30ad5c9ee1def56 WHIRLPOOL e39aaff055e7ebb7de2a21af5ea263b64949a2ae5e783d47e8879eb51d46a3aa766b29e913eff79ae2585ac3ddbd53710eb7c164a625c7cfdfdf237bf38de884 DIST xbattbar_1.4.8.orig.tar.gz 16254 SHA256 d7f5cb83a783c3f3376ddb83b90bec90a70d62ff30b8819cf674bf9341677939 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 WHIRLPOOL 8cd6d35ee4d75df20babd4127ac7be6ac9ff2086fcc10572bff65af1a9d1635bf9ec2590d2aebec56b2c6aaf99d18368490092dc730325d92e4aa2eee2e88981 diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.4.patch b/x11-misc/xbattbar/files/xbattbar-1.4.4.patch deleted file mode 100644 index 0a17a4cd1a5..000 --- a/x11-misc/xbattbar/files/xbattbar-1.4.4.patch +++ /dev/null @@ -1,40 +0,0 @@ a/Makefile -+++ b/Makefile -@@ -8,16 +8,16 @@ - all: $(TARGET) $(APM_CHECK) - - $(TARGET): obj/xbattbar.o -- gcc -o $@ $< -lX11 -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11 - - obj/xbattbar.o: xbattbar.c obj/stamp -- gcc -MMD -o $@ -c $< -+ $(CC) $(LDFLAGS) $(CFLAGS) -MMD -o $@ -c $< - - $(APM_CHECK): obj/xbattbar-check-apm.o -- gcc -o $@ $< -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< - - obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp -- gcc -MMD -D$(OS_TYPE) -o $@ -c $< -+ $(CC) $(LDFLAGS) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< - - obj/stamp: - mkdir obj -@@ -29,12 +29,12 @@ - - - install: $(TARGET) $(APM_CHECK) -- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT) -+ install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT) - install -d -m 0755 $(DESTDIR)/usr/bin - install -d -m 0755 $(DESTDIR)/usr/share/man/man1 -- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/ -- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/ -- install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/lib/$(PROJECT)/ -+ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ -+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ -+ install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ - install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/ - install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 - diff --git a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild deleted file mode 100644 index 1ad8948f287..000 --- a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs - -DESCRIPTION="Advanced Power Management battery status display for X" -HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"; -SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPEND=" - dev-lang/perl - x11-libs/li
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/files/, x11-misc/xbattbar/
commit: 7157442b92744d6b8ed5b1e45c42a0a79ed86750 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Sep 16 04:13:28 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Sep 16 04:13:28 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7157442b x11-misc/xbattbar: Version bump. Package-Manager: portage-2.2.20.1 x11-misc/xbattbar/Manifest | 1 + x11-misc/xbattbar/files/xbattbar-1.4.8-const.patch | 11 + x11-misc/xbattbar/xbattbar-1.4.8.ebuild| 51 ++ 3 files changed, 63 insertions(+) diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest index 8476368..c6c2072 100644 --- a/x11-misc/xbattbar/Manifest +++ b/x11-misc/xbattbar/Manifest @@ -1,3 +1,4 @@ DIST xbattbar_1.4.3.orig.tar.gz 15722 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9 DIST xbattbar_1.4.4.orig.tar.gz 15922 SHA256 2e64855de0cef61f764a7eea81565f7a06fe82492db0b6a09662d6dd93b61448 SHA512 0cd09f4489d9ec551e202fc4791e250c5bf6fdb1801d9025662b79060eb7673c6e43dcf3c352370d42549587dd60879ccad6c6e401f86c7e2a641acbec176aa9 WHIRLPOOL 8eb4b95685ef92c783f9dbe26583cae9189490008630b92d32761548dea603b09cb2c0ed21f463694b7254aea9bd4dc60c835d2207a66812a9d33ef980b72740 DIST xbattbar_1.4.5.orig.tar.gz 16191 SHA256 01b75b2f902d1315a08ec7ddfdcdafc7686cf88662bbf2be5bfcc892294c4b80 SHA512 cc9719e98dc038e0b5bbe1a13acea5cf6c15495b8a133b25663bd86688635bf6f3fefb360a27fb9f00b2012ba16f58bc6f63bfc8ee7eb227e30ad5c9ee1def56 WHIRLPOOL e39aaff055e7ebb7de2a21af5ea263b64949a2ae5e783d47e8879eb51d46a3aa766b29e913eff79ae2585ac3ddbd53710eb7c164a625c7cfdfdf237bf38de884 +DIST xbattbar_1.4.8.orig.tar.gz 16254 SHA256 d7f5cb83a783c3f3376ddb83b90bec90a70d62ff30b8819cf674bf9341677939 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 WHIRLPOOL 8cd6d35ee4d75df20babd4127ac7be6ac9ff2086fcc10572bff65af1a9d1635bf9ec2590d2aebec56b2c6aaf99d18368490092dc730325d92e4aa2eee2e88981 diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.8-const.patch b/x11-misc/xbattbar/files/xbattbar-1.4.8-const.patch new file mode 100644 index 000..818aa38 --- /dev/null +++ b/x11-misc/xbattbar/files/xbattbar-1.4.8-const.patch @@ -0,0 +1,11 @@ +--- a/xbattbar-check-apm.c b/xbattbar-check-apm.c +@@ -210,7 +210,7 @@ + #defineAPM_STAT_LINE_ON1 + + typedef struct apm_info { +- const char driver_version[10]; ++ char driver_version[10]; +intapm_version_major; +intapm_version_minor; +intapm_flags; diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild new file mode 100644 index 000..18b2d30 --- /dev/null +++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs + +DESCRIPTION="Advanced Power Management battery status display for X" +HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"; +SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND=" + dev-lang/perl + x11-libs/libX11 +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} + !ppc? ( >=sys-power/acpi-1.5 ) +" # ppc has APM + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-1.4.5.patch \ + "${FILESDIR}"/${PN}-1.4.8-const.patch + + sed -i \ + -e "s:usr/lib:usr/$(get_libdir):" \ + xbattbar.c || die + + tc-export PKG_CONFIG +} + +src_compile() { + use kernel_linux && append-flags -Dlinux + emake \ + CC=$(tc-getCC) \ + LIBDIR="$(get_libdir)" \ + LDFLAGS="${LDFLAGS}" + python_fix_shebang ${PN}-check-sys +} + +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install + dodoc README +}