Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cqrlib/files/, sci-libs/cqrlib/
Date: Wed, 31 Aug 2022 12:11:36
Message-Id: 1661947885.6f17fa3e1c12343c0f8630657d2f13f3fd3ec961.asturm@gentoo
1 commit: 6f17fa3e1c12343c0f8630657d2f13f3fd3ec961
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 12:11:09 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 12:11:25 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f17fa3e
7
8 sci-libs/cqrlib: drop 1.1.3
9
10 Closes: https://bugs.gentoo.org/867526
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 sci-libs/cqrlib/Manifest | 1 -
14 sci-libs/cqrlib/cqrlib-1.1.3.ebuild | 58 ------------------
15 sci-libs/cqrlib/files/1.0.6-gentoo.patch | 101 -------------------------------
16 3 files changed, 160 deletions(-)
17
18 diff --git a/sci-libs/cqrlib/Manifest b/sci-libs/cqrlib/Manifest
19 index a7cd3700a1ae..3c16b17f14e1 100644
20 --- a/sci-libs/cqrlib/Manifest
21 +++ b/sci-libs/cqrlib/Manifest
22 @@ -1,2 +1 @@
23 -DIST CQRlib-1.1.3.tar.gz 93987 BLAKE2B d95dc83f92c322fe6185c8a9989d4814bcae95ac870c2555c5cce0e4279a676180050b0e23bc29cc1032f3ee7a7e2ccc8bbe75be7dba4e336a27afda532aadc4 SHA512 49ee134171bc4736513556781cc978599a3017c0692cf48fba876b2cf8d846ff9b1bbce41c0beba3836701de0dc00d987142253683cd9c1da71586435a5c4010
24 DIST cqrlib-1.1.4.tar.gz 41521 BLAKE2B 2b69dbf401de9908886798425ec33c28c55ef4b892d35883ffe3c715ddff03fb81b32222b6c755c3c690a016b2ded72e965d83408f14b316913e6f8c7ebb5a41 SHA512 14f49ebc5f562b31081cd53c738aa1571cbefb369ebfe4ca8c27af07a691e4eae288fcf374527453b8d6e36a114a97be26204909be478bd67fb8d94934b1bec7
25
26 diff --git a/sci-libs/cqrlib/cqrlib-1.1.3.ebuild b/sci-libs/cqrlib/cqrlib-1.1.3.ebuild
27 deleted file mode 100644
28 index b6f66281567c..000000000000
29 --- a/sci-libs/cqrlib/cqrlib-1.1.3.ebuild
30 +++ /dev/null
31 @@ -1,58 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -inherit flag-o-matic toolchain-funcs
38 -
39 -MY_PN=CQRlib
40 -MY_P="${MY_PN}-${PV}"
41 -
42 -DESCRIPTION="Utility library for quaternion arithmetic / rotation math (ANSI C implemented)"
43 -HOMEPAGE="http://cqrlib.sourceforge.net/"
44 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
45 -
46 -LICENSE="LGPL-2.1"
47 -SLOT="0"
48 -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
49 -IUSE=""
50 -
51 -RDEPEND="dev-libs/cvector"
52 -DEPEND="${RDEPEND}"
53 -
54 -DOCS=( README_CQRlib.txt )
55 -HTML_DOCS=( README_CQRlib.html )
56 -PATCHES=( "${FILESDIR}"/1.0.6-gentoo.patch )
57 -
58 -S="${WORKDIR}"/${MY_P}
59 -
60 -src_prepare() {
61 - default
62 - sed "s:GENTOOLIBDIR:$(get_libdir):g" -i Makefile || die
63 - append-cflags -std=c90
64 - append-cxxflags -std=c++98
65 -}
66 -
67 -src_compile() {
68 - emake \
69 - CC="$(tc-getCC)" \
70 - CXX="$(tc-getCXX)" \
71 - CFLAGS="${CFLAGS}" \
72 - CPPFLAGS="${CXXFLAGS} -DCQR_NOCCODE=1" \
73 - all
74 -}
75 -
76 -src_test() {
77 - emake -j1 \
78 - CC="$(tc-getCC)" \
79 - CXX="$(tc-getCXX)" \
80 - CFLAGS="${CFLAGS}" \
81 - tests
82 -}
83 -
84 -src_install() {
85 - emake -j1 DESTDIR="${ED}" install
86 - einstalldocs
87 -
88 - find "${D}" -name '*.la' -delete || die
89 -}
90
91 diff --git a/sci-libs/cqrlib/files/1.0.6-gentoo.patch b/sci-libs/cqrlib/files/1.0.6-gentoo.patch
92 deleted file mode 100644
93 index 64a8eaf3ae26..000000000000
94 --- a/sci-libs/cqrlib/files/1.0.6-gentoo.patch
95 +++ /dev/null
96 @@ -1,101 +0,0 @@
97 - Makefile | 56 +++++++++++++++++---------------------------------------
98 - 1 files changed, 17 insertions(+), 39 deletions(-)
99 -
100 -diff --git a/Makefile b/Makefile
101 -index 9590e50..1aa14e5 100644
102 ---- a/Makefile
103 -+++ b/Makefile
104 -@@ -88,7 +88,7 @@ INCLUDES = -I$(INC)
105 - endif
106 -
107 - COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
108 --LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
109 -+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -shared -version-info $(VERSION) -rpath $(INSTALLDIR)/lib ${LDFLAGS}
110 - BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
111 - BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
112 - BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
113 -@@ -196,52 +196,30 @@ all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \
114 - $(LIB)/libCQRlib.$(LIB_EXT) \
115 - $(BIN)/CQRlibTest $(BIN)/CPPQRTest
116 -
117 --install: all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \
118 -+install: all $(DESTDIR) $(DESTDIR)/GENTOOLIBDIR $(DESTDIR)/include \
119 - $(INC) $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h
120 -- $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
121 -- $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
122 -- -cp $(INSTALLDIR)/include/cqrlib.h $(INSTALLDIR)/include/CQRlib_old.h
123 -- cp $(INC)/cqrlib.h $(INSTALLDIR)/include/cqrlib.h
124 -- chmod 644 $(INSTALLDIR)/include/cqrlib.h
125 -- echo "Testing final install dynamic"
126 -- $(BUILD_COMMAND_DYNAMIC) $(EXAMPLES)/CQRlibTest.c \
127 -- -lCQRlib -lm -o $(BIN)/CQRlibTest_dynamic
128 -- $(BIN)/CQRlibTest_dynamic > $(TESTDATA)/CQRlibTest_dynamic.lst
129 -- diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \
130 -- $(TESTDATA)/CQRlibTest_dynamic.lst
131 -- echo "Testing final install static"
132 -- $(BUILD_COMMAND_STATIC) $(EXAMPLES)/CQRlibTest.c \
133 -- -lCQRlib -lm -o $(BIN)/CQRlibTest_static
134 -- $(BIN)/CQRlibTest_static > $(TESTDATA)/CQRlibTest_static.lst
135 -- diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \
136 -- $(TESTDATA)/CQRlibTest_static.lst
137 -- $(CPPBUILD_COMMAND_DYNAMIC) $(EXAMPLES)/CPPQRTest.cpp \
138 -- -lm -o $(BIN)/CPPQRTest_dynamic
139 -- $(BIN)/CPPQRTest_dynamic > $(TESTDATA)/CPPQRTest_dynamic.lst
140 -- diff -b -c $(TESTDATA)/CPPQRTest_orig.lst \
141 -- $(TESTDATA)/CPPQRTest_dynamic.lst
142 -- $(CPPBUILD_COMMAND_STATIC) $(EXAMPLES)/CPPQRTest.cpp \
143 -- -lm -o $(BIN)/CPPQRTest_static
144 -- $(BIN)/CPPQRTest_static > $(TESTDATA)/CPPQRTest_static.lst
145 -- diff -b -c $(TESTDATA)/CPPQRTest_orig.lst \
146 -- $(TESTDATA)/CPPQRTest_static.lst
147 -+ $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(DESTDIR)/usr/GENTOOLIBDIR/libCQRlib.$(LIB_EXT)
148 -+ $(INSTALL_FINISH_COMMAND) $(DESTDIR)/usr/GENTOOLIBDIR/libCQRlib.$(LIB_EXT)
149 -+ -cp $(INSTALLDIR)/cqrlib.h $(DESTDIR)/usr/include/CQRlib.h
150 -+ cp $(INC)/cqrlib.h $(DESTDIR)/usr/include/cqrlib.h
151 -+ chmod 644 $(DESTDIR)/usr/include/cqrlib.h
152 -
153 -
154 -
155 - #
156 - # Directories
157 - #
158 --$(INSTALLDIR):
159 -- mkdir -p $(INSTALLDIR)
160 -+$(DESTDIR):
161 -+ mkdir -p $(DESTDIR)
162 -
163 --$(INSTALLDIR)/lib: $(INSTALLDIR)
164 -- mkdir -p $(INSTALLDIR)/lib
165 -+$(DESTDIR)/GENTOOLIBDIR: $(DESTDIR)
166 -+ mkdir -p $(DESTDIR)/usr/GENTOOLIBDIR
167 -
168 --$(INSTALLDIR)/bin: $(INSTALLDIR)
169 -- mkdir -p $(INSTALLDIR)/bin
170 -+$(DESTDIR)/bin: $(DESTDIR)
171 -+ mkdir -p $(DESTDIR)/usr/bin
172 -
173 --$(INSTALLDIR)/include: $(INSTALLDIR)
174 -- mkdir -p $(INSTALLDIR)/include
175 -+$(DESTDIR)/include: $(DESTDIR)
176 -+ mkdir -p $(DESTDIR)/usr/include
177 -
178 -
179 - $(LIB):
180 -@@ -255,7 +233,7 @@ $(BIN):
181 - #
182 - $(LIB)/libCQRlib.$(LIB_EXT): $(SOURCE) $(HEADERS) $(COMMONDEP)
183 - $(COMPILE_COMMAND) -c $(SOURCE)
184 -- $(LIBRARY_LINK_COMMAND) -o $(LIB)/libCQRlib.$(LIB_EXT) *.$(OBJ_EXT)
185 -+ $(LIBRARY_LINK_COMMAND) -o $(LIB)/libCQRlib.$(LIB_EXT) *.$(OBJ_EXT) -lm
186 -
187 - #
188 - # CQRlibTest example program
189 -@@ -274,7 +252,7 @@ $(BIN)/CPPQRTest: $(EXAMPLES)/CPPQRTest.cpp
190 - #
191 - # Tests
192 - #
193 --tests: $(LIB) $(BIN) $(BIN)/CQRlibTest \
194 -+tests: $(LIB) $(BIN) $(BIN)/CQRlibTest $(BIN)/CPPQRTest \
195 - all $(TESTDATA)/CQRlibTest_orig.lst $(TESTDATA)/CPPQRTest_orig.lst
196 - $(BIN)/CQRlibTest > $(TESTDATA)/CQRlibTest.lst
197 - diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \