1 |
commit: 2ee800eadf7606dceb161c1a4823641ca5b12812 |
2 |
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> |
3 |
AuthorDate: Fri Aug 21 11:53:16 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 21 12:00:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee800ea |
7 |
|
8 |
net-libs/osptoolkit: remove last rited package |
9 |
|
10 |
Closes: https://bugs.gentoo.org/731250 |
11 |
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/17202 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
net-libs/osptoolkit/Manifest | 1 - |
16 |
.../osptoolkit/files/osptoolkit-4.13.0-gcc5.patch | 17 ---- |
17 |
net-libs/osptoolkit/metadata.xml | 11 --- |
18 |
net-libs/osptoolkit/osptoolkit-4.13.0.ebuild | 97 ---------------------- |
19 |
profiles/package.mask | 7 -- |
20 |
5 files changed, 133 deletions(-) |
21 |
|
22 |
diff --git a/net-libs/osptoolkit/Manifest b/net-libs/osptoolkit/Manifest |
23 |
deleted file mode 100644 |
24 |
index 5e9949c6d15..00000000000 |
25 |
--- a/net-libs/osptoolkit/Manifest |
26 |
+++ /dev/null |
27 |
@@ -1 +0,0 @@ |
28 |
-DIST OSPToolkit-4.13.0.tar.gz 422064 BLAKE2B 13afe4d30a96b7cd59cf4be6116f35f5edf30b70046a7a203e89140bd0b7f338b8d1478fe6a90a7a17b6f93b0c6a8579f43b209119a8c6fdb08dff26e5c13262 SHA512 35e54350cdecf0367af47986a7c3eddfcdf924b0d6e7c52ccccdecd96d3d64ba7f8d8d266cc4d26708f0741e40eeff80db4690272702c35d4e5bafba745776bf |
29 |
|
30 |
diff --git a/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch b/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch |
31 |
deleted file mode 100644 |
32 |
index a06ffeecc91..00000000000 |
33 |
--- a/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch |
34 |
+++ /dev/null |
35 |
@@ -1,17 +0,0 @@ |
36 |
-Starting with GCC 5, the __builtin_isnan() fucntion requires proper overloaded types, even in C: |
37 |
-* osptransapi.c:1040:13: error: non-floating-point argument in call to function ‘__builtin_isnan’ |
38 |
-* OSPM_ISNAN(metrics.mean, tnisnan); |
39 |
-See also: |
40 |
-https://bugs.gentoo.org/show_bug.cgi?id=581058 |
41 |
- |
42 |
---- a/src/osptransapi.c |
43 |
-+++ b/src/osptransapi.c |
44 |
-@@ -983,7 +983,7 @@ |
45 |
- /* sample mean - have to cast Samples to a float to get some precision on the mean */ |
46 |
- mean = ((metrics.mean * currnumber) + (ospvMean * ospvSamples)) / (float)metrics.samples; |
47 |
- |
48 |
-- OSPM_ISNAN(metrics.mean, tnisnan); |
49 |
-+ OSPM_ISNAN((double)metrics.mean, tnisnan); |
50 |
- |
51 |
- if (tnisnan) { |
52 |
- errcode = OSPC_ERR_TRAN_INVALID_CALC; |
53 |
|
54 |
diff --git a/net-libs/osptoolkit/metadata.xml b/net-libs/osptoolkit/metadata.xml |
55 |
deleted file mode 100644 |
56 |
index 8e8837dfca6..00000000000 |
57 |
--- a/net-libs/osptoolkit/metadata.xml |
58 |
+++ /dev/null |
59 |
@@ -1,11 +0,0 @@ |
60 |
-<?xml version="1.0" encoding="UTF-8"?> |
61 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
62 |
-<pkgmetadata> |
63 |
- <maintainer type="person"> |
64 |
- <email>chainsaw@g.o</email> |
65 |
- <name>Tony Vroon</name> |
66 |
- </maintainer> |
67 |
- <upstream> |
68 |
- <remote-id type="sourceforge">osp-toolkit</remote-id> |
69 |
- </upstream> |
70 |
-</pkgmetadata> |
71 |
|
72 |
diff --git a/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild b/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild |
73 |
deleted file mode 100644 |
74 |
index 49bf8997723..00000000000 |
75 |
--- a/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild |
76 |
+++ /dev/null |
77 |
@@ -1,97 +0,0 @@ |
78 |
-# Copyright 1999-2020 Gentoo Authors |
79 |
-# Distributed under the terms of the GNU General Public License v2 |
80 |
- |
81 |
-EAPI=6 |
82 |
- |
83 |
-inherit toolchain-funcs |
84 |
- |
85 |
-S_DATE="20161107" |
86 |
- |
87 |
-DESCRIPTION="Open Settlement Protocol development kit" |
88 |
-HOMEPAGE="http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/OSP%20Toolkit%20Documents.htm" |
89 |
-SRC_URI="mirror://sourceforge/osp-toolkit/OSPToolkit-${PV}.tar.gz" |
90 |
- |
91 |
-LICENSE="BSD" |
92 |
-SLOT="0" |
93 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
94 |
-IUSE="" |
95 |
- |
96 |
-RDEPEND="dev-libs/openssl:0=" |
97 |
-DEPEND="${RDEPEND}" |
98 |
- |
99 |
-S=${WORKDIR}/TK-${PV//./_}-${S_DATE} |
100 |
- |
101 |
-# TODO: |
102 |
-# generate a shared lib |
103 |
- |
104 |
-# NOTES: |
105 |
-# osptest isn't a test that can be used for src_test, it's part of the toolkit |
106 |
- |
107 |
-PATCHES=( |
108 |
- "${FILESDIR}"/${PN}-4.13.0-gcc5.patch |
109 |
-) |
110 |
- |
111 |
-src_prepare() { |
112 |
- default |
113 |
- |
114 |
- # remove -O and use users CFLAGS, see bug 241034 |
115 |
- sed -i -e "s/ -O//" -e "s/^CFLAGS =/CFLAGS +=/" src/Makefile test/Makefile \ |
116 |
- enroll/Makefile || die "patching Makefiles failed" |
117 |
- |
118 |
- # use users LDFLAGS |
119 |
- sed -i -e "s:LFLAGS:LDFLAGS:" test/Makefile \ |
120 |
- || die "patching test/Makefile failed" |
121 |
- sed -i -e "s:\(\$(LIBS\):\$(LDFLAGS) \1:" enroll/Makefile \ |
122 |
- || die "patching enroll/Makefile failed" |
123 |
- |
124 |
- # change lib dir to $(get_libdir) |
125 |
- sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/$(get_libdir):" \ |
126 |
- src/Makefile || die "patching src/Makefile failed" |
127 |
- |
128 |
- # test.cfg is located in /etc/${PN}/test.cfg |
129 |
- sed -i -e \ |
130 |
- "s:\(^#define CONFIG_FILENAME.*\"\).*\(test.cfg\"\):\1/etc/${PN}/\2:" \ |
131 |
- test/test_app.c || die "patching test/test_app.c failed" |
132 |
- |
133 |
- # configure enroll.sh |
134 |
- sed -i -e "s:^\(OPENSSL_CONF\).*:\1=/etc/${PN}/openssl.cnf:" \ |
135 |
- -e "s:^\(RANDFILE\).*:\1=\/etc/${PN}/.rnd:" \ |
136 |
- bin/enroll.sh || die "patching bin/enroll.sh failed" |
137 |
- |
138 |
- # change enroll path |
139 |
- sed -i -e "s:^\(enroll\):/usr/lib/${PN}/\1:" \ |
140 |
- bin/enroll.sh || die "patching bin/enroll.sh failed" |
141 |
-} |
142 |
- |
143 |
-src_compile() { |
144 |
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C src build |
145 |
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C enroll linux |
146 |
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C test linux |
147 |
-} |
148 |
- |
149 |
-src_install() { |
150 |
- emake -C src INSTALL_PATH="${ED%/}"/usr install |
151 |
- |
152 |
- local DOCS=( README.txt RELNOTES.txt ) |
153 |
- einstalldocs |
154 |
- |
155 |
- insinto /etc/${PN} |
156 |
- doins bin/test.cfg bin/.rnd bin/openssl.cnf |
157 |
- |
158 |
- # install enroll and enroll.sh in lib dir to prevent executing them |
159 |
- local ospdir=/usr/$(get_libdir)/${PN} |
160 |
- dodir ${ospdir} |
161 |
- exeinto ${ospdir} |
162 |
- doexe bin/enroll bin/enroll.sh |
163 |
- |
164 |
- # use the symlink to execute enroll.sh |
165 |
- dosym ${ospdir}/enroll.sh /usr/bin/ospenroll |
166 |
- |
167 |
- newbin bin/test_app osptest |
168 |
-} |
169 |
- |
170 |
-pkg_postinst() { |
171 |
- elog "OSP test application is now available with 'osptest' command" |
172 |
- elog "OSP enroll application is now available with 'ospenroll' command" |
173 |
- elog "ospenroll is using /etc/${PN}/openssl.cnf as an openssl configuration" |
174 |
-} |
175 |
|
176 |
diff --git a/profiles/package.mask b/profiles/package.mask |
177 |
index c46537dcec3..39c0557092f 100644 |
178 |
--- a/profiles/package.mask |
179 |
+++ b/profiles/package.mask |
180 |
@@ -705,13 +705,6 @@ net-analyzer/ntopng |
181 |
net-analyzer/pmacct |
182 |
net-libs/nDPI |
183 |
|
184 |
-# Jaco Kroon <jaco@××××××.za> (2020-07-20) |
185 |
-# net-misc/asterisk was only consumer, dependency now removed (due to failures |
186 |
-# in osptoolkit build). No known users of USE=osplookup in net-misc/asterisk, |
187 |
-# and unknown usefulness. bugs #674346, #731250 |
188 |
-# Removal in 30 days. |
189 |
-net-libs/osptoolkit |
190 |
- |
191 |
# Jaco Kroon <jaco@××××××.za> (2020-07-20) |
192 |
# Asterisk 11 is EOL. All users should migrate to asterisk 13. |
193 |
# Removal unspecified, will remain for the foreseeable future. If you need |