Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses-compat/
Date: Fri, 14 May 2021 10:04:29
Message-Id: 1620986634.5191d574535aa6e3a826cc57296ccd04ec3454fe.soap@gentoo
1 commit: 5191d574535aa6e3a826cc57296ccd04ec3454fe
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 14 10:03:54 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri May 14 10:03:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5191d574
7
8 sys-libs/ncurses-compat: Remove old 6.1_p20190609
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sys-libs/ncurses-compat/Manifest | 2 -
14 .../ncurses-compat-6.1_p20190609.ebuild | 227 ---------------------
15 2 files changed, 229 deletions(-)
16
17 diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
18 index 70f7ded91f3..61cb703f5fe 100644
19 --- a/sys-libs/ncurses-compat/Manifest
20 +++ b/sys-libs/ncurses-compat/Manifest
21 @@ -1,3 +1 @@
22 -DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872
23 -DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
24 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
25
26 diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
27 deleted file mode 100644
28 index 0c319e1dadb..00000000000
29 --- a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
30 +++ /dev/null
31 @@ -1,227 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -# This version is just for the ABI .5 library
36 -
37 -EAPI=7
38 -
39 -inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
40 -
41 -MY_PV="${PV:0:3}"
42 -MY_P="${PN/-compat}-${MY_PV}"
43 -MY_PN="${PN/-compat}"
44 -
45 -DESCRIPTION="console display library (ABI version 5)"
46 -HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
47 -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
48 -
49 -if [[ "${PV}" == *_p* ]] ; then
50 - SRC_URI+=" ftp://ftp.invisible-island.net/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2
51 - https://invisible-mirror.net/archives/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2"
52 -fi
53 -
54 -LICENSE="MIT"
55 -# The subslot reflects the SONAME.
56 -SLOT="5/5"
57 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
58 -IUSE="gpm tinfo unicode"
59 -
60 -DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
61 -# Block the ncurses-5 that installs the same lib. #557472
62 -RDEPEND="${DEPEND}
63 - !<sys-libs/ncurses-6:0
64 - !sys-libs/ncurses:5"
65 -
66 -S="${WORKDIR}/${MY_P}"
67 -
68 -PATCHES=(
69 - "${FILESDIR}/ncurses-5.7-nongnu.patch"
70 - "${FILESDIR}/ncurses-6.0-rxvt-unicode-9.15.patch" #192083 #383871
71 - "${FILESDIR}/ncurses-6.0-pkg-config.patch"
72 - "${FILESDIR}/ncurses-5.9-gcc-5.patch" #545114
73 - "${FILESDIR}/ncurses-6.0-ticlib.patch" #557360
74 - "${FILESDIR}/ncurses-6.0-cppflags-cross.patch" #601426
75 -)
76 -
77 -src_prepare() {
78 - if [[ "${PV}" == *_p* ]] ; then
79 - eapply "${WORKDIR}/${MY_PN}-${PV/_p/-}-patch.sh"
80 - fi
81 - default
82 -}
83 -
84 -src_configure() {
85 - unset TERMINFO #115036
86 - tc-export_build_env BUILD_{CC,CPP}
87 - BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
88 -
89 - # Build the various variants of ncurses -- narrow, wide, and threaded. #510440
90 - # Order matters here -- we want unicode/thread versions to come last so that the
91 - # binaries in /usr/bin support both wide and narrow.
92 - # The naming is also important as we use these directly with filenames and when
93 - # checking configure flags.
94 - NCURSES_TARGETS=(
95 - ncurses
96 - $(usex unicode 'ncursesw' '')
97 - )
98 -
99 - # When installing ncurses, we have to use a compatible version of tic.
100 - # This comes up when cross-compiling, doing multilib builds, upgrading,
101 - # or installing for the first time. Build a local copy of tic whenever
102 - # the host version isn't available. #249363 #557598
103 - if ! has_version -b "~sys-libs/${P}:0" ; then
104 - local lbuildflags="-static"
105 -
106 - # some toolchains don't quite support static linking
107 - local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
108 - case ${CHOST} in
109 - *-darwin*) dbuildflags= ;;
110 - *-aix*) dbuildflags= ;;
111 - esac
112 - echo "int main() {}" | \
113 - $(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
114 - || lbuildflags="${dbuildflags}"
115 -
116 - # We can't re-use the multilib BUILD_DIR because we run outside of it.
117 - BUILD_DIR="${WORKDIR}" \
118 - CHOST=${CBUILD} \
119 - CFLAGS=${BUILD_CFLAGS} \
120 - CXXFLAGS=${BUILD_CXXFLAGS} \
121 - CPPFLAGS=${BUILD_CPPFLAGS} \
122 - LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
123 - do_configure cross --without-shared --with-normal
124 - fi
125 - multilib-minimal_src_configure
126 -}
127 -
128 -multilib_src_configure() {
129 - local t
130 - for t in "${NCURSES_TARGETS[@]}" ; do
131 - do_configure "${t}"
132 - done
133 -}
134 -
135 -do_configure() {
136 - local target=$1
137 - shift
138 -
139 - mkdir "${BUILD_DIR}/${target}" || die
140 - cd "${BUILD_DIR}/${target}" || die
141 -
142 - local conf=(
143 - # We need the basic terminfo files in /etc, bug #37026. We will
144 - # add '--with-terminfo-dirs' and then populate /etc/terminfo in
145 - # src_install() ...
146 - ##--with-rel-version=5.9 ??
147 - --with-abi-version=5
148 - --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
149 -
150 - # Now the rest of the various standard flags.
151 - --without-hashed-db
152 - --disable-pc-files
153 - --with-shared
154 - --without-hashed-db
155 - --without-ada
156 - --without-cxx
157 - --without-cxx-binding
158 - --without-debug
159 - --without-profile
160 - # The configure script uses ldd to parse the linked output which
161 - # is flaky for cross-compiling/multilib/ldd versions/etc...
162 - $(use_with gpm gpm libgpm.so.1)
163 - --disable-termcap
164 - --enable-symlinks
165 - --with-rcs-ids
166 - --with-manpage-format=normal
167 - --enable-const
168 - --enable-colorfgbg
169 - --enable-echo
170 - --disable-warnings
171 - --without-assertions
172 - --enable-leaks
173 - --without-expanded
174 - --with-macros
175 - --without-progs
176 - --without-tests
177 - --without-trace
178 - $(use_with tinfo termlib)
179 -
180 - # The chtype/mmask-t settings below are to retain ABI compat
181 - # with ncurses-5.4 so dont change em !
182 - --with-chtype=long
183 - --with-mmask-t=long
184 - --disable-ext-colors
185 - --disable-ext-mouse
186 - --without-{pthread,reentrant}
187 - )
188 -
189 - if [[ ${target} == ncurses*w ]] ; then
190 - conf+=( --enable-widec )
191 - else
192 - conf+=( --disable-widec )
193 - fi
194 - # Make sure each variant goes in a unique location.
195 - if [[ ${target} != "ncurses" ]] ; then
196 - conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
197 - fi
198 - # See comments in src_configure.
199 - if [[ ${target} != "cross" ]] ; then
200 - local cross_path="${WORKDIR}/cross"
201 - [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
202 - else
203 - conf+=( --with-progs )
204 - fi
205 -
206 - # Force bash until upstream rebuilds the configure script with a newer
207 - # version of autotools. #545532
208 - CONFIG_SHELL="${EPREFIX}"/bin/bash \
209 - ECONF_SOURCE="${S}" \
210 - econf "${conf[@]}" "$@"
211 -}
212 -
213 -src_compile() {
214 - # See comments in src_configure.
215 - if ! has_version -b "~sys-libs/${P}:0" ; then
216 - BUILD_DIR="${WORKDIR}" \
217 - do_compile cross -C progs tic
218 - fi
219 -
220 - multilib-minimal_src_compile
221 -}
222 -
223 -multilib_src_compile() {
224 - local t
225 - for t in "${NCURSES_TARGETS[@]}" ; do
226 - do_compile "${t}"
227 - done
228 -}
229 -
230 -do_compile() {
231 - local target=$1
232 - shift
233 -
234 - cd "${BUILD_DIR}/${target}" || die
235 -
236 - # A little hack to fix parallel builds ... they break when
237 - # generating sources so if we generate the sources first (in
238 - # non-parallel), we can then build the rest of the package
239 - # in parallel. This is not really a perf hit since the source
240 - # generation is quite small.
241 - emake -j1 sources
242 - # For some reason, sources depends on pc-files which depends on
243 - # compiled libraries which depends on sources which ...
244 - # Manually delete the pc-files file so the install step will
245 - # create the .pc files we want.
246 - rm -f misc/pc-files || die
247 - emake "$@"
248 -}
249 -
250 -multilib_src_install() {
251 - local target lib
252 - for target in "${NCURSES_TARGETS[@]}" ; do
253 - cd "${BUILD_DIR}/${target}/lib" || die
254 - for lib in *5.9 ; do
255 - newlib.so "${lib}" "${lib%%.9}"
256 - done
257 - done
258 -}