From bcbf8f108f4029f5ebce2ea5dc32248a0bb419f0 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 13 Sep 2022 18:20:39 +0100 Subject: [PATCH] net-misc/suite3270: flip back to USE=X font.eclass always adds USE=X, so we can't do USE=gui for now. Bug: https://bugs.gentoo.org/869986 Signed-off-by: Sam James --- ...2_p5.ebuild => suite3270-4.2_p5-r1.ebuild} | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) rename net-misc/suite3270/{suite3270-4.2_p5.ebuild => suite3270-4.2_p5-r1.ebuild} (85%) diff --git a/net-misc/suite3270/suite3270-4.2_p5.ebuild b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild similarity index 85% rename from net-misc/suite3270/suite3270-4.2_p5.ebuild rename to net-misc/suite3270/suite3270-4.2_p5-r1.ebuild index 2c53ea2486351..89288f125a7c0 100644 --- a/net-misc/suite3270/suite3270-4.2_p5.ebuild +++ b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild @@ -21,10 +21,10 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86" -IUSE="cjk doc gui ncurses ssl tcl" +IUSE="X cjk doc ncurses ssl tcl" RDEPEND=" - gui? ( + X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu @@ -39,10 +39,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - gui? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) " BDEPEND=" - gui? ( + X? ( app-text/rman x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0 @@ -84,23 +84,23 @@ src_configure() { --enable-pr3287 \ $(use_enable ncurses c3270) \ $(use_enable tcl tcl3270) \ - $(use_enable gui x3270) \ - $(use_with gui x) \ - $(use_with gui fontdir "${FONTDIR}") + $(use_enable X x3270) \ + $(use_with X x) \ + $(use_with X fontdir "${FONTDIR}") } src_install() { - use gui && dodir "${FONTDIR}" + use X && dodir "${FONTDIR}" emake DESTDIR="${D}" install{,.man} - use gui && font_src_install + use X && font_src_install } pkg_postinst() { - use gui && font_pkg_postinst + use X && font_pkg_postinst } pkg_postrm() { - use gui && font_pkg_postrm + use X && font_pkg_postrm }