[gentoo-commits] repo/gentoo:master commit in: x11-misc/xtoolwait/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xtoolwait/

[David Seifert]

commit:     88fe0b5520d428152ea981237d95421757d05347
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 17:40:11 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 17:40:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fe0b55

x11-misc/xtoolwait: Port to EAPI 7

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index b1878e8d3e4..386962ee976 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
@@ -11,16 +12,17 @@ SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
 	app-text/rman
-	x11-base/xorg-proto
 	x11-misc/imake"
 
-src_prepare() {
+src_configure() {
 	xmkmf || die
 	sed -i \
 		-e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \
@@ -36,11 +38,11 @@ src_compile() {
 
 src_install() {
 	emake \
-		BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		DOCDIR=/usr/share/doc/${PF} \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANPATH="${EPREFIX}"/usr/share/man \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
 		DESTDIR="${D}" \
 		install{,.man}
 
-	dodoc CHANGES README
+	einstalldocs
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xtoolwait/

[Joonas Niilola]

commit:     440dd6f39522f63bf3e0678f5b8cfe9e97a15fff
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Wed Apr 14 13:29:09 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 06:38:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=440dd6f3

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

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

 x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index 386962ee976..379b2beb3fa 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,23 +16,21 @@ KEYWORDS="amd64 ppc x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rman
-	x11-misc/imake"
+	x11-base/xorg-proto
+	>=x11-misc/imake-1.0.8-r1"
 
 src_configure() {
-	xmkmf || die
-	sed -i \
-		-e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \
-		Makefile || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		CCOPTIONS="${CFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xtoolwait/

[Ionen Wolkens]

commit:     6d7ebecbe32b8fd1d3c8fc450aa949431bf77cfd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 09:47:58 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7ebecb

x11-misc/xtoolwait: 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.

Closes: https://bugs.gentoo.org/870805
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index 379b2beb3faf..f6dfa47f2340 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,15 +16,17 @@ KEYWORDS="amd64 ppc x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	app-text/rman
-	x11-base/xorg-proto
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1"
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xtoolwait/

[Ionen Wolkens]

commit:     5b6d32c09517b79c478ab02085871717d71f86fa
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 08:27:54 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 08:56:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6d32c0

x11-misc/xtoolwait: 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/xtoolwait/xtoolwait-1.3-r2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index f6dfa47f2340..c8cafd651d2c 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
 HOMEPAGE="http://ftp.x.org/contrib/utilities/xtoolwait-1.3.README"
@@ -25,6 +25,8 @@ BDEPEND="
 	>=x11-misc/imake-1.0.8-r1"
 
 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
 }