Stable for HPPA (bug #462512).

(Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key A792A613)

8 files changed, 9 insertions, 194 deletions

diff --git a/net-analyzer/httping/ChangeLog b/net-analyzer/httping/ChangeLog
index 0150fe7b3d79..7e6f26a6b2cd 100644
--- a/net-analyzer/httping/ChangeLog
+++ b/net-analyzer/httping/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/httping
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.95 2013/03/20 18:13:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.96 2013/03/20 18:20:56 jer Exp $
+
+  20 Mar 2013; Jeroen Roovers <jer@gentoo.org> -httping-1.5.3.ebuild,
+  -httping-1.5.5-r1.ebuild, -files/httping-1.5.5-help.patch,
+  -httping-1.5.6.ebuild, -files/httping-1.5.6-help.patch,
+  -httping-1.5.7.ebuild, httping-1.5.8.ebuild:
+  Stable for HPPA (bug #462512).
 
   20 Mar 2013; Jeroen Roovers <jer@gentoo.org> +files/httping-2.0-flags.patch,
   -httping-1.6.ebuild, httping-2.0.ebuild:
diff --git a/net-analyzer/httping/files/httping-1.5.5-help.patch b/net-analyzer/httping/files/httping-1.5.5-help.patch
deleted file mode 100644
index 4066f6fe922c..000000000000
--- a/net-analyzer/httping/files/httping-1.5.5-help.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -148,7 +148,7 @@
- 	fprintf(stderr, "--persistent-connections	-Q\n");
- 	fprintf(stderr, "--no-cache		-Z\n");
- 	fprintf(stderr, "--version		-V\n");
--	fprintf(stderr, "--help			-h\n");
-+	fprintf(stderr, "--help			-H\n");
- }
- 
- void emit_error()
-@@ -306,7 +306,7 @@
- 		{"password",	1, NULL, 'P' },
- 		{"cookie",	1, NULL, 'C' },
- 		{"version",	0, NULL, 'V' },
--		{"help",	0, NULL, 'h' },
-+		{"help",	0, NULL, 'H' },
- 		{NULL,		0, NULL, 0   }
- 	};
- 
diff --git a/net-analyzer/httping/files/httping-1.5.6-help.patch b/net-analyzer/httping/files/httping-1.5.6-help.patch
deleted file mode 100644
index 2c45343eda8b..000000000000
--- a/net-analyzer/httping/files/httping-1.5.6-help.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -149,7 +149,7 @@
- 	fprintf(stderr, "--no-cache		-Z\n");
- 	fprintf(stderr, "--tcp-fast-open        -F\n");
- 	fprintf(stderr, "--version		-V\n");
--	fprintf(stderr, "--help			-h\n");
-+	fprintf(stderr, "--help			-H\n");
- }
- 
- void emit_error()
diff --git a/net-analyzer/httping/httping-1.5.3.ebuild b/net-analyzer/httping/httping-1.5.3.ebuild
deleted file mode 100644
index a9271e35e154..000000000000
--- a/net-analyzer/httping/httping-1.5.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.5.3.ebuild,v 1.5 2012/06/14 02:42:25 jdhore Exp $
-
-EAPI=4
-inherit flag-o-matic 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="debug ssl"
-
-RDEPEND=">=sys-libs/ncurses-5
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		$(use ssl && echo SSL=yes || echo SSL=no) \
-		$(use debug && echo DEBUG=yes || echo DEBUG=no)
-}
-
-src_install() {
-	dobin httping
-	doman httping.1
-	dodoc readme.txt
-}
diff --git a/net-analyzer/httping/httping-1.5.5-r1.ebuild b/net-analyzer/httping/httping-1.5.5-r1.ebuild
deleted file mode 100644
index 6aa2fa88c92a..000000000000
--- a/net-analyzer/httping/httping-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.5.5-r1.ebuild,v 1.1 2012/11/19 11:12:38 jer Exp $
-
-EAPI=4
-inherit eutils flag-o-matic 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="debug ssl"
-
-RDEPEND="
-	>=sys-libs/ncurses-5
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}"
-
-# This would bring in test? ( dev-util/cppcheck ) but unlike
-# upstream we should only care about compile/run time testing
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.5-help.patch
-	sed -i "/^OFLAGS/d" Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		SSL=$(usex ssl) \
-		DEBUG=$(usex debug)
-}
-
-src_install() {
-	dobin httping
-	doman httping.1
-	dodoc readme.txt
-}
diff --git a/net-analyzer/httping/httping-1.5.6.ebuild b/net-analyzer/httping/httping-1.5.6.ebuild
deleted file mode 100644
index 8f4d1ff9c0a9..000000000000
--- a/net-analyzer/httping/httping-1.5.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.5.6.ebuild,v 1.1 2012/12/10 13:14:46 jer Exp $
-
-EAPI=4
-inherit eutils flag-o-matic 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="debug ssl"
-
-RDEPEND="
-	>=sys-libs/ncurses-5
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}"
-
-# This would bring in test? ( dev-util/cppcheck ) but unlike
-# upstream we should only care about compile/run time testing
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.6-help.patch
-	sed -i "/^OFLAGS/d" Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		SSL=$(usex ssl) \
-		DEBUG=$(usex debug)
-}
-
-src_install() {
-	dobin httping
-	doman httping.1
-	dodoc readme.txt
-}
diff --git a/net-analyzer/httping/httping-1.5.7.ebuild b/net-analyzer/httping/httping-1.5.7.ebuild
deleted file mode 100644
index cd326acac228..000000000000
--- a/net-analyzer/httping/httping-1.5.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.5.7.ebuild,v 1.1 2013/01/12 02:04:27 radhermit Exp $
-
-EAPI=5
-inherit flag-o-matic 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="debug ssl"
-
-RDEPEND="
-	>=sys-libs/ncurses-5
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}"
-
-# This would bring in test? ( dev-util/cppcheck ) but unlike
-# upstream we should only care about compile/run time testing
-RESTRICT="test"
-
-src_prepare() {
-	sed -i "/^OFLAGS/d" Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		SSL=$(usex ssl) \
-		DEBUG=$(usex debug)
-}
-
-src_install() {
-	dobin httping
-	doman httping.1
-	dodoc readme.txt
-}
diff --git a/net-analyzer/httping/httping-1.5.8.ebuild b/net-analyzer/httping/httping-1.5.8.ebuild
index d75340abee49..c559ebdd8767 100644
--- a/net-analyzer/httping/httping-1.5.8.ebuild
+++ b/net-analyzer/httping/httping-1.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.5.8.ebuild,v 1.3 2013/03/20 18:11:23 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.5.8.ebuild,v 1.4 2013/03/20 18:20:56 jer Exp $
 
 EAPI=5
 inherit flag-o-matic toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ~mips ~ppc ppc64 ~sparc x86"
 IUSE="debug ssl tfo"
 
 RDEPEND="