commit: 2ee800eadf7606dceb161c1a4823641ca5b12812 Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> AuthorDate: Fri Aug 21 11:53:16 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 21 12:00:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee800ea
net-libs/osptoolkit: remove last rited package Closes: https://bugs.gentoo.org/731250 Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/17202 Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/osptoolkit/Manifest | 1 - .../osptoolkit/files/osptoolkit-4.13.0-gcc5.patch | 17 ---- net-libs/osptoolkit/metadata.xml | 11 --- net-libs/osptoolkit/osptoolkit-4.13.0.ebuild | 97 ---------------------- profiles/package.mask | 7 -- 5 files changed, 133 deletions(-) diff --git a/net-libs/osptoolkit/Manifest b/net-libs/osptoolkit/Manifest deleted file mode 100644 index 5e9949c6d15..00000000000 --- a/net-libs/osptoolkit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST OSPToolkit-4.13.0.tar.gz 422064 BLAKE2B 13afe4d30a96b7cd59cf4be6116f35f5edf30b70046a7a203e89140bd0b7f338b8d1478fe6a90a7a17b6f93b0c6a8579f43b209119a8c6fdb08dff26e5c13262 SHA512 35e54350cdecf0367af47986a7c3eddfcdf924b0d6e7c52ccccdecd96d3d64ba7f8d8d266cc4d26708f0741e40eeff80db4690272702c35d4e5bafba745776bf diff --git a/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch b/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch deleted file mode 100644 index a06ffeecc91..00000000000 --- a/net-libs/osptoolkit/files/osptoolkit-4.13.0-gcc5.patch +++ /dev/null @@ -1,17 +0,0 @@ -Starting with GCC 5, the __builtin_isnan() fucntion requires proper overloaded types, even in C: -* osptransapi.c:1040:13: error: non-floating-point argument in call to function ‘__builtin_isnan’ -* OSPM_ISNAN(metrics.mean, tnisnan); -See also: -https://bugs.gentoo.org/show_bug.cgi?id=581058 - ---- a/src/osptransapi.c -+++ b/src/osptransapi.c -@@ -983,7 +983,7 @@ - /* sample mean - have to cast Samples to a float to get some precision on the mean */ - mean = ((metrics.mean * currnumber) + (ospvMean * ospvSamples)) / (float)metrics.samples; - -- OSPM_ISNAN(metrics.mean, tnisnan); -+ OSPM_ISNAN((double)metrics.mean, tnisnan); - - if (tnisnan) { - errcode = OSPC_ERR_TRAN_INVALID_CALC; diff --git a/net-libs/osptoolkit/metadata.xml b/net-libs/osptoolkit/metadata.xml deleted file mode 100644 index 8e8837dfca6..00000000000 --- a/net-libs/osptoolkit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Tony Vroon</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">osp-toolkit</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild b/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild deleted file mode 100644 index 49bf8997723..00000000000 --- a/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -S_DATE="20161107" - -DESCRIPTION="Open Settlement Protocol development kit" -HOMEPAGE="http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/OSP%20Toolkit%20Documents.htm" -SRC_URI="mirror://sourceforge/osp-toolkit/OSPToolkit-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="dev-libs/openssl:0=" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/TK-${PV//./_}-${S_DATE} - -# TODO: -# generate a shared lib - -# NOTES: -# osptest isn't a test that can be used for src_test, it's part of the toolkit - -PATCHES=( - "${FILESDIR}"/${PN}-4.13.0-gcc5.patch -) - -src_prepare() { - default - - # remove -O and use users CFLAGS, see bug 241034 - sed -i -e "s/ -O//" -e "s/^CFLAGS =/CFLAGS +=/" src/Makefile test/Makefile \ - enroll/Makefile || die "patching Makefiles failed" - - # use users LDFLAGS - sed -i -e "s:LFLAGS:LDFLAGS:" test/Makefile \ - || die "patching test/Makefile failed" - sed -i -e "s:\(\$(LIBS\):\$(LDFLAGS) \1:" enroll/Makefile \ - || die "patching enroll/Makefile failed" - - # change lib dir to $(get_libdir) - sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/$(get_libdir):" \ - src/Makefile || die "patching src/Makefile failed" - - # test.cfg is located in /etc/${PN}/test.cfg - sed -i -e \ - "s:\(^#define CONFIG_FILENAME.*\"\).*\(test.cfg\"\):\1/etc/${PN}/\2:" \ - test/test_app.c || die "patching test/test_app.c failed" - - # configure enroll.sh - sed -i -e "s:^\(OPENSSL_CONF\).*:\1=/etc/${PN}/openssl.cnf:" \ - -e "s:^\(RANDFILE\).*:\1=\/etc/${PN}/.rnd:" \ - bin/enroll.sh || die "patching bin/enroll.sh failed" - - # change enroll path - sed -i -e "s:^\(enroll\):/usr/lib/${PN}/\1:" \ - bin/enroll.sh || die "patching bin/enroll.sh failed" -} - -src_compile() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C src build - emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C enroll linux - emake CC="$(tc-getCC)" AR="$(tc-getAR)" -C test linux -} - -src_install() { - emake -C src INSTALL_PATH="${ED%/}"/usr install - - local DOCS=( README.txt RELNOTES.txt ) - einstalldocs - - insinto /etc/${PN} - doins bin/test.cfg bin/.rnd bin/openssl.cnf - - # install enroll and enroll.sh in lib dir to prevent executing them - local ospdir=/usr/$(get_libdir)/${PN} - dodir ${ospdir} - exeinto ${ospdir} - doexe bin/enroll bin/enroll.sh - - # use the symlink to execute enroll.sh - dosym ${ospdir}/enroll.sh /usr/bin/ospenroll - - newbin bin/test_app osptest -} - -pkg_postinst() { - elog "OSP test application is now available with 'osptest' command" - elog "OSP enroll application is now available with 'ospenroll' command" - elog "ospenroll is using /etc/${PN}/openssl.cnf as an openssl configuration" -} diff --git a/profiles/package.mask b/profiles/package.mask index c46537dcec3..39c0557092f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -705,13 +705,6 @@ net-analyzer/ntopng net-analyzer/pmacct net-libs/nDPI -# Jaco Kroon <[email protected]> (2020-07-20) -# net-misc/asterisk was only consumer, dependency now removed (due to failures -# in osptoolkit build). No known users of USE=osplookup in net-misc/asterisk, -# and unknown usefulness. bugs #674346, #731250 -# Removal in 30 days. -net-libs/osptoolkit - # Jaco Kroon <[email protected]> (2020-07-20) # Asterisk 11 is EOL. All users should migrate to asterisk 13. # Removal unspecified, will remain for the foreseeable future. If you need
