stable and unstable version bumps

8 files changed, 20 insertions, 45 deletions

diff --git a/net-analyzer/httping/ChangeLog b/net-analyzer/httping/ChangeLog
index 8b189dc00717..8ca893b36367 100644
--- a/net-analyzer/httping/ChangeLog
+++ b/net-analyzer/httping/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/httping
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.8 2004/09/04 18:24:32 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.9 2004/09/15 18:37:29 squinky86 Exp $
+
+*httping-0.0.95 (15 Sep 2004)
+
+  15 Sep 2004; Jon Hood <squinky86@gentoo.org> -httping-0.0.93.ebuild,
+  httping-0.0.94-r1.ebuild, -httping-0.0.94.ebuild, +httping-0.0.95.ebuild:
+  Version bump, mark -r1 stable on x86, cleanup old ebuilds.
 
   04 Sep 2004; Jon Hood <squinky86@gentoo.org> -httping-0.0.8.ebuild,
   httping-0.0.94.ebuild:
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index d885199c9793..0076f94d3b84 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -1,8 +1,6 @@
-MD5 d75edc399c4011cbc88411edf0485733 httping-0.0.93.ebuild 659
-MD5 a138839baa901b7d5604d9980e2f6b80 httping-0.0.94-r1.ebuild 741
-MD5 0a9b1ff6987c593a63097fa4a96ac8ab ChangeLog 1157
+MD5 234af725828909a7f17a148ae78b8c7b httping-0.0.95.ebuild 738
+MD5 ad4a493ee0b1776ad4d0a4a2105f5992 httping-0.0.94-r1.ebuild 740
+MD5 989e03d55a86ae86388e9da1265f6a6f ChangeLog 1397
 MD5 61da3c68a3ae57136cdc2a17fbaedfaf metadata.xml 223
-MD5 4e98e11e641253f7d8e93f61a1973319 httping-0.0.94.ebuild 665
-MD5 0a9debbe13087f9b72f65e76615d5986 files/digest-httping-0.0.93 61
-MD5 e09a4c048a540ff768f9be969e7fa62c files/digest-httping-0.0.94 61
+MD5 ae2b0648bc9a639b7129d5297c8ad680 files/digest-httping-0.0.95 61
 MD5 e09a4c048a540ff768f9be969e7fa62c files/digest-httping-0.0.94-r1 61
diff --git a/net-analyzer/httping/files/digest-httping-0.0.93 b/net-analyzer/httping/files/digest-httping-0.0.93
deleted file mode 100644
index e1fec16eb1e2..000000000000
--- a/net-analyzer/httping/files/digest-httping-0.0.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c22d5b3e353359ed1256ce69226e362c httping-0.0.93.tgz 6291
diff --git a/net-analyzer/httping/files/digest-httping-0.0.94 b/net-analyzer/httping/files/digest-httping-0.0.94
deleted file mode 100644
index 8032b4f9ff21..000000000000
--- a/net-analyzer/httping/files/digest-httping-0.0.94
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e9f0da9c58d999be2afef1759e505e5 httping-0.0.94.tgz 6465
diff --git a/net-analyzer/httping/files/digest-httping-0.0.95 b/net-analyzer/httping/files/digest-httping-0.0.95
new file mode 100644
index 000000000000..77fe7bd220f8
--- /dev/null
+++ b/net-analyzer/httping/files/digest-httping-0.0.95
@@ -0,0 +1 @@
+MD5 fd13873fb9a8cbb7a252a4a58860e46a httping-0.0.95.tgz 7140
diff --git a/net-analyzer/httping/httping-0.0.94-r1.ebuild b/net-analyzer/httping/httping-0.0.94-r1.ebuild
index 019137925e15..3a5b5d62896b 100644
--- a/net-analyzer/httping/httping-0.0.94-r1.ebuild
+++ b/net-analyzer/httping/httping-0.0.94-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-0.0.94-r1.ebuild,v 1.1 2004/08/30 22:19:44 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-0.0.94-r1.ebuild,v 1.2 2004/09/15 18:37:29 squinky86 Exp $
 
 DESCRIPTION="http protocol ping-like program"
 HOMEPAGE="http://www.vanheusden.com/httping/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ppc64"
+KEYWORDS="x86 ~ppc ppc64"
 IUSE="ssl"
 
 DEPEND=">=sys-libs/ncurses-5"
diff --git a/net-analyzer/httping/httping-0.0.94.ebuild b/net-analyzer/httping/httping-0.0.94.ebuild
deleted file mode 100644
index e41c458b01b2..000000000000
--- a/net-analyzer/httping/httping-0.0.94.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-0.0.94.ebuild,v 1.3 2004/09/04 18:24:32 squinky86 Exp $
-
-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="x86 ~ppc ppc64"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:CFLAGS=:CFLAGS=${CFLAGS} :g" Makefile
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin httping
-	dodoc readme.txt license.txt
-}
diff --git a/net-analyzer/httping/httping-0.0.93.ebuild b/net-analyzer/httping/httping-0.0.95.ebuild
index c3de0565f789..e96c2ba62bdf 100644
--- a/net-analyzer/httping/httping-0.0.93.ebuild
+++ b/net-analyzer/httping/httping-0.0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-0.0.93.ebuild,v 1.3 2004/08/05 23:11:04 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-0.0.95.ebuild,v 1.1 2004/09/15 18:37:29 squinky86 Exp $
 
 DESCRIPTION="http protocol ping-like program"
 HOMEPAGE="http://www.vanheusden.com/httping/"
@@ -8,19 +8,20 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
+KEYWORDS="~x86 ~ppc ppc64"
+IUSE="ssl"
 
 DEPEND=">=sys-libs/ncurses-5"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i -e "s:CFLAGS=:CFLAGS=${CFLAGS} :g" Makefile
+	sed -i -e "s:CFLAGS=:CFLAGS=${CFLAGS} :g" Makefile*
 }
 
 src_compile() {
-	emake || die "make failed"
+	use ssl && emake || die "make failed"
+	use ssl || emake -f Makefile.nossl || die "make failed"
 }
 
 src_install() {