app-admin/webalizer: Remove --{en,dis}able-geoip from configure call as a fix to bug #228137

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

3 files changed, 146 insertions, 13 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 00cc259513c6..a4c7ea486dc8 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webalizer
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.73 2009/12/26 10:18:11 tove Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.74 2010/01/03 22:01:01 sping Exp $
+
+*webalizer-2.01.10-r17 (03 Jan 2010)
+
+  03 Jan 2010; Sebastian Pipping <sping@gentoo.org>
+  +webalizer-2.01.10-r17.ebuild:
+  Remove --{en,dis}able-geoip from configure call as a fix to bug #228137
 
   26 Dec 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove smithj from metadata (#95385)
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index cfd7a92f8a7c..d5ccc034a68a 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX apache.webalizer 203 RMD160 2bfd53bfe8f9ec00672ca15f191f30481a2002b0 SHA1 ac0221e785746351871c487f0a5e005dcba243bd SHA256 9cc52c0cd26f7163388d9867f1d518abe9f0954389d64722222bece5d5adb56b
 AUX webalizer-db4.2.patch 645 RMD160 21d9f26c3af35e0fb2c04f65804dc6b7e9aead8c SHA1 00e9cbb99c271b77247eab831ffab5ffbd17c0ee SHA256 46bf2db93b155bd0c29a86fd9a77dc122c205b6cb9f7387c137ff196c29ad3f2
 AUX webalizer-language-list.txt 1520 RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 SHA1 0563e9b42eb63ca24d6dacf48126f0a9ec1a5a16 SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4
@@ -13,12 +10,6 @@ DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e
 DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA1 557406236b10630fb213b12ef30c810a76eac6e5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71
 EBUILD webalizer-2.01.10-r15.ebuild 4271 RMD160 2e073e5c7f2e36c8f04339cc437641adb52c9d8d SHA1 2b993b83572818dd28ebdf90bbc5a588186d6619 SHA256 b04781329576bc89be06e399800b77c6305b53b45b18926003797f6836dc8793
 EBUILD webalizer-2.01.10-r16.ebuild 3876 RMD160 a810fccf0ce86f225fec446e34288266cc69e5c5 SHA1 fee1e34e068f106b55d624f280d36428130550ab SHA256 e7c58be5564b4e98110a1b6eab3cdc0916acafdd584a3e6b32bc0ac76a519682
-MISC ChangeLog 10645 RMD160 51a8933ddac2421c6b715c05a220c638266f0581 SHA1 c31bd02a6ef72275ebbaa1308c3c5864dbda4a62 SHA256 6225c9c57c3fc870c48d981a7e5c2f077b071ceadd9f5db993b58dd5a79a5b45
+EBUILD webalizer-2.01.10-r17.ebuild 3851 RMD160 65298eb185a86fd2b06d6e2107ca6cb027929ea0 SHA1 c915620ac10b01194d156709aaedf51942282cc2 SHA256 15e806e8e99b48de828882ffcb8a36ebb1215c37fdfdb3e926ebd09f81e1c9fd
+MISC ChangeLog 10844 RMD160 532b58b5dbe04e5c44bdc902b8bbbc98afbe4889 SHA1 a7a2db8436d20ccc692447d02749811312eb9c04 SHA256 d8270cc2a028065cd34504723fa3dc73343611aeb6f1bf00debf9bae283fbefa
 MISC metadata.xml 233 RMD160 d096fc5efa30bb590a552300fdf51486f8990348 SHA1 935edd183d9e6436eccdcdf0275147b524f8b52f SHA256 508e864fe9eca5b8405c2d52503c5a4ed3c432bac41391cdefb1c79ec57ce7b9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks14ugACgkQV3J2n04EauyX6QCePsyiny21HezAf+Jx8WxfZQy1
-RdQAoIvgPtjswaFJD+CVN6yl1WmpQTLi
-=mVuq
------END PGP SIGNATURE-----
diff --git a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
new file mode 100644
index 000000000000..560a38810e21
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
@@ -0,0 +1,136 @@
+# 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.01.10-r17.ebuild,v 1.1 2010/01/03 22:01:01 sping Exp $
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+inherit confutils eutils webapp db-use autotools
+
+WEBAPP_MANUAL_SLOT="yes"
+
+MY_PV=${PV/.10/-10}
+MY_P=${PN}-${MY_PV}
+
+XTENDED_VER="RB21"
+XTENDED_URL="rb21"
+GEOLIZER_VER="20070115"
+
+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/stas/files/active/0/geolizer_${MY_PV}-patch.${GEOLIZER_VER}.tar.gz )
+	xtended? ( http://patrickfrei.ch/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="geoip nls xtended"
+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
+	geoip? ( 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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use geoip && ! use xtended; then
+		epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch
+	else
+		epatch "${FILESDIR}"/${PN}-db4.2.patch
+		if use xtended; then
+			epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
+		else
+			epatch "${FILESDIR}"/${PN}-storage-size.patch
+		fi
+	fi
+
+	eautoreconf
+}
+
+src_compile() {
+	# 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} \
+		|| die "econf failed"
+	emake || die "emake 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
+
+	if use xtended; then
+		elog "Read http://patrickfrei.ch/webalizer/${XTENDED_URL}/INSTALL"
+		elog "if you are switching from stock webalizer to xtended"
+	fi
+
+	webapp_pkg_postinst
+}