Fix for bug #50421

7 files changed, 8 insertions, 131 deletions

diff --git a/net-www/pound/ChangeLog b/net-www/pound/ChangeLog
index ee8e462cdbad..8616e45df5db 100644
--- a/net-www/pound/ChangeLog
+++ b/net-www/pound/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/pound
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/pound/ChangeLog,v 1.5 2004/04/23 16:50:38 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/pound/ChangeLog,v 1.6 2004/05/09 19:58:36 stuart Exp $
+
+  09 May 2004; Stuart Herbert <stuart@gentoo.org> pound-1.7.ebuild:
+  Marked stable on x86; for bug #50421
 
 *pound-1.7 (23 Apr 2004)
 
diff --git a/net-www/pound/Manifest b/net-www/pound/Manifest
index f35864a71462..59a8e4e72bcd 100644
--- a/net-www/pound/Manifest
+++ b/net-www/pound/Manifest
@@ -1,12 +1,8 @@
-MD5 c2dc68d0ddb56dd61ff66697d50df3f4 pound-1.5.ebuild 1372
-MD5 4ae3fa54844e91ce95b6e63c7792a547 pound-1.4.ebuild 1372
-MD5 82f56f90a2669fb79b3828e1be44e521 ChangeLog 851
+MD5 a80d2e638c858382a3d0291f3feede6f ChangeLog 959
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 d2c22a9c0f6b7aef3bf430ea71cbafef pound-1.6.ebuild 1373
-MD5 26ec4db0be2f5b23f384303a0e2d2dc9 pound-1.7.ebuild 1156
+MD5 6c27219b9a22257cc06eb2e63ddb6a30 pound-1.7.ebuild 1155
 MD5 eb402b9c286514bc8e89e6d1b8dda8a4 files/pound.init 622
-MD5 ea7096804d2dc2e498de690fa440821d files/digest-pound-1.4 58
-MD5 bc58884d636c60affb0267730438d6d9 files/digest-pound-1.5 58
 MD5 0b2e14a1793d6e6393cf13f015c58a7e files/digest-pound-1.6 58
 MD5 4c7b6277bb33061b615ac9059c74cf62 files/pound.cfg 830
 MD5 a5bfd8880ab9b367f5333083252548db files/digest-pound-1.7 58
diff --git a/net-www/pound/files/digest-pound-1.4 b/net-www/pound/files/digest-pound-1.4
deleted file mode 100644
index 7b5a36a2d4ae..000000000000
--- a/net-www/pound/files/digest-pound-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23a4634b0f9b964ede58f5e49a30ff7e Pound-1.4.tgz 115859
diff --git a/net-www/pound/files/digest-pound-1.5 b/net-www/pound/files/digest-pound-1.5
deleted file mode 100644
index d825e95482ed..000000000000
--- a/net-www/pound/files/digest-pound-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e838381f7fb49136c531895a0e93c31d Pound-1.5.tgz 120219
diff --git a/net-www/pound/pound-1.4.ebuild b/net-www/pound/pound-1.4.ebuild
deleted file mode 100644
index 89d336f3d3ed..000000000000
--- a/net-www/pound/pound-1.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/pound/pound-1.4.ebuild,v 1.2 2003/09/06 02:05:10 msterret Exp $
-
-MY_P=${P/p/P}
-
-DESCRIPTION="A http/https reverse-proxy and load-balancer."
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-HOMEPAGE="http://www.apsis.ch/pound/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~alpha ~mips ~hppa"
-IUSE="ssl"
-
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf
-
-	## check for ssl-support:
-	if [ "$(use ssl)" ]; then
-		myconf="${myconf} --with-ssl"
-	else
-		myconf="${myconf} --without-ssl"
-	fi
-
-	## TODO: how to handle the missing "syslog" USE-flag?
-	## check for syslog-support:
-	#if [ "$(use syslog)" ]; then
-	#	myconf="${myconf} --with-log="
-	#else
-	#	myconf="${myconf} --without-log"
-	#fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	dosbin pound
-	doman pound.8
-
-	dodoc README
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pound.init pound
-
-	insinto /etc
-	doins ${FILESDIR}/pound.cfg
-}
-
-pkg_postinst() {
-	einfo "No demo-/sample-configfile is included in the distribution -- read the man-page"
-	einfo "for more info."
-	einfo "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
-}
diff --git a/net-www/pound/pound-1.5.ebuild b/net-www/pound/pound-1.5.ebuild
deleted file mode 100644
index 30cbf0926e4c..000000000000
--- a/net-www/pound/pound-1.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/pound/pound-1.5.ebuild,v 1.2 2003/11/16 23:16:59 pyrania Exp $
-
-MY_P=${P/p/P}
-
-DESCRIPTION="A http/https reverse-proxy and load-balancer."
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-HOMEPAGE="http://www.apsis.ch/pound/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa"
-IUSE="ssl"
-
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf
-
-	## check for ssl-support:
-	if [ "$(use ssl)" ]; then
-		myconf="${myconf} --with-ssl"
-	else
-		myconf="${myconf} --without-ssl"
-	fi
-
-	## TODO: how to handle the missing "syslog" USE-flag?
-	## check for syslog-support:
-	#if [ "$(use syslog)" ]; then
-	#	myconf="${myconf} --with-log="
-	#else
-	#	myconf="${myconf} --without-log"
-	#fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	dosbin pound
-	doman pound.8
-
-	dodoc README
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pound.init pound
-
-	insinto /etc
-	doins ${FILESDIR}/pound.cfg
-}
-
-pkg_postinst() {
-	einfo "No demo-/sample-configfile is included in the distribution -- read the man-page"
-	einfo "for more info."
-	einfo "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
-}
diff --git a/net-www/pound/pound-1.7.ebuild b/net-www/pound/pound-1.7.ebuild
index 10e606419a9b..4ffc49c4061f 100644
--- a/net-www/pound/pound-1.7.ebuild
+++ b/net-www/pound/pound-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/pound/pound-1.7.ebuild,v 1.1 2004/04/23 16:50:38 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/pound/pound-1.7.ebuild,v 1.2 2004/05/09 19:58:36 stuart Exp $
 
 MY_P=${P/p/P}
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.apsis.ch/pound/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa"
 IUSE="ssl msdav unsafe"
 
 DEPEND="virtual/glibc