Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cqrlib/files/, sci-libs/cqrlib/
Date: Mon, 02 Jan 2017 22:09:39
Message-Id: 1483394947.51ab17c44f14b422ac925fd441b05c5e95e511cd.jlec@gentoo
1 commit: 51ab17c44f14b422ac925fd441b05c5e95e511cd
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 21:58:48 2017 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 22:09:07 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ab17c4
7
8 sci-libs/cqrlib: Drop old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sci-libs/cqrlib/Manifest | 1 -
14 sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild | 56 -------------------
15 sci-libs/cqrlib/files/1.0.3-LDFLAGS.patch | 17 ------
16 sci-libs/cqrlib/files/1.0.3-dynlib.patch | 45 ---------------
17 sci-libs/cqrlib/files/1.0.5-gentoo.patch | 91 -------------------------------
18 5 files changed, 210 deletions(-)
19
20 diff --git a/sci-libs/cqrlib/Manifest b/sci-libs/cqrlib/Manifest
21 index 63fd502..7144962 100644
22 --- a/sci-libs/cqrlib/Manifest
23 +++ b/sci-libs/cqrlib/Manifest
24 @@ -1,2 +1 @@
25 -DIST CQRlib-1.1.2.tar.gz 43082 SHA256 af3cf2402974579f3c6efc6a6174a5da52786db4bfee9d38d504d93bc42410fd SHA512 41510d0a03ef48385896be6695b8ca328d56dc7d0ef82db2e46108913d814d3545febe76114589ee6fa3bfad75a2832d98120ec966e052245a3b4f0e684c2b9f WHIRLPOOL 2c1de60f88b5cfb9c5e406bc2b9f93617c7ef390ae290716bcec891b17ec8388bab37bf9bed4ed87c1796a6af2c6d0a6d95086fb4c971941306810f30849d3f5
26 DIST CQRlib-1.1.3.tar.gz 93987 SHA256 90ecd9aabfb72e55e56957c7b233910d18b8c2bb522a8e59eddbcc4618c72d0e SHA512 49ee134171bc4736513556781cc978599a3017c0692cf48fba876b2cf8d846ff9b1bbce41c0beba3836701de0dc00d987142253683cd9c1da71586435a5c4010 WHIRLPOOL 244be95a8f2d73a62010c03b6ceb587fd9265c5144ff3e47c81965f65adc655394a45800aacd2ceb75c54fe4943ab31739344dee8ea29d67fbdc47273136ee1a
27
28 diff --git a/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild b/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild
29 deleted file mode 100644
30 index 4d3866d..00000000
31 --- a/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild
32 +++ /dev/null
33 @@ -1,56 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=4
39 -
40 -inherit eutils flag-o-matic multilib toolchain-funcs versionator
41 -
42 -MY_PN=CQRlib
43 -MY_P="${MY_PN}-${PV}"
44 -
45 -DESCRIPTION="Utility library for quaternion arithmetic / rotation math (ANSI C implemented)"
46 -HOMEPAGE="http://cqrlib.sourceforge.net/"
47 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
48 -
49 -LICENSE="LGPL-2.1"
50 -SLOT="0"
51 -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
52 -IUSE=""
53 -
54 -RDEPEND="dev-libs/cvector"
55 -DEPEND="${RDEPEND}"
56 -
57 -S="${WORKDIR}"/${MY_P}
58 -
59 -src_prepare() {
60 - epatch "${FILESDIR}"/1.0.6-gentoo.patch
61 -}
62 -
63 -src_compile() {
64 - sed "s:GENTOOLIBDIR:$(get_libdir):g" -i Makefile || die
65 - append-flags -ansi
66 - emake \
67 - CC=$(tc-getCC) \
68 - CXX=$(tc-getCXX) \
69 - CFLAGS="${CFLAGS}" \
70 - CPPFLAGS="${CXXFLAGS} -DCQR_NOCCODE=1" \
71 - all
72 -}
73 -
74 -src_test() {
75 - emake -j1 \
76 - CC=$(tc-getCC) \
77 - CXX=$(tc-getCXX) \
78 - CFLAGS="${CFLAGS}" \
79 - tests
80 -}
81 -
82 -src_install() {
83 - emake -j1 DESTDIR="${ED}" install
84 -
85 - rm -f "${ED}"/usr/$(get_libdir)/*.la || die
86 -
87 - dodoc README_CQRlib.txt
88 - dohtml README_CQRlib.html
89 -}
90
91 diff --git a/sci-libs/cqrlib/files/1.0.3-LDFLAGS.patch b/sci-libs/cqrlib/files/1.0.3-LDFLAGS.patch
92 deleted file mode 100644
93 index 491eb91..00000000
94 --- a/sci-libs/cqrlib/files/1.0.3-LDFLAGS.patch
95 +++ /dev/null
96 @@ -1,17 +0,0 @@
97 ---- Makefile 2009-07-08 18:12:50.000000000 +0200
98 -+++ Makefile.new 2009-07-25 13:18:36.000000000 +0200
99 -@@ -86,10 +86,10 @@
100 - endif
101 -
102 - COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
103 --LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -rpath $(INSTALLDIR)/lib
104 --BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
105 --BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
106 --BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
107 -+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) $(LDFLAGS)
108 -+BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES)
109 -+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -dynamic
110 -+BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static
111 - INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
112 - INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
113 -
114
115 diff --git a/sci-libs/cqrlib/files/1.0.3-dynlib.patch b/sci-libs/cqrlib/files/1.0.3-dynlib.patch
116 deleted file mode 100644
117 index cb2a663..00000000
118 --- a/sci-libs/cqrlib/files/1.0.3-dynlib.patch
119 +++ /dev/null
120 @@ -1,45 +0,0 @@
121 -diff --git a/Makefile b/Makefile
122 -index e21d52e..4a22862 100644
123 ---- a/Makefile
124 -+++ b/Makefile
125 -@@ -85,7 +85,7 @@ else
126 - INCLUDES = -I$(INC)
127 - endif
128 -
129 --COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
130 -+COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -shared -c
131 - LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) $(LDFLAGS)
132 - BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES)
133 - BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -dynamic
134 -@@ -93,8 +93,8 @@ BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -sta
135 - INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
136 - INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
137 -
138 --OBJ_EXT = lo
139 --LIB_EXT = la
140 -+OBJ_EXT = o
141 -+LIB_EXT = so
142 -
143 - ######################################################################
144 - # You should not need to make modifications below this line #
145 -@@ -178,8 +178,7 @@ default:
146 - # Compile the library and examples
147 - #
148 - all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \
149 -- $(LIB)/libCQRlib.$(LIB_EXT) \
150 -- $(BIN)/CQRlibTest
151 -+ $(LIB)/libCQRlib.$(LIB_EXT)
152 -
153 - install: all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \
154 - $(INC) $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h
155 -@@ -229,8 +228,8 @@ $(BIN):
156 - # CQRlib library
157 - #
158 - $(LIB)/libCQRlib.$(LIB_EXT): $(SOURCE) $(HEADERS) $(COMMONDEP)
159 -- $(COMPILE_COMMAND) -c $(SOURCE)
160 -- $(LIBRARY_LINK_COMMAND) -o $(LIB)/libCQRlib.$(LIB_EXT) *.$(OBJ_EXT)
161 -+ $(CC) $(CFLAGS) -fPIC -c $(SOURCE) -o cqrlib.o -I.
162 -+ $(CC) $(LDFLAGS) -Wl,--soname,libCQRlib.so.1 -shared -o libCQRlib.so.$(RELEASE) *.$(OBJ_EXT) -lm
163 -
164 - #
165 - # CQRlibTest example program
166
167 diff --git a/sci-libs/cqrlib/files/1.0.5-gentoo.patch b/sci-libs/cqrlib/files/1.0.5-gentoo.patch
168 deleted file mode 100644
169 index a5e7772..00000000
170 --- a/sci-libs/cqrlib/files/1.0.5-gentoo.patch
171 +++ /dev/null
172 @@ -1,91 +0,0 @@
173 -diff --git a/Makefile b/Makefile
174 -index ffd3114..cd9891d 100644
175 ---- a/Makefile
176 -+++ b/Makefile
177 -@@ -88,7 +88,7 @@ INCLUDES = -I$(INC)
178 - endif
179 -
180 - COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
181 --LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
182 -+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -shared -version-info $(VERSION) -rpath $(INSTALLDIR)/lib ${LDFLAGS}
183 - BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
184 - BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
185 - BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
186 -@@ -194,54 +194,31 @@ default:
187 - #
188 - all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \
189 - $(LIB)/libCQRlib.$(LIB_EXT) \
190 -- $(BIN)/CQRlibTest $(BIN)/CPPQRTest
191 -
192 --install: all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \
193 -+install: all $(DESTDIR) $(DESTDIR)/GENTOOLIBDIR $(DESTDIR)/include \
194 - $(INC) $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h
195 -- $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
196 -- $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
197 -- -cp $(INSTALLDIR)/include/cqrlib.h $(INSTALLDIR)/include/CQRlib_old.h
198 -- cp $(INC)/cqrlib.h $(INSTALLDIR)/include/cqrlib.h
199 -- chmod 644 $(INSTALLDIR)/include/cqrlib.h
200 -- echo "Testing final install dynamic"
201 -- $(BUILD_COMMAND_DYNAMIC) $(EXAMPLES)/CQRlibTest.c \
202 -- -lCQRlib -lm -o $(BIN)/CQRlibTest_dynamic
203 -- $(BIN)/CQRlibTest_dynamic > $(TESTDATA)/CQRlibTest_dynamic.lst
204 -- diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \
205 -- $(TESTDATA)/CQRlibTest_dynamic.lst
206 -- echo "Testing final install static"
207 -- $(BUILD_COMMAND_STATIC) $(EXAMPLES)/CQRlibTest.c \
208 -- -lCQRlib -lm -o $(BIN)/CQRlibTest_static
209 -- $(BIN)/CQRlibTest_static > $(TESTDATA)/CQRlibTest_static.lst
210 -- diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \
211 -- $(TESTDATA)/CQRlibTest_static.lst
212 -- $(CPPBUILD_COMMAND_DYNAMIC) $(EXAMPLES)/CPPQRTest.cpp \
213 -- -lm -o $(BIN)/CPPQRTest_dynamic
214 -- $(BIN)/CPPQRTest_dynamic > $(TESTDATA)/CPPQRTest_dynamic.lst
215 -- diff -b -c $(TESTDATA)/CPPQRTest_orig.lst \
216 -- $(TESTDATA)/CPPQRTest_dynamic.lst
217 -- $(CPPBUILD_COMMAND_STATIC) $(EXAMPLES)/CPPQRTest.cpp \
218 -- -lm -o $(BIN)/CPPQRTest_static
219 -- $(BIN)/CPPQRTest_static > $(TESTDATA)/CPPQRTest_static.lst
220 -- diff -b -c $(TESTDATA)/CPPQRTest_orig.lst \
221 -- $(TESTDATA)/CPPQRTest_static.lst
222 -+ $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(DESTDIR)/usr/GENTOOLIBDIR/libCQRlib.$(LIB_EXT)
223 -+ $(INSTALL_FINISH_COMMAND) $(DESTDIR)/usr/GENTOOLIBDIR/libCQRlib.$(LIB_EXT)
224 -+ -cp $(INSTALLDIR)/cqrlib.h $(DESTDIR)/usr/include/CQRlib.h
225 -+ cp $(INC)/cqrlib.h $(DESTDIR)/usr/include/cqrlib.h
226 -+ chmod 644 $(DESTDIR)/usr/include/cqrlib.h
227 -
228 -
229 -
230 - #
231 - # Directories
232 - #
233 --$(INSTALLDIR):
234 -- mkdir -p $(INSTALLDIR)
235 -+$(DESTDIR):
236 -+ mkdir -p $(DESTDIR)
237 -
238 --$(INSTALLDIR)/lib: $(INSTALLDIR)
239 -- mkdir -p $(INSTALLDIR)/lib
240 -+$(DESTDIR)/GENTOOLIBDIR: $(DESTDIR)
241 -+ mkdir -p $(DESTDIR)/usr/GENTOOLIBDIR
242 -
243 --$(INSTALLDIR)/bin: $(INSTALLDIR)
244 -- mkdir -p $(INSTALLDIR)/bin
245 -+$(DESTDIR)/bin: $(DESTDIR)
246 -+ mkdir -p $(DESTDIR)/usr/bin
247 -
248 --$(INSTALLDIR)/include: $(INSTALLDIR)
249 -- mkdir -p $(INSTALLDIR)/include
250 -+$(DESTDIR)/include: $(DESTDIR)
251 -+ mkdir -p $(DESTDIR)/usr/include
252 -
253 -
254 - $(LIB):
255 -@@ -274,7 +251,7 @@ $(BIN)/CPPQRTest: $(EXAMPLES)/CPPQRTest.cpp
256 - #
257 - # Tests
258 - #
259 --tests: $(LIB) $(BIN) $(BIN)/CQRlibTest \
260 -+tests: $(LIB) $(BIN) $(BIN)/CQRlibTest $(BIN)/CPPQRTest \
261 - all $(TESTDATA)/CQRlibTest_orig.lst $(TESTDATA)/CPPQRTest_orig.lst
262 - $(BIN)/CQRlibTest > $(TESTDATA)/CQRlibTest.lst
263 - diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \