Version bump. Drop old.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 25 insertions, 71 deletions

diff --git a/net-analyzer/httping/ChangeLog b/net-analyzer/httping/ChangeLog
index c4f983094322..ac6001f48850 100644
--- a/net-analyzer/httping/ChangeLog
+++ b/net-analyzer/httping/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/httping
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.48 2009/08/09 14:16:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.49 2009/10/18 06:37:18 pva Exp $
+
+*httping-1.3.1 (18 Oct 2009)
+
+  18 Oct 2009; Peter Volkov <pva@gentoo.org> -httping-1.2.2.ebuild,
+  -httping-1.2.4.ebuild, -httping-1.2.9.ebuild, +httping-1.3.1.ebuild:
+  Version bump. Drop old.
 
 *httping-1.2.9-r1 (09 Aug 2009)
 
diff --git a/net-analyzer/httping/httping-1.2.2.ebuild b/net-analyzer/httping/httping-1.2.2.ebuild
deleted file mode 100644
index 9020afa707b0..000000000000
--- a/net-analyzer/httping/httping-1.2.2.ebuild
+++ /dev/null
@@ -1,33 +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.2.ebuild,v 1.6 2008/01/27 19:13:31 cedk 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 x86"
-IUSE="ssl"
-
-DEPEND=">=sys-libs/ncurses-5"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_compile() {
-	local makefile
-	use ssl || makefile="-f Makefile.nossl"
-	export CC="$(tc-getCC)"
-	emake ${makefile} || die "make failed"
-}
-
-src_install() {
-	dobin httping || die
-	dodoc readme.txt
-}
diff --git a/net-analyzer/httping/httping-1.2.4.ebuild b/net-analyzer/httping/httping-1.2.4.ebuild
deleted file mode 100644
index 52fa429fd5a1..000000000000
--- a/net-analyzer/httping/httping-1.2.4.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.4.ebuild,v 1.3 2008/02/05 10:54:20 corsair 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 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.ebuild b/net-analyzer/httping/httping-1.3.1.ebuild
index 7846befc5a3a..34c9bca0d9b7 100644
--- a/net-analyzer/httping/httping-1.2.9.ebuild
+++ b/net-analyzer/httping/httping-1.3.1.ebuild
@@ -1,8 +1,10 @@
-# 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/httping/httping-1.2.9.ebuild,v 1.1 2008/08/25 20:51:39 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.3.1.ebuild,v 1.1 2009/10/18 06:37:18 pva Exp $
 
-inherit toolchain-funcs
+EAPI="2"
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="http protocol ping-like program"
 HOMEPAGE="http://www.vanheusden.com/httping/"
@@ -11,15 +13,23 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl"
+IUSE="debug ssl"
 
-DEPEND=">=sys-libs/ncurses-5
+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"
-	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() {