3 files changed, 0 insertions, 169 deletions
diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest
index e4c90b7dd09b..03cd5bafd458 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -1,2 +1 @@
 DIST liboping-1.10.0.tar.bz2 318150 BLAKE2B 2fa8719df251116c51aa93262697751df72b93368d543e5bb34668eb1bb07d7c0be143c943b32b23ee8d02e94ac2cc66f46f923ee4ab672b414ef16ce2f75acf SHA512 f1e9984cf0c1df89b29f7bc657c19a5439019db7643680744d8f353664b6a53070581f40b51e72f896c7df88799c6868257f6308e1a9d84b4d2a0666491214d8
-DIST liboping-1.9.0.tar.bz2 313884 BLAKE2B faf22b008bc60d8000b44d9fd3082eb6beafc0b1622c144b8b8b2b9fc79e8dc93380973c6c0a85726c2d4de55d9b94ed15dce7394a0b74d724cbd2554aaf25e1 SHA512 dcbadeea5154d4f4c31f806cae4ee5b8d5a8dfe243a9de4dad4b81b5b227538e1bb0c20afef121bd8ad841346da39fd5fb4710db981b89c11acc573c4f401c85
diff --git a/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch b/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch
deleted file mode 100644
index 67e389ff139c..000000000000
--- a/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-configure: Make use of ncurses configurable
-
-https://github.com/octo/liboping/pull/15
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -206,27 +206,30 @@ AC_CHECK_FUNCS(nanosleep, [],
- 		AC_MSG_ERROR(cannot find nanosleep)))
- AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes")
- 
--with_ncurses="no"
--AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses.h, [with_ncurses="yes"], [])
--if test "x$with_ncurses" = "xyes"
--then
--	have_ncursesw="no"
--	have_ncurses="no"
--	NCURSES_LIB=""
-+AC_ARG_WITH(ncurses, AS_HELP_STRING([--with-ncurses], [Build oping CLI tool with ncurses support]))
-+AS_IF([test "x$with_ncurses" != "xno"], [
-+	can_build_with_ncurses="no"
-+	PKG_CHECK_MODULES([NCURSES], [ncursesw], [can_build_with_ncurses=yes], [
-+		PKG_CHECK_MODULES([NCURSES], [ncurses], [can_build_with_ncurses=yes], [
-+			AC_CHECK_LIB(ncursesw, mvwprintw, [NCURSES_LIBS="-lncursesw"; can_build_with_ncurses=yes], [
-+				AC_CHECK_LIB(ncurses, mvwprintw, [NCURSES_LIBS="-lncurses"; can_build_with_ncurses=yes])
-+			])
-+		])
-+	])
- 
--	AC_CHECK_LIB(ncursesw, mvwprintw, [have_ncursesw="yes"], [have_ncursesw="no"])
--	AC_CHECK_LIB(ncurses, mvwprintw, [have_ncurses="yes"], [have_ncurses="no"])
-+	AS_IF([test "x$can_build_with_ncurses" = "xyes"], [
-+		AC_CHECK_HEADERS([ncursesw/curses.h ncursesw.h ncurses/curses.h ncurses.h], [can_build_with_ncurses=yes; break;], [can_build_with_ncurses=no])
-+	])
- 
--	if test "x$have_ncursesw" = "xyes"; then
--		NCURSES_LIB="-lncursesw"
--	else if test "x$have_ncurses" = "xyes"; then
--		NCURSES_LIB="-lncurses"
--	else
--		with_ncurses="no"
--	fi; fi
--	AC_SUBST(NCURSES_LIB)
--fi
--AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" = "xyes")
-+	AS_IF([test "x$can_build_with_ncurses" = "xno" && test "x$with_ncurses" = "xyes"], [
-+		AC_MSG_ERROR([ncurses not found but explicit enabled])
-+	],
-+	[test "x$can_build_with_ncurses" = "xno"], [
-+		AC_MSG_WARN([Will not build oping with ncurses support -- no suiteable ncurses installation found])
-+	])
-+])
-+
-+AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" != "xno" && test "x$can_build_with_ncurses" = "xyes")
- 
- AC_FUNC_STRERROR_R
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -43,8 +43,8 @@ if BUILD_WITH_LIBNCURSES
- bin_PROGRAMS += noping
- 
- noping_SOURCES = oping.c
--noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1
--noping_LDADD = liboping.la -lm $(NCURSES_LIB)
-+noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1 $(NCURSES_CFLAGS)
-+noping_LDADD = liboping.la -lm $(NCURSES_LIBS)
- if BUILD_WITH_LIBRT
- noping_LDADD += -lrt
- endif
---- a/src/oping.c
-+++ b/src/oping.c
-@@ -82,11 +82,17 @@
- /* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
- # define _X_OPEN_SOURCE_EXTENDED
- 
--# if HAVE_NCURSESW_NCURSES_H
--#  include <ncursesw/ncurses.h>
--# elif HAVE_NCURSES_H
-+#if defined HAVE_NCURSESW_CURSES_H
-+#  include <ncursesw/curses.h>
-+#elif defined HAVE_NCURSESW_H
-+#  include <ncursesw.h>
-+#elif defined HAVE_NCURSES_CURSES_H
-+#  include <ncurses/curses.h>
-+#elif defined HAVE_NCURSES_H
- #  include <ncurses.h>
--# endif
-+#else
-+#  error "SysV or X/Open-compatible Curses header file required"
-+#endif
- 
- # define OPING_GREEN 1
- # define OPING_YELLOW 2
--- 
diff --git a/net-libs/liboping/liboping-1.9.0.ebuild b/net-libs/liboping/liboping-1.9.0.ebuild
deleted file mode 100644
index 789d2a749265..000000000000
--- a/net-libs/liboping/liboping-1.9.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools fcaps perl-module
-
-DESCRIPTION="Protocol independent ANSI-C ping library and command line utility"
-HOMEPAGE="https://noping.cc/"
-SRC_URI="https://noping.cc/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/0.2"
-KEYWORDS="alpha amd64 arm x86"
-IUSE="+filecaps ncurses perl"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch"
-	"${FILESDIR}/${PN}-1.8.0-remove-ncurses-automagic.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
-		$(use_with ncurses)
-}
-
-src_test() {
-	if use perl; then
-		pushd bindings/perl >/dev/null || die
-		perl-module_src_test
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	if use filecaps; then
-		local _caps_str="CAP_NET_RAW"
-		_files=( "${EROOT%/}/usr/bin/oping")
-
-		if use ncurses; then
-			_files+=( "${EROOT%/}/usr/bin/noping")
-		fi
-
-		fcaps "${_caps_str}" "${_files[@]}"
-
-		elog "Capabilities for"
-		elog ""
-
-		local _file=
-		for _file in "${_files[@]}"; do
-			elog "  ${_file}"
-		done
-
-		elog ""
-		elog "set to ${_caps_str}+EP due to set 'filecaps' USE flag."
-		elog
-	fi
-}