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-libs/libcore/, sci-libs/libcore/files/, profiles/
Date: Mon, 03 Feb 2020 06:06:26
Message-Id: 1580709816.9dca15e4e6acf3dba6615e6c26e19cb2ab7aa5c5.mgorny@gentoo
1 commit: 9dca15e4e6acf3dba6615e6c26e19cb2ab7aa5c5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 3 06:01:41 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 3 06:03:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dca15e4
7
8 sci-libs/libcore: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/568364
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sci-libs/libcore/Manifest | 2 -
15 sci-libs/libcore/files/2.1.1-makefiles.patch | 115 ---------------------------
16 sci-libs/libcore/libcore-2.1.1-r1.ebuild | 74 -----------------
17 sci-libs/libcore/metadata.xml | 17 ----
18 5 files changed, 209 deletions(-)
19
20 diff --git a/profiles/package.mask b/profiles/package.mask
21 index f37d52fcea7..58403b14be3 100644
22 --- a/profiles/package.mask
23 +++ b/profiles/package.mask
24 @@ -798,7 +798,6 @@ games-util/xboxgw
25 # Unmaintained, dead upstreams, monstrous build systems.
26 # Bug #568364, Removal in 30 days.
27 sci-libs/jmol-acme
28 -sci-libs/libcore
29
30 # Tomáš Mózes <hydrapolic@g.o> (2019-12-19)
31 # Needs more testing.
32
33 diff --git a/sci-libs/libcore/Manifest b/sci-libs/libcore/Manifest
34 deleted file mode 100644
35 index fb0fd01f164..00000000000
36 --- a/sci-libs/libcore/Manifest
37 +++ /dev/null
38 @@ -1,2 +0,0 @@
39 -DIST core-2.1.1.tgz 2759163 BLAKE2B e33178bce382aa176896a50ae7ad7821fdeb906bc6dd13805efd8ec5f91b3b659818c570be809c52eb86197d1a1776a51c257a2922e561660f604b70bc831dfa SHA512 e56e184b8efaee82b737e3947f2934b71983cbf905f05005171d3d5670f326597ff7d25767c00ec18a470eb7306f14b813edf9548869d84054830565c044f6fb
40 -DIST core-2.1.doc.tgz 657871 BLAKE2B bce685204ca0f7c621b833f4a54b092167882d06b83b021cfd86e3b42c6849a429196950ae32293790979c3ed67b2d809982ea3ab3453569bcbefce2723f2f68 SHA512 0988640bbc35de675fc536b852371a8f1233ce0d19818b17e540f1238b0e6d1266657ab815604be3a3379e22e7473eb3fbd71ef94ec099255c456307e69f66c7
41
42 diff --git a/sci-libs/libcore/files/2.1.1-makefiles.patch b/sci-libs/libcore/files/2.1.1-makefiles.patch
43 deleted file mode 100644
44 index 09a8f5be2f3..00000000000
45 --- a/sci-libs/libcore/files/2.1.1-makefiles.patch
46 +++ /dev/null
47 @@ -1,115 +0,0 @@
48 -diff -Nur core-2.1.1.orig/ext/Makefile core-2.1.1/ext/Makefile
49 ---- core-2.1.1.orig/ext/Makefile 2011-08-06 22:53:29.000000000 +0100
50 -+++ core-2.1.1/ext/Makefile 2011-08-07 00:40:58.000000000 +0100
51 -@@ -38,16 +38,18 @@
52 - endif
53 - endif
54 -
55 --INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include \
56 -- -I${CORE_PATH}/mpfr/include
57 -+INCLUDE=-I${CORE_PATH}/inc
58 -
59 -
60 - COREX_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.a
61 - COREX_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.a
62 - COREX_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.a
63 --COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.${CORE_DYLIB_EXTENSION}
64 --COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.${CORE_DYLIB_EXTENSION}
65 --COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.${CORE_DYLIB_EXTENSION}
66 -+COREX_SHARED_LIB_LEVEL3_NAME=libcorex++$(VAR)_level3.${CORE_DYLIB_EXTENSION}.2
67 -+COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.${CORE_DYLIB_EXTENSION}.2
68 -+COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.${CORE_DYLIB_EXTENSION}.2
69 -+COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL3_NAME)
70 -+COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL2_NAME)
71 -+COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL1_NAME)
72 -
73 - TARGET=${COREX_LIB_LEVEL3} ${COREX_LIB_LEVEL2} ${COREX_LIB_LEVEL1}
74 -
75 -@@ -74,11 +76,11 @@
76 - -@rm -rf $@
77 - $(AR) $@ $?
78 -
79 --COREX_SHARED_DEPS=-L${GMP_PREFIX}/lib -lgmp -L${MPFR_PREFIX}/lib -lmpfr -L${CORE_PATH}/lib -lcore++${VAR}
80 -+COREX_SHARED_DEPS= -lgmp -lmpfr -L${CORE_PATH}/lib -lcore++${VAR}
81 -
82 - ${COREX_SHARED_LIB_LEVEL3}: ${L3_OBJS}
83 - -@rm -rf $@
84 -- $(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
85 -+ $(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL3_NAME) -o $@ $?
86 -
87 - ${COREX_LIB_LEVEL2}: ${L2_OBJS}
88 - -@rm -rf $@
89 -@@ -86,7 +88,7 @@
90 -
91 - ${COREX_SHARED_LIB_LEVEL2}: ${L2_OBJS}
92 - -@rm -rf $@
93 -- $(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
94 -+ $(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL2_NAME) -o $@ $?
95 -
96 - ${COREX_LIB_LEVEL1}: ${L1_OBJS}
97 - -@rm -rf $@
98 -@@ -94,7 +96,7 @@
99 -
100 - ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS}
101 - -@rm -rf $@
102 -- $(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
103 -+ $(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME) -o $@ $?
104 -
105 - %_level3.o: %.cpp
106 - ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@
107 -diff -Nur core-2.1.1.orig/progs/Make.options core-2.1.1/progs/Make.options
108 ---- core-2.1.1.orig/progs/Make.options 2011-08-06 22:53:29.000000000 +0100
109 -+++ core-2.1.1/progs/Make.options 2011-08-06 23:31:01.000000000 +0100
110 -@@ -11,10 +11,8 @@
111 -
112 - include $(CORE_PATH)/Make.config
113 -
114 --CORE_INC=-I. -I$(CORE_PATH)/inc -I$(CORE_PATH)/mpfr/include \
115 -- -I$(CORE_PATH)/gmp/include
116 --CORE_LIB=-L$(CORE_PATH)/lib -L$(CORE_PATH)/mpfr/lib -L$(CORE_PATH)/gmp/lib \
117 -- -lcore++$(VAR) -lmpfr -lgmp
118 -+CORE_INC=-I. -I$(CORE_PATH)/inc
119 -+CORE_LIB=-L$(CORE_PATH)/lib -lcore++$(VAR) -lmpfr -lgmp
120 -
121 - COREX_LIB_LEVEL=-lcoreex++$(VAR)_level
122 -
123 -diff -Nur core-2.1.1.orig/src/Makefile core-2.1.1/src/Makefile
124 ---- core-2.1.1.orig/src/Makefile 2011-08-06 22:53:29.000000000 +0100
125 -+++ core-2.1.1/src/Makefile 2011-08-07 00:24:38.000000000 +0100
126 -@@ -23,7 +23,7 @@
127 - endif
128 - endif
129 -
130 --INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/mpfr/include -I${CORE_PATH}/gmp/include
131 -+INCLUDE=-I${CORE_PATH}/inc
132 -
133 - # VAR indicates variants of the Core library
134 - # E.g., if VAR=(empty) then we compile the release version.
135 -@@ -44,7 +44,8 @@
136 -
137 - # The following library will be built:
138 - CORE_LIB=$(CORE_PATH)/lib/libcore++${VAR}.a
139 --CORE_SHARED_LIB=$(CORE_PATH)/lib/libcore++${VAR}.${CORE_DYLIB_EXTENSION}
140 -+CORE_SHARED_LIB_NAME=libcore++${VAR}.${CORE_DYLIB_EXTENSION}.2
141 -+CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME)
142 -
143 - TARGET=$(CORE_LIB)
144 -
145 -@@ -52,7 +53,7 @@
146 - TARGET+=$(CORE_SHARED_LIB)
147 - endif
148 -
149 --DEPS=-L${GMP_PREFIX}/lib -L${MPFR_PREFIX}/lib -lgmp -lmpfr
150 -+DEPS=-lgmp -lmpfr
151 -
152 - # =============================================================
153 - # RULES ======================================================
154 -@@ -64,7 +65,7 @@
155 - $(AR) $@ $^
156 -
157 - ${CORE_SHARED_LIB}: $(EXPROBJS)
158 -- $(CXX) $(DEPS) $(CORE_LDFLAGS) -o $@ $^
159 -+ $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(CORE_SHARED_LIB_NAME) $(DEPS) -o $@ $^ $(LIBS)
160 -
161 - %${VAR}.o: %.cpp
162 - ${CXX} $(CORE_CXXFLAGS) $(INCLUDE) -c $< -o $@
163
164 diff --git a/sci-libs/libcore/libcore-2.1.1-r1.ebuild b/sci-libs/libcore/libcore-2.1.1-r1.ebuild
165 deleted file mode 100644
166 index 79e8f698f35..00000000000
167 --- a/sci-libs/libcore/libcore-2.1.1-r1.ebuild
168 +++ /dev/null
169 @@ -1,74 +0,0 @@
170 -# Copyright 1999-2012 Gentoo Foundation
171 -# Distributed under the terms of the GNU General Public License v2
172 -
173 -EAPI=4
174 -inherit eutils toolchain-funcs versionator
175 -
176 -MYPN=core
177 -DOCPV="$(get_version_component_range 1-2)"
178 -
179 -DESCRIPTION="Robust numerical and geometric computation library"
180 -HOMEPAGE="http://www.cs.nyu.edu/exact/core_pages/"
181 -SRC_URI="http://cs.nyu.edu/exact/core/download/${MYPN}/${MYPN}-${PV}.tgz
182 - doc? ( http://cs.nyu.edu/exact/core/download/${MYPN}/${MYPN}-${DOCPV}.doc.tgz )"
183 -
184 -LICENSE="QPL-1.0"
185 -SLOT="0"
186 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
187 -IUSE="doc static-libs"
188 -
189 -RDEPEND=""
190 -DEPEND="${RDEPEND}
191 - dev-libs/mpfr
192 - dev-libs/gmp
193 - doc? ( app-doc/doxygen[latex] )"
194 -
195 -S="${WORKDIR}/${MYPN}-${PV}"
196 -
197 -src_prepare() {
198 - epatch "${FILESDIR}"/${PV}-makefiles.patch
199 - sed -i \
200 - -e "s/-O2/${CXXFLAGS}/g" \
201 - -e "s/-shared/-shared ${LDFLAGS}/g" \
202 - Make.config || die
203 - sed -i -e 's/-lgmp/-lgmp -lgmpxx/g' progs/Make.options || die
204 - # missing input file in gaussian test and buggy test in tutorial
205 - sed -i -e '/gaussian/d' -e '/tutorial/d' progs/Makefile || die
206 -}
207 -
208 -src_compile(){
209 - emake VAR= LINKAGE=shared corelib corex USE_GMPXX=1
210 - rm -f src/*.o ext/*.o
211 - use static-libs && emake VAR="" corelib corex USE_GMPXX=1
212 - if use doc; then
213 - cd "${S}/doc"
214 - export VARTEXFONTS="${T}/fonts"
215 - emake -j1 all
216 - emake -j1 -C doxy/latex pdf
217 - fi
218 -}
219 -
220 -src_test() {
221 - LD_LIBRARY_PATH="${S}/lib" emake \
222 - VAR= GMP_PREFIX= MPFR_PREFIX= test
223 -}
224 -
225 -src_install(){
226 - dolib.so lib/*.so*
227 - for i in $(find "${ED}/usr/$(get_libdir)" -name "*so" | sed "s:${ED}::g"); do
228 - dosym $i.2 $i
229 - done
230 - use static-libs && dolib.a lib/*.a
231 -
232 - insinto /usr/include
233 - doins inc/CORE.h
234 - insinto /usr/include/CORE
235 - doins inc/CORE/*.h
236 -
237 - dodoc FAQs README
238 - if use doc; then
239 - dodoc doc/*.txt
240 - dodoc doc/tutorial/tutorial.pdf doc/doxy/latex/*pdf
241 - dohtml -r doc/doxy/html/*
242 - fi
243 -}
244
245 diff --git a/sci-libs/libcore/metadata.xml b/sci-libs/libcore/metadata.xml
246 deleted file mode 100644
247 index 84bf0d372a6..00000000000
248 --- a/sci-libs/libcore/metadata.xml
249 +++ /dev/null
250 @@ -1,17 +0,0 @@
251 -<?xml version="1.0" encoding="UTF-8"?>
252 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
253 -<pkgmetadata>
254 - <maintainer type="project">
255 - <email>sci-geosciences@g.o</email>
256 - <name>Gentoo Geosciences Project</name>
257 - </maintainer>
258 - <longdescription lang="en">
259 - The Core Library is a collection of C/C++ classes for exact
260 - computation with real algebraic numbers.
261 - It embodies our precision-driven approach and is
262 - useful for robust numerical (especially geometric) algorithms.
263 - The library supports the Exact Geometric Computation (EGC)
264 - philosophy through its novel and easy-to-use notion of accuracy
265 - levels.
266 - </longdescription>
267 -</pkgmetadata>