app-admin/webalizer: Bump to 2.21.02 (bug #231859)

Package-Manager: portage-2.2_rc66/cvs/Linux i686

3 files changed, 121 insertions, 2 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 3e4f07077d0c..503ae5ada3bd 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.76 2010/03/10 16:50:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.77 2010/03/10 17:15:39 sping Exp $
+
+*webalizer-2.21.02 (10 Mar 2010)
+
+  10 Mar 2010; Sebastian Pipping <sping@gentoo.org>
+  +webalizer-2.21.02.ebuild:
+  Bump to 2.21.02 (bug #231859)
+  geolizer and webalizer xtended now have dedicated packages
 
   10 Mar 2010; Sebastian Pipping <sping@gentoo.org>
   webalizer-2.01.10-r15.ebuild, webalizer-2.01.10-r16.ebuild,
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 21486fce4950..59c07654b52f 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -7,9 +7,11 @@ DIST geolizer_2.01-10-patch.20070115.tar.gz 76862 RMD160 69cfce9dad0a1d339870d14
 DIST webalizer-2.01-10-RB17-patch.tar.gz 65343 RMD160 d48226e08fc9cf048fb13b8fb1571aa3d1c5cfa8 SHA1 e0a8d379da1ebbe0d22121131bf822d74131092d SHA256 4cca8e09c51963caf0b498bc83d0a741ab097aed0b8c093bb69c31d6fa4f4d73
 DIST webalizer-2.01-10-RB21-patch.tar.gz 585340 RMD160 bfd020cf078342ebc5b660793a6eb5486ff46edb SHA1 6d70e043368e3d459f6f053580f8b9da6a0a82aa SHA256 6ac3bfcba695e0c124ea3bc23581e0d7a14d2cda05caf47beb6b09bdfcf3541d
 DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 SHA1 fbf6ad78fc2b0189d065e661dc02a781e858b31a SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262
+DIST webalizer-2.21-02-src.tar.bz2 304926 RMD160 c7d48acf6e2c1fedfd04eac30214a76db7c84aee SHA1 b637ebf1eb459e03c052c24d7da3e5f0794e2230 SHA256 f2663d67f5820644a0b1c0b7dee4a5c764d829166fa28d5880442c28886729d9
 DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA1 557406236b10630fb213b12ef30c810a76eac6e5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71
 EBUILD webalizer-2.01.10-r15.ebuild 4273 RMD160 d3570be5cdc2898593513b074a3e49057cbd9446 SHA1 2524af7516bbb74bedfa2201a3752499dcf13776 SHA256 da6ddaef882f32b56414f9ac823ec5266f9a67f8a46d369a67997cd252e1c04d
 EBUILD webalizer-2.01.10-r16.ebuild 3879 RMD160 e2c89172ba3600fa2f5f22869e161b9a96ac9218 SHA1 3c1b3a90df502d1a363496f6cd00fbffac554bed SHA256 68c0f858369c0728b5b6507607d59b95ba3d77798f3d819ad4b92d717d144361
 EBUILD webalizer-2.01.10-r17.ebuild 4039 RMD160 daf8bd0a5db5307da60a14d33ac9f3d6c8777c63 SHA1 9880d7eddabc4262564bf2dfc350637fe3b69e82 SHA256 88103587dd4c9a5fcbce63f8301ed2fe05b4bab1dc0598c246dc77ab6cd902e8
-MISC ChangeLog 11155 RMD160 e961693c9ba305646c063d0c2b96b28697f14196 SHA1 0c1ee43b575bb0b0e6d596dd30d009735c70997f SHA256 dd4f8393413f6de7259d6469f0d7accc3031cd1c3da9259708ec1dbe7578c4ba
+EBUILD webalizer-2.21.02.ebuild 3170 RMD160 8b74207ec1fabc581caa5ab866c718d2aa1bf3e9 SHA1 39ffbe5794e450ecb8eeb5914ae12f080d928fbe SHA256 3d186e2bb08360c2b170e3498217af21a05b91084b6419d72d3f54326d7e5443
+MISC ChangeLog 11364 RMD160 2fbecbb02a4e6a7322999a228e30a295f95172f4 SHA1 b8515ae0488a71bb77e12d7c956691fc80860a76 SHA256 b62c5a61431c6ce36ea6187094ddd82936217a43550c82fa2ec9f9fd20d5bcc9
 MISC metadata.xml 233 RMD160 d096fc5efa30bb590a552300fdf51486f8990348 SHA1 935edd183d9e6436eccdcdf0275147b524f8b52f SHA256 508e864fe9eca5b8405c2d52503c5a4ed3c432bac41391cdefb1c79ec57ce7b9
diff --git a/app-admin/webalizer/webalizer-2.21.02.ebuild b/app-admin/webalizer/webalizer-2.21.02.ebuild
new file mode 100644
index 000000000000..560f8c1d79d3
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.21.02.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.1 2010/03/10 17:15:39 sping Exp $
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+
+EAPI="2"
+
+inherit versionator confutils eutils webapp db-use
+
+WEBAPP_MANUAL_SLOT="yes"
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Webserver log file analyzer"
+HOMEPAGE="http://www.mrunix.net/webalizer/"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
+	mirror://gentoo/${PN}.conf.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="geoip nls"
+SLOT="0"
+
+DEPEND=">=sys-libs/db-4.2
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.2
+	>=media-libs/gd-1.8.3
+	dev-libs/geoip"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+	confutils_require_built_with_all media-libs/gd png
+
+	# 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_configure() {
+	# 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="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)"
+		local myconf="${myconf} --with-language=${longlang:3}"
+	else
+		local myconf="${myconf} --with-language=english"
+	fi
+
+	econf --enable-dns \
+		--with-db=$(db_includedir) \
+		--with-dblib=$(db_libname) \
+		${myconf} \
+		$(use_enable geoip) \
+		--with-geodb=/usr/share/webalizer/geodb \
+		|| die "econf failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dobin webalizer
+	dosym webalizer /usr/bin/webazolver
+	doman webalizer.1
+
+	insinto /etc
+	doins "${WORKDIR}"/${PN}.conf
+	dosed "s/apache/apache2/g" /etc/webalizer.conf
+
+	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog
+	elog "It is suggested that you restart apache before using webalizer"
+	elog "You may want to review /etc/webalizer.conf and ensure that"
+	elog "OutputDir is set correctly"
+	elog
+	elog "Then just type webalizer to generate your stats."
+	elog "You can also use cron to generate them e.g. every day."
+	elog "They can be accessed via http://localhost/webalizer"
+	elog
+	elog "A sample Apache config file has been installed into"
+	elog "/usr/share/doc/${PF}/apache.webalizer"
+	elog "Please edit and install it as necessary"
+	elog
+
+	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
+}