1 |
commit: 990ec09784b7ccd0015f66b9e6d9051051f97f7b |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 18:38:40 2015 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 4 18:38:57 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=990ec097 |
7 |
|
8 |
net-analyzer/echoping: Do not copy ltmain.sh (bug #562230 by Toralf Förster). |
9 |
|
10 |
Package-Manager: portage-2.2.22 |
11 |
|
12 |
net-analyzer/echoping/Manifest | 1 - |
13 |
net-analyzer/echoping/echoping-6.0.2-r2.ebuild | 60 ---------------------- |
14 |
.../echoping/echoping-6.0.2_p434-r1.ebuild | 1 - |
15 |
net-analyzer/echoping/echoping-6.0.2_p434.ebuild | 1 - |
16 |
.../echoping-6.0.2-fix_implicit_declarations.patch | 20 -------- |
17 |
.../echoping/files/echoping-6.0.2-gnutls.patch | 41 --------------- |
18 |
6 files changed, 124 deletions(-) |
19 |
|
20 |
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest |
21 |
index a5a95da..25fef68 100644 |
22 |
--- a/net-analyzer/echoping/Manifest |
23 |
+++ b/net-analyzer/echoping/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST echoping-6.0.2.tar.gz 1660983 SHA256 1dfa4c45bf461b2379ff91773ed7136176e2abac9e85c26bc9654942b5155eac SHA512 ca9a38c3be9da283e73a7a1b13ab003dca6a2ee317e2961325f3e6803f132ae2f5e4206d946564915c573f21f9c3e9641d61f6b3ae5806bbaa92c2f30f1e5e22 WHIRLPOOL 9140d20d82ed1c38df91d8905fb678c1ca717af518b374c3379db285662d55e70c8da5bb227c4f47a4c34f649c686037636c024a38d1109cd939f6974b274e15 |
26 |
DIST echoping-6.0.2_p434.tar.gz 74568 SHA256 152a4a9d2a3962fa8cb95eeb29b5d22a7039d4408f5ba22286259856f095baf7 SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799 WHIRLPOOL cae10459766311ded4f6459e519461fb91de7dd9429679927c3955a5a9b09b9b9a9706947b3a5c1495805367c91cf2035d3154a3ff180241782deec304eb8aaf |
27 |
|
28 |
diff --git a/net-analyzer/echoping/echoping-6.0.2-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 58c1021..0000000 |
31 |
--- a/net-analyzer/echoping/echoping-6.0.2-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,60 +0,0 @@ |
34 |
-# Copyright 1999-2014 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
- |
38 |
-EAPI="4" |
39 |
- |
40 |
-inherit eutils autotools |
41 |
- |
42 |
-DESCRIPTION="Small program to test performances of remote servers" |
43 |
-HOMEPAGE="http://echoping.sourceforge.net/" |
44 |
-SRC_URI="mirror://sourceforge/echoping/${P}.tar.gz" |
45 |
-LICENSE="GPL-2" |
46 |
- |
47 |
-SLOT="0" |
48 |
-KEYWORDS="amd64 ~hppa x86" |
49 |
-IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap" |
50 |
-RESTRICT="test" |
51 |
- |
52 |
-RDEPEND="idn? ( net-dns/libidn ) |
53 |
- postgres? ( dev-db/postgresql ) |
54 |
- ldap? ( net-nds/openldap ) |
55 |
- ssl? ( |
56 |
- gnutls? ( >=net-libs/gnutls-1.0.17 ) |
57 |
- !gnutls? ( >=dev-libs/openssl-0.9.7d ) |
58 |
- )" |
59 |
-DEPEND="${RDEPEND} |
60 |
- >=sys-devel/libtool-2" |
61 |
- |
62 |
-REQUIRED_USE="gnutls? ( ssl )" |
63 |
- |
64 |
-DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO ) |
65 |
- |
66 |
-src_prepare() { |
67 |
- # bug 279525: |
68 |
- epatch "${FILESDIR}/${P}-gnutls.patch" |
69 |
- |
70 |
- epatch "${FILESDIR}/${P}-fix_implicit_declarations.patch" |
71 |
- |
72 |
- rm -f ltmain.sh |
73 |
- cp /usr/share/libtool/config/ltmain.sh . |
74 |
- local i |
75 |
- for i in . plugins/ plugins/*/; do |
76 |
- pushd "${i}" > /dev/null |
77 |
- eautoreconf |
78 |
- popd > /dev/null |
79 |
- done |
80 |
-} |
81 |
- |
82 |
-src_configure() { |
83 |
- econf \ |
84 |
- --config-cache \ |
85 |
- --disable-ttcp \ |
86 |
- $(use_enable http) \ |
87 |
- $(use_enable icp) \ |
88 |
- $(use_with idn libidn) \ |
89 |
- $(use_enable smtp) \ |
90 |
- $(use_enable tos) \ |
91 |
- $(use_enable priority) \ |
92 |
- $(usex gnutls $(use_with gnutls) $(use_with ssl)) |
93 |
-} |
94 |
|
95 |
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild |
96 |
index f96eb28..f0c6bf4 100644 |
97 |
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild |
98 |
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild |
99 |
@@ -32,7 +32,6 @@ DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO ) |
100 |
src_prepare() { |
101 |
epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch |
102 |
|
103 |
- cp /usr/share/libtool/config/ltmain.sh . |
104 |
eautoreconf |
105 |
} |
106 |
|
107 |
|
108 |
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434.ebuild |
109 |
index 5a5cb1b..4245e74 100644 |
110 |
--- a/net-analyzer/echoping/echoping-6.0.2_p434.ebuild |
111 |
+++ b/net-analyzer/echoping/echoping-6.0.2_p434.ebuild |
112 |
@@ -32,7 +32,6 @@ DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO ) |
113 |
src_prepare() { |
114 |
epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch |
115 |
|
116 |
- cp /usr/share/libtool/config/ltmain.sh . |
117 |
eautoreconf |
118 |
} |
119 |
|
120 |
|
121 |
diff --git a/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch b/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch |
122 |
deleted file mode 100644 |
123 |
index 1b0bce8..0000000 |
124 |
--- a/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch |
125 |
+++ /dev/null |
126 |
@@ -1,20 +0,0 @@ |
127 |
---- echoping.h |
128 |
-+++ echoping.h 2009-09-15 00:55:43.000000000 +0200 |
129 |
-@@ -198,6 +198,7 @@ |
130 |
- #endif |
131 |
- /* util.c */ |
132 |
- char *random_string (); |
133 |
-+char *to_upper(); |
134 |
- void tvsub (); |
135 |
- void tvadd (); |
136 |
- void tvavg (); |
137 |
---- plugins/ldap/ldap.c |
138 |
-+++ plugins/ldap/ldap.c |
139 |
-@@ -9,6 +9,7 @@ |
140 |
- #include "../../config.h" |
141 |
- #include "config.h" |
142 |
- #endif |
143 |
-+#define LDAP_DEPRECATED 1 |
144 |
- #include <ldap.h> |
145 |
- |
146 |
- const char *request = NULL; |
147 |
|
148 |
diff --git a/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch b/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch |
149 |
deleted file mode 100644 |
150 |
index b5be2d9..0000000 |
151 |
--- a/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch |
152 |
+++ /dev/null |
153 |
@@ -1,41 +0,0 @@ |
154 |
-Date: 2009-06-30 14:26 |
155 |
-Sender: bortz |
156 |
- |
157 |
-The patch by ametzler seems indeed to work (thanks to him). I've committed |
158 |
-it (r426) and will make a new release soon. |
159 |
- |
160 |
-http://sourceforge.net/tracker/index.php?func=detail&aid=2811861&group_id=4581&atid=104581 |
161 |
- |
162 |
- |
163 |
---- trunk/SRC/configure.ac 2009/06/30 14:18:15 425 |
164 |
-+++ trunk/SRC/configure.ac 2009/06/30 14:19:07 426 |
165 |
-@@ -92,14 +92,21 @@ |
166 |
- AC_ARG_WITH(gnutls, |
167 |
- [ --with-gnutls[=DIR] SSL/TLS crypt support (needs GNU TLS), the argument DIR should not be necessary],dnl |
168 |
- [if test "$withval" != "no"; then |
169 |
-- AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) |
170 |
-- GNUTLS=1 |
171 |
-- CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`" |
172 |
-- LDFLAGS="${LDFLAGS} `libgnutls-config --libs`" |
173 |
-- if test "$withval" != "yes"; then |
174 |
-- GNUTLSROOT=$withval |
175 |
-- LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib" |
176 |
-- CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include" |
177 |
-+ if test "$withval" = "yes"; then |
178 |
-+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], |
179 |
-+ [ |
180 |
-+ echo "GnuTLS found" |
181 |
-+ AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) |
182 |
-+ GNUTLS=1 |
183 |
-+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" |
184 |
-+ LIBS="$LIBS $LIBGNUTLS_LIBS" |
185 |
-+ ],) |
186 |
-+ else |
187 |
-+ AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) |
188 |
-+ GNUTLS=1 |
189 |
-+ GNUTLSROOT=$withval |
190 |
-+ LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib -lgnutls" |
191 |
-+ CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include" |
192 |
- fi |
193 |
- fi], |
194 |
- dnl Default: disable it |