Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
Date: Tue, 09 Apr 2019 05:53:55
Message-Id: 1554789174.d8cb521bf96ae2ecab9c1f11a108d5429f5e3030.graaff@gentoo
1 commit: d8cb521bf96ae2ecab9c1f11a108d5429f5e3030
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 16 18:34:02 2019 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 9 05:52:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8cb521b
7
8 dev-libs/Ice: cleanup of ruby23-only version
9
10 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 357 ---------------------------------------
14 dev-libs/Ice/Manifest | 2 -
15 2 files changed, 359 deletions(-)
16
17 diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
18 deleted file mode 100644
19 index 33984c1d811..00000000000
20 --- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
21 +++ /dev/null
22 @@ -1,357 +0,0 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=5
27 -
28 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
29 -
30 -RUBY_OPTIONAL="yes"
31 -USE_RUBY="ruby23"
32 -
33 -PHP_EXT_NAME="IcePHP"
34 -PHP_EXT_INI="yes"
35 -PHP_EXT_ZENDEXT="no"
36 -
37 -PHP_EXT_OPTIONAL_USE=php
38 -
39 -USE_PHP="php7-0"
40 -
41 -# This variable does not belong to any eclass. It is solely used in this ebuild
42 -# db:6.2 breaks the build process
43 -BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
44 -
45 -inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
46 -
47 -DESCRIPTION="ICE middleware C++ library and generator tools"
48 -HOMEPAGE="https://zeroc.com/products/ice"
49 -SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
50 - doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
51 -LICENSE="GPL-2"
52 -SLOT="0/36"
53 -KEYWORDS="amd64 ~arm x86"
54 -IUSE="doc examples libressl +ncurses mono php python ruby test debug"
55 -RESTRICT="test"
56 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
57 -
58 -RDEPEND=">=dev-libs/expat-2.0.1
59 - >=app-arch/bzip2-1.0.5
60 - !libressl? ( dev-libs/openssl:0= )
61 - libressl? ( dev-libs/libressl:0= )
62 - || (
63 - $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
64 - )
65 - dev-cpp/libmcpp
66 - python? ( ${PYTHON_DEPS} )
67 - ruby? ( $(ruby_implementation_depend ruby23) )
68 - mono? ( dev-lang/mono )
69 - php? ( dev-lang/php:7.0 )
70 - !dev-python/IcePy
71 - !dev-ruby/IceRuby"
72 -DEPEND="${RDEPEND}
73 - ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
74 - test? (
75 - ${PYTHON_DEPS}
76 - dev-python/passlib[${PYTHON_USEDEP}]
77 - )"
78 -
79 -# Maintainer notes:
80 -# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
81 -
82 -S="${WORKDIR}/${P/I/i}"
83 -PHP_EXT_S="${S}/php"
84 -
85 -PATCHES=(
86 - "${FILESDIR}/${P}-no-arch-opts.patch"
87 - "${FILESDIR}/${P}-csharp.patch"
88 - "${FILESDIR}/${P}-libressl.patch"
89 -)
90 -
91 -pkg_setup() {
92 - # prevent ruby-ng.eclass from messing with pkg_setup
93 - return
94 -}
95 -
96 -src_unpack() {
97 - # prevent ruby-ng.eclass from messing with src_unpack
98 - default
99 -}
100 -
101 -src_prepare() {
102 - epatch -p1 "${PATCHES[@]}"
103 -
104 - sed -i \
105 - -e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
106 - -e 's|-L\$\(libdir\)||' \
107 - cpp/config/Make.rules || die "sed failed"
108 -
109 - sed -i \
110 - -e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
111 - -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
112 - php/config/Make.rules.php || die "sed failed"
113 -
114 - sed -i \
115 - -e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
116 - -e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
117 - -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
118 - {python,ruby}/config/Make.rules || die "sed failed"
119 -
120 - sed -i \
121 - -e 's|-O2 ||g' \
122 - -e 's|-Werror ||g' \
123 - cpp/config/Make.rules.Linux || die "sed failed"
124 -
125 - sed -i \
126 - -e 's|install-common||' \
127 - {cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
128 -
129 - sed -i \
130 - -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
131 - -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
132 - -e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
133 - csharp/config/Make.rules.cs || die "sed failed"
134 -
135 - # skip mono tests, bug #498484
136 - sed -i \
137 - -e '/SUBDIRS/s|\ test||' \
138 - csharp/Makefile || die "sed failed"
139 -
140 - # skip udp test due to multicast
141 - # skip IceGrid/admin bug #649850
142 - # skip IceSSL tests due to requirement of internet connection
143 - # skip IceStorm/single bug #636834
144 - # IceStorm/stress fails without USE=debug
145 - # IceUtil/stacktrace fails with USE=debug
146 - sed -i \
147 - -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
148 - cpp/Makefile || die "sed failed"
149 -
150 - # mainly broken .ice files
151 - sed -i \
152 - -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
153 - python/Makefile || die "sed failed"
154 -
155 - # fails even on unicode locale
156 - sed -i \
157 - -e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
158 - ruby/Makefile || die "sed failed"
159 -
160 - # fix for x86 IceBox test
161 - sed -i \
162 - -e 's|"32"|""|' \
163 - scripts/TestUtil.py || die "sed failed"
164 -}
165 -
166 -src_configure() {
167 - suitable_db_version() {
168 - local ver
169 - for ver in "${BERKDB_SLOTS[@]}"; do
170 - if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
171 - echo "${ver}"
172 - return 0
173 - fi
174 - done
175 - die "No suitable BerkDB versions found, aborting"
176 - }
177 -
178 - MAKE_RULES=(
179 - "prefix=\"${ED%/}/usr\""
180 - "install_docdir=\"${ED%/}/usr/share/doc/${PF}\""
181 - "install_configdir=\"${ED%/}/usr/share/${P}/config\""
182 - "install_mandir=\"${ED%/}/usr/share/man\""
183 - "embedded_runpath_prefix=\"${EPREFIX}/usr\""
184 - "LP64=yes"
185 - "new_dtags=yes"
186 - "NOTEST=$(usex !test)"
187 - "USE_READLINE=$(usex ncurses)"
188 - "OPTIMIZE=$(usex !debug)"
189 - )
190 -
191 - local BERKDB_VERSION="$(suitable_db_version)"
192 - MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
193 - sed -i \
194 - -e "s|g++|$(tc-getCXX)|" \
195 - -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
196 - -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
197 - -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
198 - -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
199 - cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
200 -
201 - if use python; then
202 - local S="${S}/python"
203 - python_copy_sources
204 - fi
205 -
206 - if use ruby; then
207 - SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
208 - MAKE_RULES_RUBY=(
209 - "install_rubydir=\"${ED%/}/${SITERUBY}\""
210 - "install_libdir=\"${ED%/}/${SITERUBY}\""
211 - )
212 -
213 - # make it use ruby23 only
214 - sed -i \
215 - -e 's|RUBY = ruby|\023|' \
216 - ruby/config/Make.rules || die "sed failed"
217 - sed -i \
218 - -e 's|env ruby|\023|' \
219 - ruby/config/s2rb.rb || die "sed failed"
220 - sed -i \
221 - -e 's|env ruby|\023|' \
222 - ruby/scripts/slice2rb || die "sed failed"
223 - sed -i \
224 - -e 's|output.write("ruby|\023|' \
225 - scripts/TestUtil.py || die "sed failed"
226 - fi
227 -
228 - MAKE_RULES_MONO=(
229 - "GACINSTALL=yes"
230 - "GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\""
231 - "GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
232 - "install_libdir=\"${ED%/}/usr/$(get_libdir)\""
233 - "install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\""
234 - )
235 -
236 - if has_version ">dev-lang/mono-4"; then
237 - MAKE_RULES_MONO+=("MCS=mcs")
238 - fi
239 -
240 - use test && python_setup
241 -}
242 -
243 -src_compile() {
244 - # Do not remove this export or build will break!
245 - tc-export CXX
246 -
247 - emake -C cpp "${MAKE_RULES[@]}"
248 -
249 - if use php; then
250 - local i
251 - for i in $(php_get_slots); do
252 - mkdir -p "${WORKDIR}/${i}" || die
253 - cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
254 -
255 - pushd "${WORKDIR}/${i}" >/dev/null || die
256 - ln -s "${S}/cpp" || die
257 - ln -s "${S}/config" || die
258 - ln -s "${S}/slice" || die
259 - ln -s "${S}/Makefile" || die
260 -
261 - emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
262 - popd >/dev/null || die
263 - done
264 - fi
265 -
266 - if use python; then
267 - building() {
268 - emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
269 - }
270 - local S="${S}/python"
271 - python_foreach_impl building
272 - fi
273 -
274 - if use ruby; then
275 - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
276 - fi
277 -
278 - if use mono; then
279 - emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
280 - fi
281 -}
282 -
283 -src_test() {
284 - local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
285 - emake -C cpp "${MAKE_RULES[@]}" test
286 -
287 - # php tests require the extension loaded and are therefore skipped
288 -
289 - if use python; then
290 - testing() {
291 - emake -C "${BUILD_DIR}" \
292 - "${MAKE_RULES[@]}" \
293 - PYTHON="${EPYTHON}" \
294 - install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
295 - install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
296 - }
297 - local S="${S}/python"
298 - python_foreach_impl testing
299 - fi
300 -
301 - if use ruby; then
302 - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
303 - fi
304 -
305 - if use mono; then
306 - # skip mono tests, bug #498484
307 - ewarn "Tests for C# are currently disabled."
308 - #emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
309 - fi
310 -}
311 -
312 -src_install() {
313 - local DOCS=( CHANGELOG*.md README.md )
314 - use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
315 - einstalldocs
316 -
317 - insinto /usr/share/${P}
318 - doins -r slice
319 -
320 - emake -C cpp "${MAKE_RULES[@]}" install
321 -
322 - if use examples; then
323 - docinto examples-cpp
324 - dodoc cpp/config/*.cfg
325 - docompress -x /usr/share/doc/${PF}/examples-cpp
326 - fi
327 -
328 - if use php; then
329 - insinto "/usr/share/php/${PN}"
330 -
331 - local i
332 - while IFS="" read -d $'\0' -r i; do
333 - doins "${i}"
334 - done < <(find "${S}/php/lib/" -name '*.php' -print0)
335 -
336 - pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
337 -
338 - local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
339 - for i in *; do
340 - mkdir -p "${ED%/}/usr/share/php/${i}" || die
341 - "${ED%/}"/usr/bin/slice2php \
342 - -I"${ED%/}/usr/share/${P}/slice/" --all \
343 - --output-dir "${ED%/}/usr/share/php/${i}" \
344 - --ice "${ED%/}/usr/share/${P}/slice/${i}"/*
345 - done
346 -
347 - for i in $(php_get_slots); do
348 - php_init_slot_env "${i}"
349 - insinto "${EXT_DIR}"
350 - newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
351 - done
352 - php-ext-source-r2_createinifiles
353 -
354 - popd >/dev/null || die
355 - fi
356 -
357 - if use python; then
358 - installation() {
359 - mkdir -p "${D%/}/$(python_get_sitedir)" || die
360 -
361 - emake -C "${BUILD_DIR}" \
362 - "${MAKE_RULES[@]}" \
363 - install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
364 - install_libdir="\"${D%/}/$(python_get_sitedir)\"" \
365 - install
366 - }
367 - local S="${S}/python"
368 - python_foreach_impl installation
369 - fi
370 -
371 - if use ruby; then
372 - dodir "${SITERUBY}"
373 - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
374 - fi
375 -
376 - if use mono; then
377 - emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
378 - fi
379 -}
380
381 diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
382 index 918af29c33d..2f01fc407b0 100644
383 --- a/dev-libs/Ice/Manifest
384 +++ b/dev-libs/Ice/Manifest
385 @@ -1,4 +1,2 @@
386 -DIST Ice-3.6.3.pdf 8844957 BLAKE2B 137e3ce85885305931cbbb2c838ccc52175dffb7ad51264837b2db77eea05987ebecc5e3678e2f589bef1cc94c133f0f298ecce23031fcf2654621921c2bd541 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a
387 -DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bba79a53be468b5e38ddbc81895ef078ba31c98d90ac9ccdd9e17123f4a7ab590fa354c28f6d82f09bf0301d SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45
388 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
389 DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57