5 files changed, 9 insertions, 73 deletions
diff --git a/net-www/wwwoffle/ChangeLog b/net-www/wwwoffle/ChangeLog
index 7a7cb1463538..8b2eeb353303 100644
--- a/net-www/wwwoffle/ChangeLog
+++ b/net-www/wwwoffle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/wwwoffle
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.16 2004/04/28 08:58:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.17 2004/05/07 13:05:28 dragonheart Exp $
+
+  07 May 2004; Daniel Black <dragonheart@gentoo.org> -wwwoffle-2.7d.ebuild,
+  wwwoffle-2.7g.ebuild, wwwoffle-2.7h.ebuild:
+  Remove old version. QA fix and added x86 keywords on 2.7{gh}
 
   28 Apr 2004; Daniel Black <dragonheart@gentoo.org> wwwoffle-2.8b.ebuild:
   Some fixes thanks to tove <bugs@veller.net> in bug #35275. Still some more to
diff --git a/net-www/wwwoffle/files/digest-wwwoffle-2.7d b/net-www/wwwoffle/files/digest-wwwoffle-2.7d
deleted file mode 100644
index 13f56c314774..000000000000
--- a/net-www/wwwoffle/files/digest-wwwoffle-2.7d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3166cacef0f8fd81b098c5eb55c5efde wwwoffle-2.7d.tgz 867987
diff --git a/net-www/wwwoffle/wwwoffle-2.7d.ebuild b/net-www/wwwoffle/wwwoffle-2.7d.ebuild
deleted file mode 100644
index dee6f2aa043c..000000000000
--- a/net-www/wwwoffle/wwwoffle-2.7d.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7d.ebuild,v 1.10 2004/04/25 00:44:10 dragonheart Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="wwwoffle = WWW Offline Explorer, an adv. caching proxy especially suitable for nonpermanent (e.g. dialup) Internet connections"
-
-SRC_URI="ftp://ftp.demon.co.uk/pub/unix/httpd/${P}.tgz
-	 ftp://metalab.unc.edu/pub/Linux/apps/www/servers/${P}.tgz"
-
-HOMEPAGE="http://www.gedanken.demon.co.uk/"
-KEYWORDS="x86 sparc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/flex
-	sys-libs/zlib
-	sys-devel/gcc
-	virtual/glibc"
-
-
-src_compile() {
-	local myconf
-	use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
-	./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
-
-	emake || die
-}
-
-src_install () {
-	# Install the files
-	make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
-
-	cd ${D}/etc
-	mv wwwoffle.conf 1
-	sed -e "s:${D}::" 1 > wwwoffle.conf
-	rm 1
-
-	# Install the wwwoffled init script
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
-
-	# someday i'll make it use the file in /etc. for now we at least get
-	# config file protection this way.
-	dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
-}
-
-pkg_preinst() {
-	source /etc/init.d/functions.sh
-	if [ -L ${svcdir}/started/wwwoffled ]; then
-		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
-		restart the script."
-		/etc/init.d/wwwoffled stop
-		touch ${T}/restart
-	fi
-}
-
-pkg_postinst() {
-	if [ -f "${T}/restart" ]; then
-		einfo "Starting the wwwoffled initscript again..."
-		/etc/init.d/wwwoffled start
-		rm ${T}/restart
-	fi
-}
diff --git a/net-www/wwwoffle/wwwoffle-2.7g.ebuild b/net-www/wwwoffle/wwwoffle-2.7g.ebuild
index a9b87474d729..f165606c4463 100644
--- a/net-www/wwwoffle/wwwoffle-2.7g.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7g.ebuild
@@ -1,8 +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/wwwoffle/wwwoffle-2.7g.ebuild,v 1.6 2004/04/25 00:44:10 dragonheart Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7g.ebuild,v 1.7 2004/05/07 13:05:28 dragonheart Exp $
 
 DESCRIPTION="wwwoffle = WWW Offline Explorer, an adv. caching proxy especially suitable for nonpermanent (e.g. dialup) Internet connections"
 
@@ -13,7 +11,7 @@ HOMEPAGE="http://www.gedanken.demon.co.uk/"
 KEYWORDS="x86 sparc"
 SLOT="0"
 LICENSE="GPL-2"
-
+IUSE="ipv6"
 DEPEND="sys-devel/flex
 	sys-libs/zlib
 	sys-devel/gcc
diff --git a/net-www/wwwoffle/wwwoffle-2.7h.ebuild b/net-www/wwwoffle/wwwoffle-2.7h.ebuild
index e221fd781395..7c62bc4741d1 100644
--- a/net-www/wwwoffle/wwwoffle-2.7h.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7h.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/wwwoffle/wwwoffle-2.7h.ebuild,v 1.6 2004/04/25 00:44:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7h.ebuild,v 1.7 2004/05/07 13:05:28 dragonheart Exp $
 
 S=${WORKDIR}/${P}
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.demon.co.uk/pub/unix/httpd/${P}.tgz
 	 ftp://ftp.ibiblio.org/pub/Linux/apps/www/servers/${P}.tgz"
 
 HOMEPAGE="http://www.gedanken.demon.co.uk/"
-KEYWORDS="~x86 ~sparc ~ppc ppc64"
+KEYWORDS="x86 ~sparc ~ppc ppc64"
 SLOT="0"
 LICENSE="GPL-2"