Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/suite3270/
Date: Tue, 13 Sep 2022 17:21:20
Message-Id: 1663089639.bcbf8f108f4029f5ebce2ea5dc32248a0bb419f0.sam@gentoo
1 commit: bcbf8f108f4029f5ebce2ea5dc32248a0bb419f0
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 13 17:20:39 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 13 17:20:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbf8f10
7
8 net-misc/suite3270: flip back to USE=X
9
10 font.eclass always adds USE=X, so we can't do USE=gui for now.
11
12 Bug: https://bugs.gentoo.org/869986
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 ...70-4.2_p5.ebuild => suite3270-4.2_p5-r1.ebuild} | 22 +++++++++++-----------
16 1 file changed, 11 insertions(+), 11 deletions(-)
17
18 diff --git a/net-misc/suite3270/suite3270-4.2_p5.ebuild b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild
19 similarity index 85%
20 rename from net-misc/suite3270/suite3270-4.2_p5.ebuild
21 rename to net-misc/suite3270/suite3270-4.2_p5-r1.ebuild
22 index 2c53ea248635..89288f125a7c 100644
23 --- a/net-misc/suite3270/suite3270-4.2_p5.ebuild
24 +++ b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild
25 @@ -21,10 +21,10 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
26 LICENSE="GPL-2"
27 SLOT="0"
28 KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
29 -IUSE="cjk doc gui ncurses ssl tcl"
30 +IUSE="X cjk doc ncurses ssl tcl"
31
32 RDEPEND="
33 - gui? (
34 + X? (
35 x11-libs/libX11
36 x11-libs/libXaw
37 x11-libs/libXmu
38 @@ -39,10 +39,10 @@ RDEPEND="
39 "
40 DEPEND="
41 ${RDEPEND}
42 - gui? ( x11-base/xorg-proto )
43 + X? ( x11-base/xorg-proto )
44 "
45 BDEPEND="
46 - gui? (
47 + X? (
48 app-text/rman
49 x11-apps/bdftopcf
50 >=x11-apps/mkfontscale-1.2.0
51 @@ -84,23 +84,23 @@ src_configure() {
52 --enable-pr3287 \
53 $(use_enable ncurses c3270) \
54 $(use_enable tcl tcl3270) \
55 - $(use_enable gui x3270) \
56 - $(use_with gui x) \
57 - $(use_with gui fontdir "${FONTDIR}")
58 + $(use_enable X x3270) \
59 + $(use_with X x) \
60 + $(use_with X fontdir "${FONTDIR}")
61 }
62
63 src_install() {
64 - use gui && dodir "${FONTDIR}"
65 + use X && dodir "${FONTDIR}"
66
67 emake DESTDIR="${D}" install{,.man}
68
69 - use gui && font_src_install
70 + use X && font_src_install
71 }
72
73 pkg_postinst() {
74 - use gui && font_pkg_postinst
75 + use X && font_pkg_postinst
76 }
77
78 pkg_postrm() {
79 - use gui && font_pkg_postrm
80 + use X && font_pkg_postrm
81 }