public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-analyzer/echoping: echoping-6.0.2.ebuild ChangeLog
@ 2008-01-26 10:36 Peter Volkov (pva)
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2008-01-26 10:36 UTC (permalink / raw
  To: gentoo-commits

pva         08/01/26 10:36:53

  Modified:             echoping-6.0.2.ebuild ChangeLog
  Log:
  Do not die if ssl and gnutls are enabled, better chose gnutls, thank Paul Tobias <tobias.pal AT gmail.com> for patch, bug #141782.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.3                  net-analyzer/echoping/echoping-6.0.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?r1=1.2&r2=1.3

Index: echoping-6.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- echoping-6.0.2.ebuild	6 Sep 2007 16:25:35 -0000	1.2
+++ echoping-6.0.2.ebuild	26 Jan 2008 10:36:52 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.2 2007/09/06 16:25:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild,v 1.3 2008/01/26 10:36:52 pva Exp $
 
 inherit eutils
 
@@ -19,27 +19,29 @@
 	postgres? ( dev-db/postgresql )
 	ldap? ( net-nds/openldap )"
 
-pkg_setup() {
-	# bug 141782 - conflicting USE flags - ssl and gnutls
-	if use ssl && use gnutls ; then
-		eerror "You cannot emerge net-analyzer/echoping with both"
-		eerror "ssl and gnutls USE flags set. Please choose one."
-		die "echoping cannot use both ssl and gnutls at once"
+src_compile() {
+	local my_ssl_conf
+	if use gnutls; then
+		if use ssl; then
+			ewarn "You've enabled both ssl and gnutls USE flags but ${PN} could"
+			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
-}
 
-src_compile() {
 	econf \
 		--config-cache \
 		--disable-ttcp \
-		$(use_with gnutls) \
+		${my_ssl_conf} \
 		$(use_enable http)  \
 		$(use_enable icp) \
 		$(use_with idn libidn) \
 		$(use_enable smtp) \
 		$(use_enable tos) \
 		$(use_enable priority) \
-		$(use_with ssl) || die "econf failed"
+		|| die "econf failed"
 
 	emake || die "emake failed"
 }



1.14                 net-analyzer/echoping/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	6 Sep 2007 16:30:31 -0000	1.13
+++ ChangeLog	26 Jan 2008 10:36:52 -0000	1.14
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/echoping
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.13 2007/09/06 16:30:31 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.14 2008/01/26 10:36:52 pva Exp $
+
+  26 Jan 2008; <pva@gentoo.org> echoping-6.0.2.ebuild:
+  Do not die if ssl and gnutls are enabled, better chose gnutls, thank Paul
+  Tobias <tobias.pal AT gmail.com> for patch, bug #141782.
 
   06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
   -files/maxtoread-5.2.0.patch, -echoping-5.2.0.ebuild,



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/echoping: echoping-6.0.2.ebuild ChangeLog
@ 2008-05-21 18:47 Tiziano Mueller (dev-zero)
  0 siblings, 0 replies; 3+ messages in thread
From: Tiziano Mueller (dev-zero) @ 2008-05-21 18:47 UTC (permalink / raw
  To: gentoo-commits

dev-zero    08/05/21 18:47:00

  Modified:             echoping-6.0.2.ebuild ChangeLog
  Log:
  Changed dependency for postgresql from dev-db/postgresql to virtual/postgresql-server
  (Portage version: 2.1.5_rc7)

Revision  Changes    Path
1.4                  net-analyzer/echoping/echoping-6.0.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?r1=1.3&r2=1.4

Index: echoping-6.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- echoping-6.0.2.ebuild	26 Jan 2008 10:36:52 -0000	1.3
+++ echoping-6.0.2.ebuild	21 May 2008 18:47:00 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.ebuild,v 1.3 2008/01/26 10:36:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild,v 1.4 2008/05/21 18:47:00 dev-zero Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@
 DEPEND="gnutls? ( >=net-libs/gnutls-1.0.17 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
 	idn? ( net-dns/libidn )
-	postgres? ( dev-db/postgresql )
+	postgres? ( virtual/postgresql-server )
 	ldap? ( net-nds/openldap )"
 
 src_compile() {



1.15                 net-analyzer/echoping/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	26 Jan 2008 10:36:52 -0000	1.14
+++ ChangeLog	21 May 2008 18:47:00 -0000	1.15
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/echoping
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.14 2008/01/26 10:36:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.15 2008/05/21 18:47:00 dev-zero Exp $
+
+  21 May 2008; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Changed dependency for postgresql from dev-db/postgresql to
+  virtual/postgresql-server
 
   26 Jan 2008; <pva@gentoo.org> echoping-6.0.2.ebuild:
   Do not die if ssl and gnutls are enabled, better chose gnutls, thank Paul



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/echoping: echoping-6.0.2.ebuild ChangeLog
@ 2009-07-02 13:21 Jeroen Roovers (jer)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2009-07-02 13:21 UTC (permalink / raw
  To: gentoo-commits

jer         09/07/02 13:21:39

  Modified:             echoping-6.0.2.ebuild ChangeLog
  Log:
  Restrict testing (bug #276210). Fix one grammatical error.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.5                  net-analyzer/echoping/echoping-6.0.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild?r1=1.4&r2=1.5

Index: echoping-6.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- echoping-6.0.2.ebuild	21 May 2008 18:47:00 -0000	1.4
+++ echoping-6.0.2.ebuild	2 Jul 2009 13:21:39 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.ebuild,v 1.4 2008/05/21 18:47:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-6.0.2.ebuild,v 1.5 2009/07/02 13:21:39 jer Exp $
 
 inherit eutils
 
@@ -12,6 +12,7 @@
 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 )
@@ -23,7 +24,7 @@
 	local my_ssl_conf
 	if use gnutls; then
 		if use ssl; then
-			ewarn "You've enabled both ssl and gnutls USE flags but ${PN} could"
+			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)"



1.17                 net-analyzer/echoping/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/echoping/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	4 Aug 2008 19:25:13 -0000	1.16
+++ ChangeLog	2 Jul 2009 13:21:39 -0000	1.17
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/echoping
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.16 2008/08/04 19:25:13 jer Exp $
+# 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 $
+
+  02 Jul 2009; Jeroen Roovers <jer@gentoo.org> echoping-6.0.2.ebuild:
+  Restrict testing (bug #276210). Fix one grammatical error.
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Describe local USE flags for GLEP 56.






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-07-02 13:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-26 10:36 [gentoo-commits] gentoo-x86 commit in net-analyzer/echoping: echoping-6.0.2.ebuild ChangeLog Peter Volkov (pva)
  -- strict thread matches above, loose matches on Subject: below --
2008-05-21 18:47 Tiziano Mueller (dev-zero)
2009-07-02 13:21 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox