webalizer revision bump

Package-Manager: portage-2.1.2.4

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index e43dfc964711df6351664b686cae9b588aa79a96..313f4f13461f107cbc4ea3825dee6f430dafc023 100644 (file)
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.60 2006/10/20 02:39:54 rl03 Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.61 2007/04/19 18:00:08 hanno Exp $
+
+*webalizer-2.01.10-r15 (19 Apr 2007)
+
+  19 Apr 2007; Hanno Boeck <hanno@gentoo.org> +webalizer-2.01.10-r15.ebuild:
+  Bump patchlevel.
 
   20 Oct 2006; Renat Lumpau <rl03@gentoo.org> webalizer-2.01.10-r14.ebuild:
   Always need db. Bug #151901.

diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 63733ff7101f91bf94849fc7a76f6f7f845c00ea..cfb41e792d1a968327f790da9d89741f252a1d93 100644 (file)
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -20,6 +20,7 @@ SHA256 7b89611bccaf9f9b8abf824e270e6ffa4d5447080f1685cfce0ab3a23f2f3314 files/we
 DIST geolizer_2.01-10-patch.20050520.tar.bz2 35836 RMD160 b4abd8498b64c0298e6875ee802cdbeec9086806 SHA1 61adea1082dee6ab683c0ffde48ea73897e540fc SHA256 0914ec2a2401e8f8ae2735984d18714f5331d864c03347ca56ac3c22fb860378
 DIST webalizer-2.01-10-RB07-patch.tar.gz 7778 RMD160 d7a0e672f5817a6a719b13a3dd46999cd6f3b7df SHA1 51dadd3f8f269e95828c393ca8e3c48f3f8113b7 SHA256 b7318aa386a26964aade84b56346d3ffddec8192a03933556c75cbf3a5b1cdc0
 DIST webalizer-2.01-10-RB16-patch.tar.gz 51133 RMD160 0d7be87cf50f83df7d9b4ecfec9192a0c57ebc6a SHA1 1dabbf87672e02db1eaf2b631e22b9ac9646492a SHA256 47a300dd7433e3021c96cc99768860307366f93c3d3219c9f8d639bec9c202bf
+DIST webalizer-2.01-10-RB17-patch.tar.gz 65343 RMD160 d48226e08fc9cf048fb13b8fb1571aa3d1c5cfa8 SHA1 e0a8d379da1ebbe0d22121131bf822d74131092d SHA256 4cca8e09c51963caf0b498bc83d0a741ab097aed0b8c093bb69c31d6fa4f4d73
 DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 SHA1 fbf6ad78fc2b0189d065e661dc02a781e858b31a SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262
 DIST webalizer-search.patch.gz 6424 RMD160 1db8210754f7b7f4fe49d99d51f01b5e7fbb3d13 SHA1 fe555842f1b199bc16c3941187b04fdd3c2ebda6 SHA256 0d9bd3adb4c3e571a9231f0f1a6d689851ff53ffdad9c0e6e3e4e495ff709360
 DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA1 557406236b10630fb213b12ef30c810a76eac6e5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71
@@ -35,10 +36,14 @@ EBUILD webalizer-2.01.10-r14.ebuild 4258 RMD160 cd0a3893163affef629896750bb44fc9
 MD5 45631cdeee7de9908d6ad2776140238a webalizer-2.01.10-r14.ebuild 4258
 RMD160 cd0a3893163affef629896750bb44fc968cc8085 webalizer-2.01.10-r14.ebuild 4258
 SHA256 bf270ed4f804a226186d8a2c0b6d3192fae156083cb572ff214852c54148209c webalizer-2.01.10-r14.ebuild 4258
-MISC ChangeLog 8809 RMD160 ec30b3f08fc9a1b82a86703641e253df41d7a96b SHA1 828b052ee4e0a3cf4487e13c5d1877a9401896e7 SHA256 8d2d703d656e115844213603e1ab80321f74a91a9b9f43360fdcc7c5c65a499f
-MD5 cf88a4d883c885b9aea04c726a40a269 ChangeLog 8809
-RMD160 ec30b3f08fc9a1b82a86703641e253df41d7a96b ChangeLog 8809
-SHA256 8d2d703d656e115844213603e1ab80321f74a91a9b9f43360fdcc7c5c65a499f ChangeLog 8809
+EBUILD webalizer-2.01.10-r15.ebuild 4259 RMD160 79391b1f9ea8ab4979b602e9b8ee96b0fa082eac SHA1 c224a7179762e7b01d47531c13bf06599a93a515 SHA256 0db989ee0cc08509a5c6a3adab8e2f19bccf7a37ae12a32a1cbbd019a230a1c3
+MD5 c8aeb5cc36bfcddb8bd7369963367448 webalizer-2.01.10-r15.ebuild 4259
+RMD160 79391b1f9ea8ab4979b602e9b8ee96b0fa082eac webalizer-2.01.10-r15.ebuild 4259
+SHA256 0db989ee0cc08509a5c6a3adab8e2f19bccf7a37ae12a32a1cbbd019a230a1c3 webalizer-2.01.10-r15.ebuild 4259
+MISC ChangeLog 8945 RMD160 3ee67c2b7dc59ef19366606cef40184d537cdf14 SHA1 0a3d3e4b1775b67530cc1118ffac3da707067649 SHA256 40b844abcddf847146e85778f24dc3d1cd1cdbc71c375284579096a545aafd59
+MD5 e21f6abca49d508cbc6006d0ab121103 ChangeLog 8945
+RMD160 3ee67c2b7dc59ef19366606cef40184d537cdf14 ChangeLog 8945
+SHA256 40b844abcddf847146e85778f24dc3d1cd1cdbc71c375284579096a545aafd59 ChangeLog 8945
 MISC metadata.xml 223 RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 SHA1 1b044a209c743679605d2ac885b26ce7fb55773b SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79
 MD5 f4ab9f9db4e50708404d47337257cd4e metadata.xml 223
 RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 metadata.xml 223
@@ -52,10 +57,13 @@ SHA256 8d25ea7f8a46b22fc68875e96be12c2b738f7f758245aa63d1ab032af972cc19 files/di
 MD5 97da17eddcac40dd836fd2e0df5b9d94 files/digest-webalizer-2.01.10-r14 1072
 RMD160 e6e30c656cec17845d462ca46c25bf9eac0bb70e files/digest-webalizer-2.01.10-r14 1072
 SHA256 6552d8630d3d010b97e64f18404c6dcbd4c3d09d7d95b54a6be6e0c2541b929b files/digest-webalizer-2.01.10-r14 1072
+MD5 76a37455bb995142184da76988611580 files/digest-webalizer-2.01.10-r15 1072
+RMD160 145687529913bb7d93594d311aa7cee42fd36847 files/digest-webalizer-2.01.10-r15 1072
+SHA256 4ee0368b3a58734e9a2bb7e1289e600bb214e4d0b83e2530d14696ac22358267 files/digest-webalizer-2.01.10-r15 1072
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFODcXEzitwsaoONoRAj08AKCLE0DdSvTMJaUoRAyXJC12XbM3NgCgszP8
-dgkfH+Lzj7+hQG2mjfhrdG4=
-=pPEE
+iD8DBQFGJ64cr2QksT29OyARAi6zAJ0fA2FJ0lhj0xbAKXxl2NSymLjylgCfQKkj
+p2EEIz5MmYSm4a5Rn0r2r+Q=
+=GZCn
 -----END PGP SIGNATURE-----

diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r15 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r15
new file mode 100644 (file)
index 0000000..54d1139
--- /dev/null
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r15
@@ -0,0 +1,12 @@
+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 6439a575f2365ca5afca2876a7e1a542 webalizer-2.01-10-RB17-patch.tar.gz 65343
+RMD160 d48226e08fc9cf048fb13b8fb1571aa3d1c5cfa8 webalizer-2.01-10-RB17-patch.tar.gz 65343
+SHA256 4cca8e09c51963caf0b498bc83d0a741ab097aed0b8c093bb69c31d6fa4f4d73 webalizer-2.01-10-RB17-patch.tar.gz 65343
+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
+MD5 896ffc3eb54f42611b2412eafdf87cfc webalizer.conf.gz 8986
+RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 webalizer.conf.gz 8986
+SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 webalizer.conf.gz 8986

diff --git a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
new file mode 100644 (file)
index 0000000..276d490
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2007 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-r15.ebuild,v 1.1 2007/04/19 18:00:08 hanno Exp $
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+inherit eutils webapp db-use autotools
+
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+MY_PV=${PV/.10/-10}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+XTENDED_VER="RB17"
+XTENDED_URL="rb17"
+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.20050520.tar.bz2 )
+       xtended? (
+       http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
+       mirror://gentoo/${PN}.conf.gz
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 geoip nls xtended"
+
+DEPEND=">=sys-libs/db-4.2
+       >=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}
+
+       if use geoip; then
+               epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
+               use xtended && elog "Xtended doesn't work with geolizer, skipping"
+       else
+               epatch ${FILESDIR}/${PN}-db4.2.patch || die
+               if use xtended; then
+                       epatch ${WORKDIR}/${PN}-${MY_PV}-${XTENDED_VER}-patch || die
+               fi
+       fi
+
+       # bug 121816: prevent truncated useragent fields
+       sed -i -e 's:^#define MAXAGENT 64:#define MAXAGENT 128:' webalizer.h
+}
+
+src_compile() {
+       local myconf=" --enable-dns \
+               --with-db=$(db_includedir) \
+               --with-dblib=$(db_libname)"
+       use geoip && myconf="${myconf} --enable-geoip"
+
+       # 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
+       eautoreconf
+
+       econf ${myconf} || die "econf failed"
+
+       emake || die "emake failed"
+}
+
+src_install() {
+       webapp_src_preinst
+
+       into /usr
+       dobin webalizer
+       dosym webalizer /usr/bin/webazolver
+       doman webalizer.1
+
+       insinto /etc
+       doins ${WORKDIR}/${PN}.conf
+       use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
+
+       dodoc *README* CHANGES Copyright 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
+
+       if use xtended; then
+               elog "Read http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/INSTALL"
+               elog "if you are switching from stock webalizer to xtended"
+       fi
+
+       webapp_pkg_postinst
+}