Сравнение suite3270-4.0_p13 с suite3270-4.2_p5-r1

/usr/portage/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild 2023-10-09 14:52:34.708368482 +0300
1
# Copyright 1999-2021 Gentoo Authors
1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI="7"
4
EAPI=8
5 5

  
6 6
MY_PV=${PV/_p/ga}
7 7
MY_P=${PN}-${MY_PV}
8 8
SUB_PV=${PV:0:3}
9
S="${WORKDIR}"/${PN}-${SUB_PV}
9 10

  
10
S=${WORKDIR}/${PN}-${SUB_PV}
11

  
12
# only the x3270 package installs fonts
11
# Only the x3270 package installs fonts
13 12
FONT_PN="x3270"
14
FONT_S="${S}/${FONT_PN}"
13
FONT_S="${S}"/${FONT_PN}
15 14

  
16
inherit font
15
inherit autotools font
17 16

  
18
DESCRIPTION="Complete 3270 access package"
17
DESCRIPTION="Complete 3270 (S390) access package"
19 18
HOMEPAGE="http://x3270.bgp.nu/"
20 19
SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
21 20

  
22 21
LICENSE="GPL-2"
23 22
SLOT="0"
24 23
KEYWORDS="amd64 ppc ~s390 sparc x86"
25
IUSE="cjk doc ncurses ssl tcl X"
24
IUSE="X cjk doc ncurses ssl tcl"
26 25

  
27
RDEPEND="ssl? ( dev-libs/openssl:0= )
26
RDEPEND="
28 27
	X? (
29 28
		x11-libs/libX11
30 29
		x11-libs/libXaw
31 30
		x11-libs/libXmu
32 31
		x11-libs/libXt
33 32
	)
33
	ssl? ( dev-libs/openssl:= )
34 34
	ncurses? (
35 35
		sys-libs/ncurses:=
36
		sys-libs/readline:0=
36
		sys-libs/readline:=
37 37
	)
38
	tcl? ( dev-lang/tcl:0 )"
39
DEPEND="${RDEPEND}
38
	tcl? ( dev-lang/tcl:= )
39
"
40
DEPEND="
41
	${RDEPEND}
42
	X? ( x11-base/xorg-proto )
43
"
44
BDEPEND="
40 45
	X? (
41
		x11-base/xorg-proto
42
		x11-misc/xbitmaps
43 46
		app-text/rman
44
		>=x11-apps/mkfontscale-1.2.0
45 47
		x11-apps/bdftopcf
46
	)"
48
		>=x11-apps/mkfontscale-1.2.0
49
		x11-misc/xbitmaps
50
	)
51
"
47 52

  
48
suite3270_makelist() {
49
	echo pr3287 s3270 \
50
		$(usex ncurses c3270 '') \
51
		$(usex tcl tcl3270 '') \
52
		$(usex X x3270 '')
53
}
53
PATCHES=(
54
	"${FILESDIR}"/${PN}-4.1-musl-wint-t-fix.patch
55
	"${FILESDIR}"/${PN}-4.2_p5-ncurses-pkg-config.patch
56
	"${FILESDIR}"/${PN}-4.2_p5-egrep.patch
57
)
54 58

  
55 59
src_prepare() {
56 60
	default
......
65 69
	done
66 70
	exit 1
67 71
	EOF
68
	chmod a+rx _install
69
	# Can't use the $INSTALL var as top level configure also uses it.
72
	chmod a+rx _install || die
73
	# Can't use the ${INSTALL} var as top level configure also uses it.
70 74
	# https://sourceforge.net/p/x3270/bugs/15/
71
	export ac_cv_path_install="${S}/_install"
75
	export ac_cv_path_install="${S}"/_install
76

  
77
	AT_NOEAUTOHEADER=yes eautoreconf
72 78
}
73 79

  
74 80
src_configure() {
......
85 91

  
86 92
src_install() {
87 93
	use X && dodir "${FONTDIR}"
88
	emake DESTDIR="${D}" install{,.man}
89 94

  
90
	local p
91
	for p in $(suite3270_makelist) ; do
92
		cd "${S}/${p}"
93
		docinto ${p}
94
		dodoc README*
95
		use doc && dodoc -r html
96
	done
95
	emake DESTDIR="${D}" install{,.man}
97 96

  
98 97
	use X && font_src_install
99 98
}
100 99

  
101
pkg_postinst() { use X && font_pkg_postinst ; }
102
pkg_postrm() { use X && font_pkg_postrm ; }
100
pkg_postinst() {
101
	use X && font_pkg_postinst
102
}
103

  
104
pkg_postrm() {
105
	use X && font_pkg_postrm
106
}
Спасибо!