public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2018-06-25 11:46 Johannes Huber
  0 siblings, 0 replies; 9+ messages in thread
From: Johannes Huber @ 2018-06-25 11:46 UTC (permalink / raw
  To: gentoo-commits

commit:     b210e585799c560d0e15b1e00ba31395f8810752
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 11:06:48 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 11:30:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b210e585

x11-misc/xbatt: Migrate to eapi7-ver eclass

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/xbatt/xbatt-1.3_rc1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index c7c8c394927..350878f1db6 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs versionator
+inherit toolchain-funcs eapi7-ver
 
 MY_PV=${PV/_rc/pr}
 DESCRIPTION="Notebook battery indicator for X"
@@ -29,7 +29,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
 )
-S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2)
+S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
 src_compile() {
 	xmkmf || die


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2018-06-27 21:54 Sergei Trofimovich
  0 siblings, 0 replies; 9+ messages in thread
From: Sergei Trofimovich @ 2018-06-27 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     06bbd47bd7ce9d074c25bc6063f455f8b163edeb
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 19:38:10 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 21:53:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06bbd47b

x11-misc/xbatt: stable 1.3_rc1 for ppc, bug #659088

Bug: https://bugs.gentoo.org/659088
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"

 x11-misc/xbatt/xbatt-1.3_rc1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index 350878f1db6..e8323ad9d9b 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="xbatt"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXmu


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2018-07-06 13:43 Thomas Deutschmann
  0 siblings, 0 replies; 9+ messages in thread
From: Thomas Deutschmann @ 2018-07-06 13:43 UTC (permalink / raw
  To: gentoo-commits

commit:     df11c0fac01321522a7e6d1fa7a1f876e39d8a73
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  6 13:40:03 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jul  6 13:42:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df11c0fa

x11-misc/xbatt: x86 stable (bug #659088)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 x11-misc/xbatt/xbatt-1.3_rc1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index e8323ad9d9b..58ae09abe57 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="xbatt"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXmu


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2018-07-09 14:58 Mikle Kolyada
  0 siblings, 0 replies; 9+ messages in thread
From: Mikle Kolyada @ 2018-07-09 14:58 UTC (permalink / raw
  To: gentoo-commits

commit:     3db651dfa30ba32cbedfb783f1c42296cc0001d0
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 14:57:24 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 14:58:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db651df

x11-misc/xbatt: amd64 stable wrt bug #659088

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/xbatt/xbatt-1.3_rc1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index 58ae09abe57..75a3899848d 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="xbatt"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXmu


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2018-07-09 14:58 Mikle Kolyada
  0 siblings, 0 replies; 9+ messages in thread
From: Mikle Kolyada @ 2018-07-09 14:58 UTC (permalink / raw
  To: gentoo-commits

commit:     11bf818d50c5abe81b4e2b6049e4c0b6d47b9dfb
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 14:58:21 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 14:58:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bf818d

x11-misc/xbatt: Drop old (EAPI=2)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/xbatt/Manifest              |  1 -
 x11-misc/xbatt/xbatt-1.2.1-r1.ebuild | 41 ------------------------------------
 2 files changed, 42 deletions(-)

diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest
index b31533e37fb..278843ba5a6 100644
--- a/x11-misc/xbatt/Manifest
+++ b/x11-misc/xbatt/Manifest
@@ -1,2 +1 @@
-DIST xbatt-1.2.1.tar.gz 12779 BLAKE2B d93d13125d482ebd5b2979033f09ba74526ae8f11d5f4bc88a3ccb0129e3e0ca61e8ca4389c45d789e440389de59939319dd1ef3e03e8e9ca78a61d25b3fc83d SHA512 db96f89e3abecd23532305069806ac094d5a31797f6f730d0f0d5345ac3f339286a5e3bcfc73d42a44a666bcbc768c955b9c3d8ca2fd28bd8239dfa109fe7020
 DIST xbatt-1.3pr1.tar.gz 14412 BLAKE2B 7dc44305ac966c41cee8e62a8bcaa0ea991b13b3f126d09c5e80e60bfd4d2becbf57a657d41ee0db36c8a5d9a0366e255c5c893895fd253eb39dcd60a9227b51 SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d

diff --git a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
deleted file mode 100644
index 49c4acc7577..00000000000
--- a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Notebook battery indicator for X"
-HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/"
-SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${P}.tar.gz"
-
-LICENSE="xbatt"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libxkbfile
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake"
-
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-implicits.patch
-}
-
-src_compile() {
-	xmkmf || die
-	emake xbatt CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README* || die
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2021-04-15  6:39 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2021-04-15  6:39 UTC (permalink / raw
  To: gentoo-commits

commit:     28291a79c8c9d1892b55e11c001ffb929c3f22d0
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Wed Apr 14 12:30:48 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 06:38:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28291a79

x11-misc/xbatt: fix build with -native-symlinks

Closes: https://bugs.gentoo.org/726220
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-misc/xbatt/xbatt-1.3_rc1.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index 75a3899848d..df26d01cbd2 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,15 +24,19 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
 )
 S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+}
+
 src_compile() {
-	xmkmf || die
 	emake \
 		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2022-09-30 11:02 Ionen Wolkens
  0 siblings, 0 replies; 9+ messages in thread
From: Ionen Wolkens @ 2022-09-30 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     3e8c612e4e146c920f33595b95034ebee18ca031
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 09:08:16 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8c612e

x11-misc/xbatt: force gcc -E for imake's generation

Requires traditional cpp support and is broken in all sort of ways
with clang-cpp / -E. Can still use clang & friends for everything else.

Ideally these packages need to be built another way or last rited,
imake will just accumulate more problems.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
index 56d0ce5f7d91..1c3072e729f7 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
@@ -26,7 +26,9 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto"
-BDEPEND=">=x11-misc/imake-1.0.8-r1"
+BDEPEND="
+	sys-devel/gcc
+	>=x11-misc/imake-1.0.8-r1"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
@@ -34,7 +36,7 @@ PATCHES=(
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2022-09-30 11:02 Ionen Wolkens
  0 siblings, 0 replies; 9+ messages in thread
From: Ionen Wolkens @ 2022-09-30 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     876bd6875f3669646929f012647be6fbbe34aea9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 09:07:05 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876bd687

x11-misc/xbatt: EAPI6->8, drop dead urls

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 ...batt-1.3_rc1.ebuild => xbatt-1.3_rc1-r1.ebuild} | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
similarity index 68%
rename from x11-misc/xbatt/xbatt-1.3_rc1.ebuild
rename to x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
index df26d01cbd2c..56d0ce5f7d91 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,17 +22,15 @@ 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=">=x11-misc/imake-1.0.8-r1"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
 )
-S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
@@ -46,5 +47,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	dodoc README*
+	einstalldocs
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
@ 2022-10-11  8:56 Ionen Wolkens
  0 siblings, 0 replies; 9+ messages in thread
From: Ionen Wolkens @ 2022-10-11  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     bee0fed2f63cb78cb7b34b5ebd39dafd3a31aa23
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 08:27:07 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 08:56:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee0fed2

x11-misc/xbatt: pass -std=gnu89

Does not build with `clang -std=c2x`, early workaround for
when this will become a default.

(not actively hunting for these, merely revisiting packages
previously looked at for clang16 even if not an issue "yet").

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
index 460d865a6a04..d9e0581b39b2 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 MY_PV=${PV/_rc/pr}
 
@@ -36,6 +36,8 @@ PATCHES=(
 )
 
 src_configure() {
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
 		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-10-11  8:56 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-30 11:02 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/ Ionen Wolkens
  -- strict thread matches above, loose matches on Subject: below --
2022-10-11  8:56 Ionen Wolkens
2022-09-30 11:02 Ionen Wolkens
2021-04-15  6:39 Joonas Niilola
2018-07-09 14:58 Mikle Kolyada
2018-07-09 14:58 Mikle Kolyada
2018-07-06 13:43 Thomas Deutschmann
2018-06-27 21:54 Sergei Trofimovich
2018-06-25 11:46 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox