Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/lldb/
Date: Sun, 30 Dec 2018 11:40:22
Message-Id: 1546169990.c485fceeeac30928de0006520d752552afcbf237.mgorny@gentoo
1 commit: c485fceeeac30928de0006520d752552afcbf237
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 30 11:38:57 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 30 11:39:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c485fcee
7
8 dev-util/lldb: Drop versions prior to 7.0.1
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-util/lldb/Manifest | 4 --
13 dev-util/lldb/lldb-5.0.2.ebuild | 115 ---------------------------------------
14 dev-util/lldb/lldb-6.0.1.ebuild | 118 ----------------------------------------
15 3 files changed, 237 deletions(-)
16
17 diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
18 index 9a92f55424c..4402b1c5b6c 100644
19 --- a/dev-util/lldb/Manifest
20 +++ b/dev-util/lldb/Manifest
21 @@ -1,6 +1,2 @@
22 -DIST lldb-5.0.2.src.tar.xz 19220632 BLAKE2B 7ab97a4e96a2faf6593f5584a5455bc793a50a51370bd32d1595958e5fba9d121832675e6f31cb18a3b77b472eefa8040443b77af3e29c5aa455e2a0dcdb7cdc SHA512 66eaaead60cc908ac061bedb4fac9cb96cecb7f4e5a79a51b6fa080e8f61f718b14e5f3581ead832b495bf10f055d4253d199236a0947dd22395ec80bf2afcf4
23 -DIST lldb-6.0.1.src.tar.xz 19292420 BLAKE2B 9ec3304aa370781dcbc7c30e47f7becbd99b50f32d9eea36fefbf0e3608bdfe10796ecc14807ee17795de430409315a5dfad02db0fd3ec1a0ad51e9e240e4b40 SHA512 93ee2efea07276f8838bc2b3ff039cab8c7a1a6965647aaa4dee99f55c6465d5584ed3be87b144e2e32b5acc7db9cec56d89404de764a2f53643ed154d213721
24 DIST lldb-7.0.1.src.tar.xz 19384628 BLAKE2B 4720aa85afb90b84264f53736ca8a225bfc807cd84271f8be35a06437e718fb40a0f5090f213e203ffb746b254583f59e912d00300635e78f43aeb75a8dc4048 SHA512 7e98c3148ac34b42404e5aaaff91728d19e9062110a333f0bc7a62ec324fbb6d033ea44b56e144dc1e94febb2107cfb33c71bb3602c2168a6270dd807a2cc5ff
25 -DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
26 -DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
27 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
28
29 diff --git a/dev-util/lldb/lldb-5.0.2.ebuild b/dev-util/lldb/lldb-5.0.2.ebuild
30 deleted file mode 100644
31 index e3be91f0a81..00000000000
32 --- a/dev-util/lldb/lldb-5.0.2.ebuild
33 +++ /dev/null
34 @@ -1,115 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
41 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
42 -CMAKE_MIN_VERSION=3.7.0-r1
43 -PYTHON_COMPAT=( python2_7 )
44 -
45 -inherit cmake-utils llvm python-single-r1 toolchain-funcs
46 -
47 -MY_P=${P/_/}.src
48 -LLVM_P=llvm-${PV/_/}.src
49 -
50 -DESCRIPTION="The LLVM debugger"
51 -HOMEPAGE="https://llvm.org/"
52 -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
53 - test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
54 -
55 -LICENSE="UoI-NCSA"
56 -SLOT="0"
57 -KEYWORDS="~amd64 ~arm64 ~x86"
58 -IUSE="libedit ncurses python test"
59 -
60 -RDEPEND="
61 - libedit? ( dev-libs/libedit:0= )
62 - ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
63 - python? ( dev-python/six[${PYTHON_USEDEP}]
64 - ${PYTHON_DEPS} )
65 - ~sys-devel/clang-${PV}[xml]
66 - ~sys-devel/llvm-${PV}
67 - !<sys-devel/llvm-4.0"
68 -DEPEND="${RDEPEND}
69 - python? ( >=dev-lang/swig-3.0.11 )
70 - test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
71 - ${PYTHON_DEPS}"
72 -
73 -REQUIRED_USE=${PYTHON_REQUIRED_USE}
74 -
75 -S=${WORKDIR}/${MY_P}
76 -
77 -# least intrusive of all
78 -CMAKE_BUILD_TYPE=RelWithDebInfo
79 -
80 -pkg_setup() {
81 - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
82 - python-single-r1_pkg_setup
83 -}
84 -
85 -src_unpack() {
86 - einfo "Unpacking ${MY_P}.tar.xz ..."
87 - tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
88 -
89 - if use test; then
90 - einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
91 - tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
92 - "${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
93 - mv "${LLVM_P}" llvm || die
94 - fi
95 -}
96 -
97 -src_configure() {
98 - local mycmakeargs=(
99 - -DLLDB_DISABLE_CURSES=$(usex !ncurses)
100 - -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
101 - -DLLDB_DISABLE_PYTHON=$(usex !python)
102 - -DLLDB_USE_SYSTEM_SIX=1
103 - -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
104 -
105 - -DLLVM_BUILD_TESTS=$(usex test)
106 - # compilers for lit tests
107 - -DLLDB_TEST_C_COMPILER="$(type -P clang)"
108 - -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
109 - # compiler for ole' python tests
110 - -DLLDB_TEST_COMPILER="$(type -P clang)"
111 -
112 - # TODO: fix upstream to detect this properly
113 - -DHAVE_LIBDL=ON
114 - -DHAVE_LIBPTHREAD=ON
115 -
116 - # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
117 - # and TERMINFO_LIBS... so just force FindCurses.cmake to use
118 - # ncurses with complete library set (including autodetection
119 - # of -ltinfo)
120 - -DCURSES_NEED_NCURSES=ON
121 - )
122 - use test && mycmakeargs+=(
123 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
124 - -DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
125 - )
126 -
127 - cmake-utils_src_configure
128 -}
129 -
130 -src_test() {
131 - cmake-utils_src_make check-lldb-lit
132 - use python && cmake-utils_src_make check-lldb
133 -}
134 -
135 -src_install() {
136 - cmake-utils_src_install
137 -
138 - # oh my...
139 - if use python; then
140 - # remove custom readline.so for now
141 - # TODO: figure out how to deal with it
142 - # upstream is basically building a custom readline.so with -ledit
143 - # to avoid symbol collisions between readline and libedit...
144 - rm "${D}$(python_get_sitedir)/readline.so" || die
145 -
146 - # byte-compile the modules
147 - python_optimize
148 - fi
149 -}
150
151 diff --git a/dev-util/lldb/lldb-6.0.1.ebuild b/dev-util/lldb/lldb-6.0.1.ebuild
152 deleted file mode 100644
153 index 466d0ecf42e..00000000000
154 --- a/dev-util/lldb/lldb-6.0.1.ebuild
155 +++ /dev/null
156 @@ -1,118 +0,0 @@
157 -# Copyright 1999-2018 Gentoo Foundation
158 -# Distributed under the terms of the GNU General Public License v2
159 -
160 -EAPI=6
161 -
162 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
163 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
164 -CMAKE_MIN_VERSION=3.7.0-r1
165 -PYTHON_COMPAT=( python2_7 )
166 -
167 -inherit cmake-utils llvm multiprocessing python-single-r1 \
168 - toolchain-funcs
169 -
170 -MY_P=${P/_/}.src
171 -LLVM_P=llvm-${PV/_/}.src
172 -
173 -DESCRIPTION="The LLVM debugger"
174 -HOMEPAGE="https://llvm.org/"
175 -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
176 - test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
177 -
178 -LICENSE="UoI-NCSA"
179 -SLOT="0"
180 -KEYWORDS="~amd64 ~arm64 ~x86"
181 -IUSE="libedit ncurses python test"
182 -RESTRICT="!test? ( test )"
183 -
184 -RDEPEND="
185 - libedit? ( dev-libs/libedit:0= )
186 - ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
187 - python? ( dev-python/six[${PYTHON_USEDEP}]
188 - ${PYTHON_DEPS} )
189 - ~sys-devel/clang-${PV}[xml]
190 - ~sys-devel/llvm-${PV}
191 - !<sys-devel/llvm-4.0"
192 -DEPEND="${RDEPEND}
193 - python? ( >=dev-lang/swig-3.0.11 )
194 - test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
195 - ${PYTHON_DEPS}"
196 -
197 -REQUIRED_USE=${PYTHON_REQUIRED_USE}
198 -
199 -S=${WORKDIR}/${MY_P}
200 -
201 -# least intrusive of all
202 -CMAKE_BUILD_TYPE=RelWithDebInfo
203 -
204 -pkg_setup() {
205 - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
206 - python-single-r1_pkg_setup
207 -}
208 -
209 -src_unpack() {
210 - einfo "Unpacking ${MY_P}.tar.xz ..."
211 - tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
212 -
213 - if use test; then
214 - einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
215 - tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
216 - "${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
217 - mv "${LLVM_P}" llvm || die
218 - fi
219 -}
220 -
221 -src_configure() {
222 - local mycmakeargs=(
223 - -DLLDB_DISABLE_CURSES=$(usex !ncurses)
224 - -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
225 - -DLLDB_DISABLE_PYTHON=$(usex !python)
226 - -DLLDB_USE_SYSTEM_SIX=1
227 - -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
228 -
229 - -DLLDB_INCLUDE_TESTS=$(usex test)
230 -
231 - # TODO: fix upstream to detect this properly
232 - -DHAVE_LIBDL=ON
233 - -DHAVE_LIBPTHREAD=ON
234 -
235 - # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
236 - # and TERMINFO_LIBS... so just force FindCurses.cmake to use
237 - # ncurses with complete library set (including autodetection
238 - # of -ltinfo)
239 - -DCURSES_NEED_NCURSES=ON
240 - )
241 - use test && mycmakeargs+=(
242 - -DLLVM_BUILD_TESTS=$(usex test)
243 - # compilers for lit tests
244 - -DLLDB_TEST_C_COMPILER="$(type -P clang)"
245 - -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
246 -
247 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
248 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
249 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
250 - )
251 -
252 - cmake-utils_src_configure
253 -}
254 -
255 -src_test() {
256 - cmake-utils_src_make check-lldb-lit
257 - use python && cmake-utils_src_make check-lldb
258 -}
259 -
260 -src_install() {
261 - cmake-utils_src_install
262 -
263 - # oh my...
264 - if use python; then
265 - # remove custom readline.so for now
266 - # TODO: figure out how to deal with it
267 - # upstream is basically building a custom readline.so with -ledit
268 - # to avoid symbol collisions between readline and libedit...
269 - rm "${D}$(python_get_sitedir)/readline.so" || die
270 -
271 - # byte-compile the modules
272 - python_optimize
273 - fi
274 -}