Version bump.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 26 insertions, 43 deletions

diff --git a/net-analyzer/httping/ChangeLog b/net-analyzer/httping/ChangeLog
index 232abf29bff9..15695b30693b 100644
--- a/net-analyzer/httping/ChangeLog
+++ b/net-analyzer/httping/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/httping
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.55 2010/01/06 19:57:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.56 2010/05/10 05:55:46 pva Exp $
+
+*httping-1.4.1 (10 May 2010)
+
+  10 May 2010; Peter Volkov <pva@gentoo.org> -httping-1.2.6.ebuild,
+  -httping-1.2.9-r1.ebuild, +httping-1.4.1.ebuild:
+  Version bump.
 
   06 Jan 2010; Brent Baude <ranger@gentoo.org> httping-1.3.1.ebuild:
   Marking httping-1.3.1 ppc64 for bug 297836
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index 3e361e74c055..1c75c0d53e5f 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -1,8 +1,6 @@
-DIST httping-1.2.6.tgz 13210 RMD160 9ab6f7cef97884f4b219d2ba5567cf907c1f0b1b SHA1 7b61cf37977bf248dc74367fd8f28ebe26240979 SHA256 4682d6241fd13a842b47bd9c24faff761ee7e39a7d887e1f5888a86dcd95d329
-DIST httping-1.2.9.tgz 13315 RMD160 8fd9a6c8ccef3f6599b41deb58ffb6e46b1cc715 SHA1 6be7b8299b2ee01e42e1a1566497d2c6a0d0ed6c SHA256 b8a0ddffbf3231c4e4c2d6e58b8251c91893344dbcf6942608733af598a96a2b
 DIST httping-1.3.1.tgz 12873 RMD160 fec02450fd32167e11584e41b92ea40b449bd44d SHA1 aebfefed136c08b6346c006d729a747743c98bd3 SHA256 0649d8b3aa200f03b77dcd69224928602e49abf248568338bed3c5748a94bcf2
-EBUILD httping-1.2.6.ebuild 812 RMD160 4f92c20e8c1b9f2f06d9dfd0f23618252698d369 SHA1 709598d9aac381ec8f40b7cfcbed66953bf54ee2 SHA256 608c0e4ba4998dfe54667c32a55423202a99795377ca8e7d66a4999d23e6e665
-EBUILD httping-1.2.9-r1.ebuild 876 RMD160 943938cfcf20f797f08462ab7215c8c445332911 SHA1 9f458f4e61bbbde80575429d88a837e58d92dfe8 SHA256 3a9d4171b9a94028d423ee041b77674d19509c5fbf3089f70f45ff88fda6178d
+DIST httping-1.4.1.tgz 13699 RMD160 613fdd5ac9464048b9957ac62ff6391c284c2116 SHA1 a8fa9cb3cb808b87d2c06f711ca1de81facf2726 SHA256 cbd238777f975d837bbb8a64448bc5a7d79ac671ce320d60fcc2532c9b2ca4b8
 EBUILD httping-1.3.1.ebuild 988 RMD160 b7fcbdf836892976599c612409d311b1b80f6cda SHA1 0a334e18ee100c78c33b685c8a5d819481e275cf SHA256 daf96381491f5a20a2bc8d9b1a10cb2ad897188e00c3555320f1adab99f7e11f
-MISC ChangeLog 6904 RMD160 3daca27fda7613fba4983ebe6d0e92bab6959ae0 SHA1 629222c4ef971057803ce922271af0eec169de01 SHA256 17a7c4e408b3df147624873eecb82fd91ed13cfb308e9990334de69204eec7dd
+EBUILD httping-1.4.1.ebuild 992 RMD160 5f64d2c771bff80ff8c0310054f16952f6c2bd3f SHA1 e8284a0a172ef9b7e3da0331a8b206469a0af572 SHA256 f236eb0d9c6382507e28129fa8be2704a4fec65a03539b020c7793f4df82f835
+MISC ChangeLog 7067 RMD160 2efc9d663ae8cb6dc62b9525ec6390ae0b9e2b8e SHA1 00cda73a90227a75c9708a270b1552e878968a00 SHA256 53d9df781eb7b2d4950af911c4edd94ec77e5d76f13be65986f9065cd0c10fe4
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/httping/httping-1.2.6.ebuild b/net-analyzer/httping/httping-1.2.6.ebuild
deleted file mode 100644
index 75e132a050e9..000000000000
--- a/net-analyzer/httping/httping-1.2.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.2.6.ebuild,v 1.4 2008/08/27 12:03:16 gentoofan23 Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="http protocol ping-like program"
-HOMEPAGE="http://www.vanheusden.com/httping/"
-SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
-IUSE="ssl"
-
-DEPEND=">=sys-libs/ncurses-5
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	local makefile
-	use ssl || makefile="-f Makefile.nossl"
-	emake CC="$(tc-getCC)" ${makefile} || die "emake failed"
-}
-
-src_install() {
-	dobin httping || die "dobin failed"
-	doman httping.1 || die "doman failed"
-	dodoc readme.txt || die "dodoc failed"
-}
diff --git a/net-analyzer/httping/httping-1.2.9-r1.ebuild b/net-analyzer/httping/httping-1.4.1.ebuild
index 1996a71ff04e..6739a11693f0 100644
--- a/net-analyzer/httping/httping-1.2.9-r1.ebuild
+++ b/net-analyzer/httping/httping-1.4.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.2.9-r1.ebuild,v 1.3 2009/10/31 14:34:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.4.1.ebuild,v 1.1 2010/05/10 05:55:46 pva Exp $
+
+EAPI="2"
 
 inherit flag-o-matic toolchain-funcs
 
@@ -10,18 +12,24 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
-IUSE="ssl"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ssl"
 
 RDEPEND=">=sys-libs/ncurses-5
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}"
 
+#src_prepare() {
+#	sed 's:^CFLAGS=:CFLAGS+=:' -i Makefile || die
+#}
+
 src_compile() {
-	local makefile
-	use ssl || makefile="-f Makefile.nossl"
-	append-flags -Dstrndup=strndup
-	emake CC="$(tc-getCC)" ${makefile} || die "emake failed"
+	append-flags -D_GNU_SOURCE
+	emake \
+		CC="$(tc-getCC)" \
+		$(use ssl && echo SSL=yes || echo SSL=no) \
+		$(use debug && echo DEBUG=yes || echo DEBUG=no) \
+			|| die "emake failed"
 }
 
 src_install() {