Removed crufty versions

(Portage version: 2.1_pre4-r1)

14 files changed, 57 insertions, 425 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 977698d40295..5fe5ba99a702 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.45 2006/01/19 21:09:47 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.46 2006/02/22 16:30:38 rl03 Exp $
+
+  22 Feb 2006; Renat Lumpau <rl03@gentoo.org>
+  -files/webalizer-db4-with-geoip.patch, -files/webalizer-db4.patch,
+  -webalizer-2.01.10-r8.ebuild, -webalizer-2.01.10-r10.ebuild,
+  -webalizer-2.01.10-r11.ebuild, webalizer-2.01.10-r12.ebuild:
+  Removed crufty versions
 
   19 Jan 2006; Renat Lumpau <rl03@gentoo.org> webalizer-2.01.10-r12.ebuild:
   Fixed SLOT
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 5ea21dd22346..86f4f6f957e4 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,34 +1,48 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 238bd175dd997731594dbbfac3425032 ChangeLog 6595
+RMD160 f86660a933b4eb2e274fe1594c7cdc76c22722e9 ChangeLog 6595
+SHA256 a1ea61d8dbd53b7a4644f6bdceff6b63e431f12aa8cf2a1af78c3d08cc12b241 ChangeLog 6595
 MD5 f04ad397866d35f9ede71fc6da2392ed files/2.01.10/apache.webalizer 306
+RMD160 cc7e820da4aef6fa5f4078558407b7fe00e6146c files/2.01.10/apache.webalizer 306
+SHA256 3b6107aaa3898b875bc0af0f9addf9b3e077570a210908179e0257562bf52353 files/2.01.10/apache.webalizer 306
 MD5 45d6e8c8bd9f76c0e22d80acc0603aff files/2.01.10/reconfig 394
+RMD160 b7a23197c01db50f3dde83fc137944adaa642c28 files/2.01.10/reconfig 394
+SHA256 768fe5472a89d1338785948416fd4e1d9f3de60bfd5c09a27a3816f093c99d9f files/2.01.10/reconfig 394
 MD5 7a71200318400e9c4a33e23bfc65904d files/2.01.10/webalizer.conf 23927
-MD5 363fe90869a7e9ea50f37ac714bdac2a files/digest-webalizer-2.01.10-r10 157
-MD5 363fe90869a7e9ea50f37ac714bdac2a files/digest-webalizer-2.01.10-r11 157
-MD5 3d5021e449cb98a4fe8ab2fa6f222b33 files/digest-webalizer-2.01.10-r12 235
-MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r4 74
-MD5 363fe90869a7e9ea50f37ac714bdac2a files/digest-webalizer-2.01.10-r5 157
-MD5 363fe90869a7e9ea50f37ac714bdac2a files/digest-webalizer-2.01.10-r8 157
+RMD160 d056e384b3388da7703a037e8d626e3e9ebb381c files/2.01.10/webalizer.conf 23927
+SHA256 e87f7ab29007834fc21f79bbc4a5cc06b335122775a5a88a45a59f975dd1f706 files/2.01.10/webalizer.conf 23927
+MD5 ff891ce8686805d073f411c1446ee410 files/digest-webalizer-2.01.10-r12 843
+RMD160 15e0a87ed579b6cbaaeb26dbb023bcf0f496ac06 files/digest-webalizer-2.01.10-r12 843
+SHA256 7c3ac6546a3f41c993a0571d7eb677b24352b690bdd2dcfffa7a8bf1b4d17bb0 files/digest-webalizer-2.01.10-r12 843
+MD5 bc64ced59f4249b87c566b5d34a6fe1f files/digest-webalizer-2.01.10-r4 268
+RMD160 98c61492ea4aa3d860f6e6b8b9fb01d81a962feb files/digest-webalizer-2.01.10-r4 268
+SHA256 6533c2b211395e8f9c19aa415a0356a205dff73c79f20db1e623daf05ba8c4c1 files/digest-webalizer-2.01.10-r4 268
+MD5 c283fc0fd5687666b15e6da9f4b3cc2c files/digest-webalizer-2.01.10-r5 563
+RMD160 0b1a55408c8e73592239d8430efdf500da2140c5 files/digest-webalizer-2.01.10-r5 563
+SHA256 09892b71209d881a2b79658dabcc586d794aeef8b879f8f2e225c815dabd4ea5 files/digest-webalizer-2.01.10-r5 563
 MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
-MD5 006af7bcfeb1e8648c1787c63d28470c files/webalizer-db4-with-geoip.patch 574
+RMD160 afcfdc0eb34269f693267e19dde2ed6119789b7a files/output.c.patch 8088
+SHA256 002285d333af4d04fa1591a72d320ed3104b95ca3856389f53d9992cb1cd9da7 files/output.c.patch 8088
 MD5 ff6044f61cca31af6541dc7ee28affd9 files/webalizer-db4.2.patch 552
-MD5 cc68675ea63960bbc80d15110e41bf74 files/webalizer-db4.patch 574
+RMD160 bf9703f3713b53a97fd04ee372d55d17c17e70c0 files/webalizer-db4.2.patch 552
+SHA256 51c12d7469d455842a2f9b223e8c27e1ea99a97e0a0ddb490844a80df44cf309 files/webalizer-db4.2.patch 552
 MD5 94e47e69398034261ac6d26edab9eafb files/webalizer-language-list.txt 1520
+RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 files/webalizer-language-list.txt 1520
+SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4 files/webalizer-language-list.txt 1520
 MD5 766a26ff1600e3ea5359278a9dcd1025 files/webalizer-readability.patch 8345
+RMD160 45a75b03752370f9ddb818768ff0730ad829fe64 files/webalizer-readability.patch 8345
+SHA256 7b89611bccaf9f9b8abf824e270e6ffa4d5447080f1685cfce0ab3a23f2f3314 files/webalizer-readability.patch 8345
 MD5 e02bdabb67987423cb53ecadc6f70cf3 files/webalizer-search.patch 30559
+RMD160 0d2149290265df652b131c29bb496f442d9af6b0 files/webalizer-search.patch 30559
+SHA256 c608e8992de56e85c0136279abc54319bab9597d5285f468a0cb50460a2c1973 files/webalizer-search.patch 30559
 MD5 f4ab9f9db4e50708404d47337257cd4e metadata.xml 223
-MD5 db9541cf1c0142945af2a4c72fd78508 webalizer-2.01.10-r10.ebuild 3856
-MD5 b71e077d377e71a2277e7d6ab0279498 webalizer-2.01.10-r11.ebuild 3939
-MD5 ec68432f03857d861cb1dbf9c51ff42c webalizer-2.01.10-r12.ebuild 4288
+RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 metadata.xml 223
+SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79 metadata.xml 223
+MD5 cb0ea9ef6c1c19ce07350687b6e78ad8 webalizer-2.01.10-r12.ebuild 4289
+RMD160 7f2af43b59320189a75a3a51ccdebb274fca36fd webalizer-2.01.10-r12.ebuild 4289
+SHA256 db65bd6aaf360d65ad0c010f2ccb149445f6ccd9bdee3e279d8d2e588fddb141 webalizer-2.01.10-r12.ebuild 4289
 MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
+RMD160 93a8c75cba85a1a5a8a0944a11d4a2580529ee59 webalizer-2.01.10-r4.ebuild 2056
+SHA256 d93dd2fed0c7f1eb1b34fe86d7f9a6e5990a2dcc420d6210bdd011cc107c1517 webalizer-2.01.10-r4.ebuild 2056
 MD5 e7883822bb2a1bcd2b8409ba709a964e webalizer-2.01.10-r5.ebuild 2550
-MD5 e07be0b4516c1e9044aa0c668866b570 webalizer-2.01.10-r8.ebuild 2486
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0AAmEzitwsaoONoRAqDNAKCexMnmfTMQnbwgYO3HajOUoptD+ACgrbgE
-sfx6zRy4lMeZNFAWDRxwew0=
-=nt14
------END PGP SIGNATURE-----
+RMD160 d43659606a2a07f14b7a8cf7e68f40f2ede441c7 webalizer-2.01.10-r5.ebuild 2550
+SHA256 681815ed96b90494361145ecee5dfa8cfc2c5316a6f5e5886a2bbaed93992ed2 webalizer-2.01.10-r5.ebuild 2550
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r10 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r10
deleted file mode 100644
index 6843932aff40..000000000000
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
-MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r11 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r11
deleted file mode 100644
index 6843932aff40..000000000000
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
-MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r12 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r12
index 3b0d768e1aff..35da029145c3 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r12
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r12
@@ -1,3 +1,9 @@
 MD5 570bf2717be8981678dc9b4af2d321fb geolizer_2.01-10-patch.20050520.tar.bz2 35836
+RMD160 b4abd8498b64c0298e6875ee802cdbeec9086806 geolizer_2.01-10-patch.20050520.tar.bz2 35836
+SHA256 0914ec2a2401e8f8ae2735984d18714f5331d864c03347ca56ac3c22fb860378 geolizer_2.01-10-patch.20050520.tar.bz2 35836
 MD5 eaeff1769532b29fa639baf4f174ff59 webalizer-2.01-10-RB07-patch.tar.gz 7778
+RMD160 d7a0e672f5817a6a719b13a3dd46999cd6f3b7df webalizer-2.01-10-RB07-patch.tar.gz 7778
+SHA256 b7318aa386a26964aade84b56346d3ffddec8192a03933556c75cbf3a5b1cdc0 webalizer-2.01-10-RB07-patch.tar.gz 7778
 MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
+RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664
+SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r4 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r4
index f8b15bb17a67..445cebf86e52 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r4
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r4
@@ -1 +1,3 @@
 MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
+RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664
+SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r5 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
index 6843932aff40..3ff8f6ffc5c3 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
@@ -1,2 +1,6 @@
 MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
+RMD160 a4e8acd79171741acbf2dade2ed0519c9e32bab3 geolizer_2.01-10-patch.20040216.tar.bz2 27688
+SHA256 b4580b7c4be990b2caa9696690edef3f3e7cfd235f6c46b20b520bd606692601 geolizer_2.01-10-patch.20040216.tar.bz2 27688
 MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
+RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664
+SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r8 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r8
deleted file mode 100644
index 6843932aff40..000000000000
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
-MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/webalizer-db4-with-geoip.patch b/app-admin/webalizer/files/webalizer-db4-with-geoip.patch
deleted file mode 100644
index d31911153cf7..000000000000
--- a/app-admin/webalizer/files/webalizer-db4-with-geoip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in        2000-10-06 09:51:49.000000000 +0200
-+++ configure.in        2005-04-02 13:06:24.623616376 +0200
-@@ -81,7 +81,7 @@
-   if test "$HAVE_DB" = ""; then
-     AC_CHECK_FUNCS(dbopen)
-     if test $ac_cv_func_dbopen = no; then
--      AC_SEARCH_LIBS(dbopen, db db1, OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes")
-+      AC_SEARCH_LIBS(__db185_open_4001,db-4.1, OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes") 
-       if test "$HAVE_DB" = ""; then
-         AC_MSG_WARN(You must have a V1.85 compatable DB library!)
-         AC_MSG_WARN(DNS lookup code will be disabled...) 
diff --git a/app-admin/webalizer/files/webalizer-db4.patch b/app-admin/webalizer/files/webalizer-db4.patch
deleted file mode 100644
index 6570c2ae8a4d..000000000000
--- a/app-admin/webalizer/files/webalizer-db4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in        2000-10-06 09:51:49.000000000 +0200
-+++ configure.in        2005-04-02 13:06:24.623616376 +0200
-@@ -71,7 +71,7 @@
-   if test "$HAVE_DB" = ""; then
-     AC_CHECK_FUNCS(dbopen)
-     if test $ac_cv_func_dbopen = no; then
--      AC_SEARCH_LIBS(dbopen, db db1, OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes")
-+      AC_SEARCH_LIBS(__db185_open_4001,db-4.1, OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes") 
-       if test "$HAVE_DB" = ""; then
-         AC_MSG_WARN(You must have a V1.85 compatable DB library!)
-         AC_MSG_WARN(DNS lookup code will be disabled...) 
diff --git a/app-admin/webalizer/webalizer-2.01.10-r10.ebuild b/app-admin/webalizer/webalizer-2.01.10-r10.ebuild
deleted file mode 100644
index 07e332877709..000000000000
--- a/app-admin/webalizer/webalizer-2.01.10-r10.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r10.ebuild,v 1.1 2005/07/09 04:43:37 smithj Exp $
-
-# uses webapps to create directories with right permissions
-# probably slight overkil but works well
-inherit eutils depend.apache webapp
-
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
-	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20040216.tar.bz2 )"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
-IUSE="apache2 geoip nls"
-
-DEPEND="=sys-libs/db-4.1*
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3
-	geoip? ( dev-libs/geoip )"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# prevents "undefined reference" errors... see bug #65163
-	if ! built_with_use media-libs/gd png; then
-		ewarn "media-libs/gd must be built with png for this package"
-		ewarn "to function."
-		die "recompile gd with USE=\"png\""
-	fi
-
-	# USE=nls has no real meaning if LINGUAS isn't set
-	if use nls && [ -z "${LINGUAS}" ]; then
-		ewarn "you must set LINGUAS in /etc/make.conf"
-		ewarn "if you want to USE=nls"
-		die "please either set LINGUAS or do not use nls"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	sed -i -e "s,db_185.h,db.h," configure
-
-	# geoip patch messes up db4.1 patch, so both are dependent on geoip USE
-	# flag, even though both of the db patches do the _exact_ same thing
-	if use geoip; then
-		cd ${WORKDIR}
-		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
-		cd ${S}
-		epatch ${FILESDIR}/${PN}-db4-with-geoip.patch || die
-	else
-		epatch ${FILESDIR}/${PN}-readability.patch || die
-		epatch ${FILESDIR}/${PN}-db4.patch || die
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# method of lookup established
-	if use geoip; then
-		myconf="${myconf} --enable-geoip"
-	else
-		myconf="${myconf} --enable-dns"
-	fi
-
-	# really dirty hack; necessary due to a really gross ./configure
-	# basically, it just sets the natural language the program uses
-	# unfortunatly, this program only allows for one lang, so only the first
-	# entry in LINGUAS is used
-	if use nls; then
-		local longlang
-		longlang="$(grep ^${LINGUAS:0:2} ${FILESDIR}/webalizer-language-list.txt)"
-		myconf="${myconf} --with-language=${longlang:3}"
-	else
-		myconf="${myconf} --with-language=english"
-	fi
-
-	# stupid broken configuration file
-	autoconf
-
-	econf \
-		--with-db=/usr/include/db4.1/ \
-		${myconf} || die "econf failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	into /usr
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-
-	insinto /etc
-	doins ${FILESDIR}/${PV}/webalizer.conf
-	use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
-
-	if use apache2; then
-		insinto ${APACHE2_MODULES_CONFDIR}
-	else
-		insinto ${APACHE1_MODULES_CONFDIR}
-	fi
-	newins ${FILESDIR}/${PV}/apache.webalizer 55_webalizer.conf
-
-	dodoc README* CHANGES Copyright sample.conf
-	webapp_hook_script ${FILESDIR}/${PV}/reconfig
-	webapp_src_install
-}
-
-pkg_postinst(){
-	einfo
-	einfo "It is suggested that you restart apache before using webalizer"
-	einfo
-	einfo "Just type webalizer to generate your stats."
-	einfo "You can also use cron to generate them e.g. every day."
-	einfo "They can be accessed via http://localhost/webalizer"
-	einfo
-
-	if [ ${#LINGUAS} -gt 2 ] && use nls; then
-		ewarn
-		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this packge, it was built"
-		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
-		ewarn "you intended, please place the language you desire"
-		ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
-		ewarn
-	fi
-
-	webapp_pkg_postinst
-}
diff --git a/app-admin/webalizer/webalizer-2.01.10-r11.ebuild b/app-admin/webalizer/webalizer-2.01.10-r11.ebuild
deleted file mode 100644
index e17fa0f16f7f..000000000000
--- a/app-admin/webalizer/webalizer-2.01.10-r11.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r11.ebuild,v 1.1 2006/01/06 20:57:01 rl03 Exp $
-
-# uses webapp.eclass to create directories with right permissions
-# probably slight overkil but works well
-inherit eutils webapp
-
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
-	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20040216.tar.bz2 )"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
-IUSE="apache2 geoip nls"
-
-DEPEND="=sys-libs/db-4.1*
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3
-	geoip? ( dev-libs/geoip )"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# prevents "undefined reference" errors... see bug #65163
-	if ! built_with_use media-libs/gd png; then
-		ewarn "media-libs/gd must be built with png for this package"
-		ewarn "to function."
-		die "recompile gd with USE=\"png\""
-	fi
-
-	# USE=nls has no real meaning if LINGUAS isn't set
-	if use nls && [ -z "${LINGUAS}" ]; then
-		ewarn "you must set LINGUAS in /etc/make.conf"
-		ewarn "if you want to USE=nls"
-		die "please either set LINGUAS or do not use nls"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	sed -i -e "s,db_185.h,db.h," configure
-
-	# geoip patch messes up db4.1 patch, so both are dependent on geoip USE
-	# flag, even though both of the db patches do the _exact_ same thing
-	if use geoip; then
-		cd ${WORKDIR}
-		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
-		cd ${S}
-		epatch ${FILESDIR}/${PN}-db4-with-geoip.patch || die
-	else
-		epatch ${FILESDIR}/${PN}-readability.patch || die
-		epatch ${FILESDIR}/${PN}-db4.patch || die
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# method of lookup established
-	if use geoip; then
-		myconf="${myconf} --enable-geoip"
-	else
-		myconf="${myconf} --enable-dns"
-	fi
-
-	# really dirty hack; necessary due to a really gross ./configure
-	# basically, it just sets the natural language the program uses
-	# unfortunatly, this program only allows for one lang, so only the first
-	# entry in LINGUAS is used
-	if use nls; then
-		local longlang
-		longlang="$(grep ^${LINGUAS:0:2} ${FILESDIR}/webalizer-language-list.txt)"
-		myconf="${myconf} --with-language=${longlang:3}"
-	else
-		myconf="${myconf} --with-language=english"
-	fi
-
-	# stupid broken configuration file
-	autoconf
-
-	econf \
-		--with-db=/usr/include/db4.1/ \
-		${myconf} || die "econf failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	into /usr
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-
-	insinto /etc
-	doins ${FILESDIR}/${PV}/webalizer.conf
-	use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
-
-	dodoc README* CHANGES Copyright sample.conf ${FILESDIR}/${PV}/apache.webalizer
-	webapp_src_install
-}
-
-pkg_postinst(){
-	einfo
-	einfo "It is suggested that you restart apache before using webalizer"
-	einfo "You may want to review /etc/webalizer.conf and ensure that"
-	einfo "OutputDir is set correctly"
-	einfo
-	einfo "Then just type webalizer to generate your stats."
-	einfo "You can also use cron to generate them e.g. every day."
-	einfo "They can be accessed via http://localhost/webalizer"
-	einfo
-	einfo "A sample Apache config file has been installed into"
-	einfo "/usr/share/doc/${PF}/apache.webalizer"
-	einfo "Please edit and install it as necessary"
-	einfo
-
-	if [ ${#LINGUAS} -gt 2 ] && use nls; then
-		ewarn
-		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this packge, it was built"
-		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
-		ewarn "you intended, please place the language you desire"
-		ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
-		ewarn
-	fi
-
-	webapp_pkg_postinst
-}
diff --git a/app-admin/webalizer/webalizer-2.01.10-r12.ebuild b/app-admin/webalizer/webalizer-2.01.10-r12.ebuild
index 404e5823dce7..53b158e2ef90 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r12.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r12.ebuild,v 1.3 2006/01/19 21:09:47 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r12.ebuild,v 1.4 2006/02/22 16:30:38 rl03 Exp $
 
 # uses webapp.eclass to create directories with right permissions
-# probably slight overkil but works well
+# probably slight overkill but works well
 inherit eutils webapp
 
 SLOT="0"
diff --git a/app-admin/webalizer/webalizer-2.01.10-r8.ebuild b/app-admin/webalizer/webalizer-2.01.10-r8.ebuild
deleted file mode 100644
index f20e35a88f12..000000000000
--- a/app-admin/webalizer/webalizer-2.01.10-r8.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r8.ebuild,v 1.1 2005/04/16 01:53:43 beu Exp $
-
-# uses webapps to create directories with right permissions
-# probably slight overkil but works well
-inherit eutils depend.apache webapp
-
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
-	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20040216.tar.bz2 )"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
-IUSE="apache2 geoip"
-
-DEPEND="=sys-libs/db-1*
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3
-	geoip? ( dev-libs/geoip )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# fix --enable-dns; our db1 headers are in /usr/include/db1
-	#	mv dns_resolv.c dns_resolv.c.orig
-	#	sed -e 's%^\(#include \)\(<db.h>\)\(.*\)%\1<db1/db.h>\3%' \
-	#		dns_resolv.c.orig > dns_resolv.c
-	sed -i -e "s,db_185.h,db.h," configure
-
-	if use geoip; then
-		cd ${WORKDIR}
-		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
-	else
-		# pretty printer for numbers
-		cd ${S} && epatch ${FILESDIR}/output.c.patch || die
-	fi
-}
-
-src_compile() {
-	if use geoip; then
-		myconf="`use_enable geoip`"
-	else
-		myconf="--enable-dns"
-	fi
-	myconf="${myconf} --with-db=/usr/include/db1/"
-	einfo "Configuration: ${myconf}"
-	econf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	into /usr
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-
-	insinto /etc
-	newins ${FILESDIR}/${PV}/webalizer.conf webalizer.conf
-
-	if use apache2; then
-		# patch for apache2
-		sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
-		insinto ${APACHE2_CONFDIR}
-	else
-		insinto ${APACHE1_CONFDIR}
-	fi
-
-	doins ${FILESDIR}/${PV}/webalizer.conf
-
-	if use apache2; then
-		insinto ${APACHE2_MODULES_CONFDIR}
-	else
-		insinto ${APACHE1_MODULES_CONFDIR}
-	fi
-	newins ${FILESDIR}/${PV}/apache.webalizer 55_webalizer.conf
-
-	dodoc README* CHANGES Copyright sample.conf
-	webapp_hook_script ${FILESDIR}/${PV}/reconfig
-	webapp_src_install
-}
-
-pkg_postinst(){
-	einfo
-	einfo "Just type webalizer to generate your stats."
-	einfo "You can also use cron to generate them e.g. every day."
-	einfo "They can be accessed via http://localhost/webalizer"
-	einfo
-	webapp_pkg_postinst
-}