1 |
commit: ec0d59e42a16886e85682525260b2c1d0b6b046d |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 28 16:59:28 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 28 16:59:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0d59e4 |
7 |
|
8 |
net-libs/liboping: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
11 |
|
12 |
net-libs/liboping/Manifest | 1 - |
13 |
.../liboping-1.8.0-remove-ncurses-automagic.patch | 94 ---------------------- |
14 |
net-libs/liboping/liboping-1.9.0.ebuild | 74 ----------------- |
15 |
3 files changed, 169 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest |
18 |
index e4c90b7dd09..03cd5bafd45 100644 |
19 |
--- a/net-libs/liboping/Manifest |
20 |
+++ b/net-libs/liboping/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
DIST liboping-1.10.0.tar.bz2 318150 BLAKE2B 2fa8719df251116c51aa93262697751df72b93368d543e5bb34668eb1bb07d7c0be143c943b32b23ee8d02e94ac2cc66f46f923ee4ab672b414ef16ce2f75acf SHA512 f1e9984cf0c1df89b29f7bc657c19a5439019db7643680744d8f353664b6a53070581f40b51e72f896c7df88799c6868257f6308e1a9d84b4d2a0666491214d8 |
23 |
-DIST liboping-1.9.0.tar.bz2 313884 BLAKE2B faf22b008bc60d8000b44d9fd3082eb6beafc0b1622c144b8b8b2b9fc79e8dc93380973c6c0a85726c2d4de55d9b94ed15dce7394a0b74d724cbd2554aaf25e1 SHA512 dcbadeea5154d4f4c31f806cae4ee5b8d5a8dfe243a9de4dad4b81b5b227538e1bb0c20afef121bd8ad841346da39fd5fb4710db981b89c11acc573c4f401c85 |
24 |
|
25 |
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 |
26 |
deleted file mode 100644 |
27 |
index 67e389ff139..00000000000 |
28 |
--- a/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch |
29 |
+++ /dev/null |
30 |
@@ -1,94 +0,0 @@ |
31 |
-configure: Make use of ncurses configurable |
32 |
- |
33 |
-https://github.com/octo/liboping/pull/15 |
34 |
- |
35 |
---- a/configure.ac |
36 |
-+++ b/configure.ac |
37 |
-@@ -206,27 +206,30 @@ AC_CHECK_FUNCS(nanosleep, [], |
38 |
- AC_MSG_ERROR(cannot find nanosleep))) |
39 |
- AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes") |
40 |
- |
41 |
--with_ncurses="no" |
42 |
--AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses.h, [with_ncurses="yes"], []) |
43 |
--if test "x$with_ncurses" = "xyes" |
44 |
--then |
45 |
-- have_ncursesw="no" |
46 |
-- have_ncurses="no" |
47 |
-- NCURSES_LIB="" |
48 |
-+AC_ARG_WITH(ncurses, AS_HELP_STRING([--with-ncurses], [Build oping CLI tool with ncurses support])) |
49 |
-+AS_IF([test "x$with_ncurses" != "xno"], [ |
50 |
-+ can_build_with_ncurses="no" |
51 |
-+ PKG_CHECK_MODULES([NCURSES], [ncursesw], [can_build_with_ncurses=yes], [ |
52 |
-+ PKG_CHECK_MODULES([NCURSES], [ncurses], [can_build_with_ncurses=yes], [ |
53 |
-+ AC_CHECK_LIB(ncursesw, mvwprintw, [NCURSES_LIBS="-lncursesw"; can_build_with_ncurses=yes], [ |
54 |
-+ AC_CHECK_LIB(ncurses, mvwprintw, [NCURSES_LIBS="-lncurses"; can_build_with_ncurses=yes]) |
55 |
-+ ]) |
56 |
-+ ]) |
57 |
-+ ]) |
58 |
- |
59 |
-- AC_CHECK_LIB(ncursesw, mvwprintw, [have_ncursesw="yes"], [have_ncursesw="no"]) |
60 |
-- AC_CHECK_LIB(ncurses, mvwprintw, [have_ncurses="yes"], [have_ncurses="no"]) |
61 |
-+ AS_IF([test "x$can_build_with_ncurses" = "xyes"], [ |
62 |
-+ AC_CHECK_HEADERS([ncursesw/curses.h ncursesw.h ncurses/curses.h ncurses.h], [can_build_with_ncurses=yes; break;], [can_build_with_ncurses=no]) |
63 |
-+ ]) |
64 |
- |
65 |
-- if test "x$have_ncursesw" = "xyes"; then |
66 |
-- NCURSES_LIB="-lncursesw" |
67 |
-- else if test "x$have_ncurses" = "xyes"; then |
68 |
-- NCURSES_LIB="-lncurses" |
69 |
-- else |
70 |
-- with_ncurses="no" |
71 |
-- fi; fi |
72 |
-- AC_SUBST(NCURSES_LIB) |
73 |
--fi |
74 |
--AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" = "xyes") |
75 |
-+ AS_IF([test "x$can_build_with_ncurses" = "xno" && test "x$with_ncurses" = "xyes"], [ |
76 |
-+ AC_MSG_ERROR([ncurses not found but explicit enabled]) |
77 |
-+ ], |
78 |
-+ [test "x$can_build_with_ncurses" = "xno"], [ |
79 |
-+ AC_MSG_WARN([Will not build oping with ncurses support -- no suiteable ncurses installation found]) |
80 |
-+ ]) |
81 |
-+]) |
82 |
-+ |
83 |
-+AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" != "xno" && test "x$can_build_with_ncurses" = "xyes") |
84 |
- |
85 |
- AC_FUNC_STRERROR_R |
86 |
- |
87 |
---- a/src/Makefile.am |
88 |
-+++ b/src/Makefile.am |
89 |
-@@ -43,8 +43,8 @@ if BUILD_WITH_LIBNCURSES |
90 |
- bin_PROGRAMS += noping |
91 |
- |
92 |
- noping_SOURCES = oping.c |
93 |
--noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1 |
94 |
--noping_LDADD = liboping.la -lm $(NCURSES_LIB) |
95 |
-+noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1 $(NCURSES_CFLAGS) |
96 |
-+noping_LDADD = liboping.la -lm $(NCURSES_LIBS) |
97 |
- if BUILD_WITH_LIBRT |
98 |
- noping_LDADD += -lrt |
99 |
- endif |
100 |
---- a/src/oping.c |
101 |
-+++ b/src/oping.c |
102 |
-@@ -82,11 +82,17 @@ |
103 |
- /* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */ |
104 |
- # define _X_OPEN_SOURCE_EXTENDED |
105 |
- |
106 |
--# if HAVE_NCURSESW_NCURSES_H |
107 |
--# include <ncursesw/ncurses.h> |
108 |
--# elif HAVE_NCURSES_H |
109 |
-+#if defined HAVE_NCURSESW_CURSES_H |
110 |
-+# include <ncursesw/curses.h> |
111 |
-+#elif defined HAVE_NCURSESW_H |
112 |
-+# include <ncursesw.h> |
113 |
-+#elif defined HAVE_NCURSES_CURSES_H |
114 |
-+# include <ncurses/curses.h> |
115 |
-+#elif defined HAVE_NCURSES_H |
116 |
- # include <ncurses.h> |
117 |
--# endif |
118 |
-+#else |
119 |
-+# error "SysV or X/Open-compatible Curses header file required" |
120 |
-+#endif |
121 |
- |
122 |
- # define OPING_GREEN 1 |
123 |
- # define OPING_YELLOW 2 |
124 |
--- |
125 |
|
126 |
diff --git a/net-libs/liboping/liboping-1.9.0.ebuild b/net-libs/liboping/liboping-1.9.0.ebuild |
127 |
deleted file mode 100644 |
128 |
index 789d2a74926..00000000000 |
129 |
--- a/net-libs/liboping/liboping-1.9.0.ebuild |
130 |
+++ /dev/null |
131 |
@@ -1,74 +0,0 @@ |
132 |
-# Copyright 1999-2018 Gentoo Foundation |
133 |
-# Distributed under the terms of the GNU General Public License v2 |
134 |
- |
135 |
-EAPI="6" |
136 |
- |
137 |
-inherit autotools fcaps perl-module |
138 |
- |
139 |
-DESCRIPTION="Protocol independent ANSI-C ping library and command line utility" |
140 |
-HOMEPAGE="https://noping.cc/" |
141 |
-SRC_URI="https://noping.cc/files/${P}.tar.bz2" |
142 |
- |
143 |
-LICENSE="LGPL-2.1 GPL-2" |
144 |
-SLOT="0/0.2" |
145 |
-KEYWORDS="alpha amd64 arm x86" |
146 |
-IUSE="+filecaps ncurses perl" |
147 |
- |
148 |
-DEPEND="ncurses? ( sys-libs/ncurses:0= )" |
149 |
-RDEPEND=${DEPEND} |
150 |
- |
151 |
-PATCHES=( |
152 |
- "${FILESDIR}/${PN}-1.6.2-nouidmagic.patch" |
153 |
- "${FILESDIR}/${PN}-1.8.0-remove-ncurses-automagic.patch" |
154 |
-) |
155 |
- |
156 |
-src_prepare() { |
157 |
- default |
158 |
- |
159 |
- eautoreconf |
160 |
-} |
161 |
- |
162 |
-src_configure() { |
163 |
- econf \ |
164 |
- $(use_with perl perl-bindings INSTALLDIRS=vendor) \ |
165 |
- $(use_with ncurses) |
166 |
-} |
167 |
- |
168 |
-src_test() { |
169 |
- if use perl; then |
170 |
- pushd bindings/perl >/dev/null || die |
171 |
- perl-module_src_test |
172 |
- popd >/dev/null || die |
173 |
- fi |
174 |
-} |
175 |
- |
176 |
-src_install() { |
177 |
- default |
178 |
- |
179 |
- find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die |
180 |
-} |
181 |
- |
182 |
-pkg_postinst() { |
183 |
- if use filecaps; then |
184 |
- local _caps_str="CAP_NET_RAW" |
185 |
- _files=( "${EROOT%/}/usr/bin/oping") |
186 |
- |
187 |
- if use ncurses; then |
188 |
- _files+=( "${EROOT%/}/usr/bin/noping") |
189 |
- fi |
190 |
- |
191 |
- fcaps "${_caps_str}" "${_files[@]}" |
192 |
- |
193 |
- elog "Capabilities for" |
194 |
- elog "" |
195 |
- |
196 |
- local _file= |
197 |
- for _file in "${_files[@]}"; do |
198 |
- elog " ${_file}" |
199 |
- done |
200 |
- |
201 |
- elog "" |
202 |
- elog "set to ${_caps_str}+EP due to set 'filecaps' USE flag." |
203 |
- elog |
204 |
- fi |
205 |
-} |