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: sci-physics/cernlib/, profiles/features/hardened/amd64/, profiles/, ...
Date: Mon, 01 Feb 2021 09:50:34
Message-Id: 1612173015.ccaada423632808c85f34556aabf72bb6dc678b0.mgorny@gentoo
1 commit: ccaada423632808c85f34556aabf72bb6dc678b0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 1 09:49:48 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 1 09:50:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccaada42
7
8 sci-physics/cernlib: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/763183
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/features/hardened/amd64/package.mask | 8 --
14 profiles/package.mask | 6 --
15 sci-physics/cernlib/Manifest | 3 -
16 sci-physics/cernlib/cernlib-2006-r5.ebuild | 107 --------------------
17 sci-physics/cernlib/cernlib-2006-r7.ebuild | 108 ---------------------
18 sci-physics/cernlib/files/cernlib-2006-fgets.patch | 20 ----
19 .../cernlib/files/cernlib-2006-nogfortran.patch | 56 -----------
20 .../files/cernlib-2006-ypatchy-short-name.patch | 11 ---
21 sci-physics/cernlib/metadata.xml | 17 ----
22 9 files changed, 336 deletions(-)
23
24 diff --git a/profiles/features/hardened/amd64/package.mask b/profiles/features/hardened/amd64/package.mask
25 deleted file mode 100644
26 index 71ff07525b4..00000000000
27 --- a/profiles/features/hardened/amd64/package.mask
28 +++ /dev/null
29 @@ -1,8 +0,0 @@
30 -# Copyright 1999-2021 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -# Cernlib has address space issues on amd64 and package is no
34 -# longer supported by upstream. Thus masking it and its reverse
35 -# dependencies.
36 -# See bug 426764.
37 -sci-physics/cernlib
38
39 diff --git a/profiles/package.mask b/profiles/package.mask
40 index 0ca98bc936d..763e8a8179b 100644
41 --- a/profiles/package.mask
42 +++ b/profiles/package.mask
43 @@ -198,12 +198,6 @@ app-crypt/acme-client
44 # Removal in 30 days, bug #444470
45 dev-libs/ilbc-rfc3951
46
47 -# Jakov Smolic <jakov.smolic@×××××××.hr> (2021-01-02)
48 -# sci-physics/cernlib fails to build with gcc-10, last release in 2006,
49 -# multiple open bugs, all revdeps also broken and declared EOL upstream.
50 -# Removal in 30 days, bug #763183
51 -sci-physics/cernlib
52 -
53 # Sam James <sam@g.o> (2021-01-01)
54 # UnrealIRCd 4.x is EOL. Please upgrade to 5.x.
55 # To be removed shortly.
56
57 diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
58 deleted file mode 100644
59 index 89f9e4e42ac..00000000000
60 --- a/sci-physics/cernlib/Manifest
61 +++ /dev/null
62 @@ -1,3 +0,0 @@
63 -DIST cernlib_20061220+dfsg3-2.debian.tar.gz 257093 BLAKE2B 35ae90e38ddb935f252531cdf49dc038cdb7543b9168076f97458323a2458938cfa2f1768165d4cc59649021e2b268139dd53b3ef09d2a6601e1f68792c69af1 SHA512 43a2ca55d42b92bfb551b029c75728e80b4c83473397b52f746d9481c7503762bc5a281732908bfeb29a64f728fed4c127ed1cb9101c16e4fb2dd28c452730ea
64 -DIST cernlib_20061220+dfsg3-4.3.debian.tar.xz 168928 BLAKE2B 15147d1d84d3e4abb06620154425a035e64d6e5254177f9647634fdf63e4a5aa42deba6c8f638f338cf85e8766732388cc6298813dd5b007d1ef97fddcef3d39 SHA512 8cb666d9ef62627e7e3e55bd1986b40ca9ddfcc882101b1a3597c1d60870e30649b5c7716687f7e4106b30ba0aa88a9ca7bc3a3651b0d1405f55a6f611dc308b
65 -DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 BLAKE2B 069eda316ffbc4873e79952283a0aa2693ed58a3cc369bca72e29a4feaef4840922b4f62ababba1476f2aa0309f68833a4a35a3b5c6ac015bdbd85b3b58b2efe SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8
66
67 diff --git a/sci-physics/cernlib/cernlib-2006-r5.ebuild b/sci-physics/cernlib/cernlib-2006-r5.ebuild
68 deleted file mode 100644
69 index 0e409ed6a6c..00000000000
70 --- a/sci-physics/cernlib/cernlib-2006-r5.ebuild
71 +++ /dev/null
72 @@ -1,107 +0,0 @@
73 -# Copyright 1999-2015 Gentoo Foundation
74 -# Distributed under the terms of the GNU General Public License v2
75 -
76 -EAPI=5
77 -
78 -inherit eutils fortran-2 multilib toolchain-funcs
79 -
80 -DEB_PN=cernlib
81 -DEB_PV=20061220+dfsg3
82 -DEB_PR=2
83 -DEB_P=${DEB_PN}_${DEB_PV}
84 -
85 -DESCRIPTION="CERN program library for High Energy Physics"
86 -HOMEPAGE="https://cernlib.web.cern.ch/cernlib/"
87 -SRC_URI="
88 - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
89 - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.debian.tar.gz"
90 -
91 -SLOT="0"
92 -LICENSE="GPL-2 LGPL-2 BSD"
93 -KEYWORDS="amd64 ~hppa sparc x86 ~amd64-linux ~x86-linux"
94 -IUSE=""
95 -
96 -RDEPEND="
97 - x11-libs/motif:0
98 - virtual/lapack
99 - dev-lang/cfortran"
100 -DEPEND="${RDEPEND}
101 - x11-misc/imake
102 - x11-misc/makedepend
103 - virtual/pkgconfig"
104 -
105 -S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
106 -
107 -src_prepare() {
108 - mv ../debian . || die
109 - epatch "${FILESDIR}"/${P}-nogfortran.patch
110 - # set some default paths
111 - sed -i \
112 - -e "s:/usr/local:${EROOT}/usr:g" \
113 - -e "s:prefix)/lib:prefix)/$(get_libdir):" \
114 - -e "s:\$(prefix)/etc:${EROOT}/etc:" \
115 - -e 's:$(prefix)/man:$(prefix)/share/man:' \
116 - debian/add-ons/cernlib.mk || die "sed failed"
117 -
118 - # use system blas and lapack set by gentoo framework
119 - sed -i \
120 - -e "s:\$DEPS -lm:$($(tc-getPKG_CONFIG) --libs blas):" \
121 - -e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \
122 - -e 's:`depend $d $a blas`::' \
123 - -e 's:X11R6:X11:g' \
124 - debian/add-ons/bin/cernlib.in || die "sed failed"
125 -
126 - cp debian/add-ons/Makefile .
127 - export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
128 -
129 - einfo "Applying Debian patches"
130 - emake -j1 patch
131 -
132 - epatch "${FILESDIR}"/${P}-fgets.patch
133 - epatch "${FILESDIR}"/${P}-ypatchy-short-name.patch
134 - # since we depend on cfortran, do not use the one from cernlib
135 - rm src/include/cfortran/cfortran.h || die
136 -
137 - # respect users flags
138 - sed -i \
139 - -e 's/-O3/-O2/g' \
140 - -e "s/-O2/${CFLAGS}/g" \
141 - -e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \
142 - -e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \
143 - -e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \
144 - src/config/linux.cf \
145 - || die "sed linux.cf failed"
146 - sed -i \
147 - -e "s|\(ArCmdBase[[:space:]]*\)ar|\1$(tc-getAR)|g" \
148 - -e "s|\(RanlibCmd[[:space:]]*\)ranlib|\1$(tc-getRANLIB)|g" \
149 - src/config/Imake.tmpl \
150 - || die "sed Imake.tmpl failed"
151 -
152 - sed -i \
153 - -e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
154 - -e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
155 - src/config/{biglib,fortran,Imake}.rules \
156 - src/patchy/Imakefile \
157 - || die "sed for ldflags propagation failed"
158 -
159 - # add missing headers for implicit
160 - sed -i \
161 - -e '0,/^#include/i#include <stdlib.h>' \
162 - src/kernlib/kerngen/ccgen*/*.c || die
163 -}
164 -
165 -src_compile() {
166 - # parallel make breaks and complex patched imake system, hard to debug
167 - emake -j1 cernlib-indep cernlib-arch
168 -}
169 -
170 -src_test() {
171 - LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test
172 -}
173 -
174 -src_install() {
175 - default
176 - cd debian
177 - dodoc changelog README.* deadpool.txt NEWS copyright
178 - newdoc add-ons/README README.add-ons
179 -}
180
181 diff --git a/sci-physics/cernlib/cernlib-2006-r7.ebuild b/sci-physics/cernlib/cernlib-2006-r7.ebuild
182 deleted file mode 100644
183 index 216c3fda914..00000000000
184 --- a/sci-physics/cernlib/cernlib-2006-r7.ebuild
185 +++ /dev/null
186 @@ -1,108 +0,0 @@
187 -# Copyright 1999-2019 Gentoo Authors
188 -# Distributed under the terms of the GNU General Public License v2
189 -
190 -EAPI=5
191 -
192 -inherit eutils fortran-2 multilib toolchain-funcs
193 -
194 -DEB_PN=cernlib
195 -DEB_PV=20061220+dfsg3
196 -DEB_PR=4.3
197 -DEB_P=${DEB_PN}_${DEB_PV}
198 -
199 -DESCRIPTION="CERN program library for High Energy Physics"
200 -HOMEPAGE="https://cernlib.web.cern.ch/cernlib/"
201 -SRC_URI="
202 - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
203 - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.debian.tar.xz"
204 -
205 -SLOT="0"
206 -LICENSE="GPL-2 LGPL-2 BSD"
207 -KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
208 -
209 -RDEPEND="
210 - x11-libs/motif:0
211 - virtual/lapack
212 - dev-lang/cfortran
213 - net-libs/libnsl"
214 -DEPEND="${RDEPEND}
215 - x11-misc/imake
216 - x11-misc/makedepend
217 - virtual/pkgconfig"
218 -
219 -S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
220 -
221 -src_prepare() {
222 - mv ../debian . || die
223 - epatch "${FILESDIR}"/${P}-nogfortran.patch
224 - # set some default paths
225 - sed -i \
226 - -e "s:/usr/local:${EROOT}/usr:g" \
227 - -e "s:prefix)/lib/\$(DEB_HOST_MULTIARCH):prefix)/$(get_libdir):" \
228 - -e "s:\$(prefix)/etc:${EROOT}/etc:" \
229 - -e 's:$(prefix)/man:$(prefix)/share/man:' \
230 - debian/add-ons/cernlib.mk || die "sed failed"
231 -
232 - # use system blas and lapack set by gentoo framework
233 - sed -i \
234 - -e "s:\$DEPS -lm:$($(tc-getPKG_CONFIG) --libs blas):" \
235 - -e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \
236 - -e 's:`depend $d $a blas`::' \
237 - -e 's:X11R6:X11:g' \
238 - -e 's: /[^ ]*`dpkg-arch.*`::' \
239 - debian/add-ons/bin/cernlib.in || die "sed failed"
240 -
241 - cp debian/add-ons/Makefile .
242 - export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
243 -
244 - einfo "Applying Debian patches"
245 - emake -j1 patch
246 -
247 - epatch "${FILESDIR}"/${P}-fgets.patch
248 - epatch "${FILESDIR}"/${P}-ypatchy-short-name.patch
249 - # since we depend on cfortran, do not use the one from cernlib
250 - rm src/include/cfortran/cfortran.h || die
251 -
252 - # respect users flags
253 - sed -i \
254 - -e 's/-O3/-O2/g' \
255 - -e "s/-O2/${CFLAGS}/g" \
256 - -e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \
257 - -e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \
258 - -e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \
259 - src/config/linux.cf \
260 - || die "sed linux.cf failed"
261 - sed -i \
262 - -e "s|\(ArCmdBase[[:space:]]*\)ar|\1$(tc-getAR)|g" \
263 - -e "s|\(RanlibCmd[[:space:]]*\)ranlib|\1$(tc-getRANLIB)|g" \
264 - src/config/Imake.tmpl \
265 - || die "sed Imake.tmpl failed"
266 -
267 - sed -i \
268 - -e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
269 - -e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
270 - src/config/{biglib,fortran,Imake}.rules \
271 - src/patchy/Imakefile \
272 - || die "sed for ldflags propagation failed"
273 -
274 - # add missing headers for implicit
275 - sed -i \
276 - -e '0,/^#include/i#include <stdlib.h>' \
277 - src/kernlib/kerngen/ccgen*/*.c || die
278 -}
279 -
280 -src_compile() {
281 - # parallel make breaks and complex patched imake system, hard to debug
282 - emake -j1 cernlib-indep cernlib-arch
283 -}
284 -
285 -src_test() {
286 - LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test
287 -}
288 -
289 -src_install() {
290 - default
291 - cd debian
292 - dodoc changelog README.* deadpool.txt NEWS copyright
293 - newdoc add-ons/README README.add-ons
294 -}
295
296 diff --git a/sci-physics/cernlib/files/cernlib-2006-fgets.patch b/sci-physics/cernlib/files/cernlib-2006-fgets.patch
297 deleted file mode 100644
298 index e42eaf833b3..00000000000
299 --- a/sci-physics/cernlib/files/cernlib-2006-fgets.patch
300 +++ /dev/null
301 @@ -1,20 +0,0 @@
302 ---- src/packlib/cspack/tcpaw/tcpaw.c.old 2011-01-30 21:18:35.326089059 +0000
303 -+++ src/packlib/cspack/tcpaw/tcpaw.c 2011-01-30 21:18:01.876081979 +0000
304 -@@ -984,7 +984,7 @@
305 - int s, addrlen;
306 - int sx, nn = 0; /* REXEC */
307 - #ifndef IBM
308 -- char get[50], *getp = get; /* REXEC */
309 -+ char get[80], *getp = get; /* REXEC */
310 - #endif /*^IBM */
311 - char sys[30];
312 - register int i, j, k;
313 -@@ -1036,7 +1036,7 @@
314 - char buff[100];
315 - char *get;
316 - char *getp;
317 -- char getbuf[50]; /* REXEC */
318 -+ char getbuf[80]; /* REXEC */
319 - getp = getbuf; /* REXEC */
320 - get = getbuf; /* REXEC */
321 - /* j = 80; */ /* (crude kludge) length of srvc in Fortran */
322
323 diff --git a/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch b/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch
324 deleted file mode 100644
325 index 63883274403..00000000000
326 --- a/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch
327 +++ /dev/null
328 @@ -1,56 +0,0 @@
329 ---- debian/add-ons/Makefile.orig 2008-03-15 16:46:46.000000000 +0000
330 -+++ debian/add-ons/Makefile 2008-03-15 16:47:51.000000000 +0000
331 -@@ -28,6 +28,9 @@
332 - ifneq (,$(findstring ifort,$(DEB_BUILD_OPTIONS)))
333 - sed -i -e 's/-lgfortran/-limf/' $(CERN_BINDIR)/cernlib
334 - endif
335 -+ifneq (,$(findstring g77,$(DEB_BUILD_OPTIONS)))
336 -+ sed -i -e 's/-lgfortran/-lg2c/' $(CERN_BINDIR)/cernlib
337 -+endif
338 - chmod a+x $(CERN_BINDIR)/cernlib
339 -
340 - # target to install include files for development packages
341 ---- debian/add-ons/cernlib.mk.orig 2008-03-15 16:48:05.000000000 +0000
342 -+++ debian/add-ons/cernlib.mk 2008-03-15 17:09:14.000000000 +0000
343 -@@ -35,6 +35,10 @@
344 - export TOOL_SONAME = _gfortran
345 - export TOOL_NAME = _gfortran
346 - endif
347 -+ifeq (,$(findstring g77,$(DEB_BUILD_OPTIONS)))
348 -+ export TOOL_SONAME = _gfortran
349 -+ export TOOL_NAME = _gfortran
350 -+endif
351 - export PATH := $(CERN_BINDIR):$(ADDONDIR)/bin:$(datadir)/cernlib:${PATH}
352 - export INSTALL_OPTS ?= -s
353 - export CC ?= gcc
354 -@@ -118,6 +122,8 @@
355 - endif
356 - ifneq (,$(findstring ifort,$(DEB_BUILD_OPTIONS)))
357 - echo '#define HasIntelifc YES' >> $(CVSCOSRC)/config/host.def
358 -+else ifneq (,$(findstring g77,$(DEB_BUILD_OPTIONS)))
359 -+ echo >> $(CVSCOSRC)/config/host.def
360 - else
361 - echo '#define Hasgfortran YES' >> $(CVSCOSRC)/config/host.def
362 - endif
363 ---- debian/patches/320-support-ifort.dpatch.orig 2008-03-15 17:31:34.000000000 +0000
364 -+++ debian/patches/320-support-ifort.dpatch 2008-03-15 17:31:56.000000000 +0000
365 -@@ -27,7 +27,7 @@
366 - #if defined(CERNLIB_UNIX)
367 - CLIBS= -G Motif kernlib
368 - +# if defined(CERNLIB_INTELIFC)
369 --+CLIBS= $(CLIBS) -nofor_main
370 -++CLIBS:= $(CLIBS) -nofor_main
371 - +# endif
372 - #endif
373 -
374 ---- debian/patches/803-link-binaries-dynamically.dpatch.orig 2008-03-15 17:48:38.000000000 +0000
375 -+++ debian/patches/803-link-binaries-dynamically.dpatch 2008-03-15 17:49:17.000000000 +0000
376 -@@ -64,7 +64,7 @@
377 - -CLIBS= -G Motif kernlib
378 - +CLIBS= -G Motif -u Xm
379 - # if defined(CERNLIB_INTELIFC)
380 -- CLIBS= $(CLIBS) -nofor_main
381 -+ CLIBS:= $(CLIBS) -nofor_main
382 - # endif
383 - #endif
384 -
385
386 diff --git a/sci-physics/cernlib/files/cernlib-2006-ypatchy-short-name.patch b/sci-physics/cernlib/files/cernlib-2006-ypatchy-short-name.patch
387 deleted file mode 100644
388 index 706ab367167..00000000000
389 --- a/sci-physics/cernlib/files/cernlib-2006-ypatchy-short-name.patch
390 +++ /dev/null
391 @@ -1,11 +0,0 @@
392 ---- src/patchy/Imakefile.orig 2013-01-16 13:45:07.161828513 -0800
393 -+++ src/patchy/Imakefile 2013-01-16 13:45:34.768966597 -0800
394 -@@ -77,7 +77,7 @@
395 - @ ln -s $< $@
396 -
397 - %.f: $(LDIR)%.cra $(LDIR)patchy.car
398 -- ypatchy - :$@ :$< TTY .go
399 -+ ypatchy - :$@ :$(shell basename $<) TTY .go
400 -
401 - .f.o:
402 - $(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $<
403
404 diff --git a/sci-physics/cernlib/metadata.xml b/sci-physics/cernlib/metadata.xml
405 deleted file mode 100644
406 index 018891e9364..00000000000
407 --- a/sci-physics/cernlib/metadata.xml
408 +++ /dev/null
409 @@ -1,17 +0,0 @@
410 -<?xml version="1.0" encoding="UTF-8"?>
411 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
412 -<pkgmetadata>
413 - <maintainer type="project">
414 - <email>sci-physics@g.o</email>
415 - <name>Gentoo Physics Project</name>
416 - </maintainer>
417 - <longdescription lang="en">
418 - The CERN Program Library is a large collection of general purpose
419 - libraries and modules maintained and offered in both source and
420 - object code form on the CERN central computers. Most of these
421 - programs were developed at CERN and are therefore oriented towards
422 - the needs of a physics research laboratory that is general
423 - mathematics, data analysis, detectors simulation, data-handling
424 - etc... applicable to a wide range of problems.
425 -</longdescription>
426 -</pkgmetadata>