Revision bump to apply >net-libs/gnutls-2.7 patch (bug #279525).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 117 insertions, 2 deletions

diff --git a/net-analyzer/echoping/ChangeLog b/net-analyzer/echoping/ChangeLog
index f8b5d5925de3..daf1fb120480 100644
--- a/net-analyzer/echoping/ChangeLog
+++ b/net-analyzer/echoping/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/echoping
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.17 2009/07/02 13:21:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.18 2009/07/29 03:09:56 jer Exp $
+
+*echoping-6.0.2-r1 (29 Jul 2009)
+
+  29 Jul 2009; Jeroen Roovers <jer@gentoo.org> +echoping-6.0.2-r1.ebuild,
+  +files/echoping-6.0.2-gnutls.patch:
+  Revision bump to apply >net-libs/gnutls-2.7 patch (bug #279525).
 
   02 Jul 2009; Jeroen Roovers <jer@gentoo.org> echoping-6.0.2.ebuild:
   Restrict testing (bug #276210). Fix one grammatical error.
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index a477826af4db..c7df0e9a995e 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -1,4 +1,6 @@
+AUX echoping-6.0.2-gnutls.patch 1400 RMD160 447a0ab0dd0cfbc500f1c59f9a96e8ff4f15ce33 SHA1 fe81da8b8410daf031f37274d5c3515f3044c058 SHA256 c4e5e755b023688f4d6f3fbf97d8d6a47b52f9c749ddc6380ca19d2fad3632c7
 DIST echoping-6.0.2.tar.gz 1660983 RMD160 73ee80f4b666fde3a0e02589388e485c487005fc SHA1 8b414d1dbc5a0f21a7f2cccb0138aec13117a1a4 SHA256 1dfa4c45bf461b2379ff91773ed7136176e2abac9e85c26bc9654942b5155eac
+EBUILD echoping-6.0.2-r1.ebuild 1652 RMD160 32a3e6ec3f30b0364f3aa2349383fd2faf79ebd7 SHA1 525714c0bf40f5377feb864fa07355777b3f2f11 SHA256 77134a8884c3550fbd28fac633b34572ee8d11074ea47bdcd0acf8de144655a4
 EBUILD echoping-6.0.2.ebuild 1493 RMD160 90a88e5971965b4c60848e00e6f2c8e0cf0ee058 SHA1 763017a2244a6099dc716449069b37422bde8156 SHA256 eb82436d37982ad34f04f4933b606a5e249c6f28310c19980e203815bdb34e25
-MISC ChangeLog 2610 RMD160 c66482578494426d7003b26d5daf7978b2fa26f0 SHA1 e8b0560a407a988563a65aba4d9f2b0fc2640bfd SHA256 2d45dc8d089a9c93bd716454805933a868e316c46e6ba2a5b7af4f01b8c7350a
+MISC ChangeLog 2824 RMD160 9cc733059afbea4064d0c9f83759afed954a4b04 SHA1 bf5951117b07e0bbb669c5006407cfbd3894baa7 SHA256 9876070e8e55df4066ea0416d37b17c9c8aad0cca92963fad0bbb0ad2fadc690
 MISC metadata.xml 491 RMD160 21855ac5d3da8d39bce3ec74e38e5ef5c9c3a5db SHA1 8712318304af3921eb3317cbaaabb3e96ae42532 SHA256 dc57f4b8ee6fede65833916de7e52274f349f361d0d023c706296ab285505d01
diff --git a/net-analyzer/echoping/echoping-6.0.2-r1.ebuild b/net-analyzer/echoping/echoping-6.0.2-r1.ebuild
new file mode 100644
index 000000000000..d5cfa6b35013
--- /dev/null
+++ b/net-analyzer/echoping/echoping-6.0.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2-r1.ebuild,v 1.1 2009/07/29 03:09:56 jer Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="echoping is a small program to test performances of remote servers"
+HOMEPAGE="http://echoping.sourceforge.net/"
+SRC_URI="mirror://sourceforge/echoping/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
+RESTRICT="test"
+
+DEPEND="gnutls? ( >=net-libs/gnutls-1.0.17 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	idn? ( net-dns/libidn )
+	postgres? ( virtual/postgresql-server )
+	ldap? ( net-nds/openldap )"
+
+src_prepare() {
+	# bug 279525:
+	epatch "${FILESDIR}/${P}-gnutls.patch"
+	local i
+	for i in . plugins/ plugins/*/; do
+		cd "${i}"
+		eautoreconf
+		cd "${S}"
+	done
+}
+
+src_configure() {
+	local my_ssl_conf
+	if use gnutls; then
+		if use ssl; then
+			ewarn "You've enabled both ssl and gnutls USE flags but ${PN} can"
+			ewarn "not be built with both, see bug #141782. Using gnutls only."
+		fi
+		my_ssl_conf="${myconf} $(use_with gnutls)"
+	elif use ssl; then
+		my_ssl_conf="${myconf} $(use_with ssl)"
+	fi
+
+	econf \
+		--config-cache \
+		--disable-ttcp \
+		${my_ssl_conf} \
+		$(use_enable http)  \
+		$(use_enable icp) \
+		$(use_with idn libidn) \
+		$(use_enable smtp) \
+		$(use_enable tos) \
+		$(use_enable priority) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	# They are not installed by make install
+	dodoc README AUTHORS ChangeLog DETAILS NEWS TODO
+}
diff --git a/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch b/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch
new file mode 100644
index 000000000000..b5be2d989776
--- /dev/null
+++ b/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch
@@ -0,0 +1,41 @@
+Date: 2009-06-30 14:26
+Sender: bortz 
+
+The patch by ametzler seems indeed to work (thanks to him). I've committed
+it (r426) and will make a new release soon.
+
+http://sourceforge.net/tracker/index.php?func=detail&aid=2811861&group_id=4581&atid=104581
+
+
+--- trunk/SRC/configure.ac	2009/06/30 14:18:15	425
++++ trunk/SRC/configure.ac	2009/06/30 14:19:07	426
+@@ -92,14 +92,21 @@
+ AC_ARG_WITH(gnutls,
+  [  --with-gnutls[=DIR]   SSL/TLS crypt support (needs GNU TLS), the argument DIR should not be necessary],dnl
+  [if test "$withval" != "no"; then
+-   AC_DEFINE(GNUTLS,,[Crypto (TLS) support])
+-   GNUTLS=1
+-   CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`"
+-   LDFLAGS="${LDFLAGS} `libgnutls-config --libs`"
+-   if test "$withval" != "yes"; then
+-	GNUTLSROOT=$withval
+-	LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib"
+-        CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include"  
++  if test "$withval" = "yes"; then
++      PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0],
++      [
++      echo "GnuTLS found"
++      AC_DEFINE(GNUTLS,,[Crypto (TLS) support])
++      GNUTLS=1
++      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
++      LIBS="$LIBS $LIBGNUTLS_LIBS"
++      ],)
++      else
++      AC_DEFINE(GNUTLS,,[Crypto (TLS) support])
++      GNUTLS=1
++      GNUTLSROOT=$withval
++      LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib -lgnutls"
++      CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include"
+    fi
+  fi],
+  dnl Default: disable it