summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2010-01-03 22:24:59 +0000
committerSebastian Pipping <sping@gentoo.org>2010-01-03 22:24:59 +0000
commit7f2a8e1f4eae9ec0f6a96565a2648501b278c0b8 (patch)
tree3c2a66fcdb48cf48438c7ade7c4337c75da312c6 /app-admin
parentstable x86, security bug 255363 (diff)
downloadhistorical-7f2a8e1f4eae9ec0f6a96565a2648501b278c0b8.tar.gz
historical-7f2a8e1f4eae9ec0f6a96565a2648501b278c0b8.tar.bz2
historical-7f2a8e1f4eae9ec0f6a96565a2648501b278c0b8.zip
app-admin/webalizer: Fix case with USE="xtended geoip" that I broke with r17 before
Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/webalizer/ChangeLog6
-rw-r--r--app-admin/webalizer/Manifest4
-rw-r--r--app-admin/webalizer/webalizer-2.01.10-r17.ebuild9
3 files changed, 15 insertions, 4 deletions
diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index a4c7ea486dc8..aedf5d32eafe 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,10 @@
# 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.74 2010/01/03 22:01:01 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.75 2010/01/03 22:24:59 sping Exp $
+
+ 03 Jan 2010; Sebastian Pipping <sping@gentoo.org>
+ webalizer-2.01.10-r17.ebuild:
+ Fix case with USE="xtended geoip" that I broke with r17 before
*webalizer-2.01.10-r17 (03 Jan 2010)
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index d5ccc034a68a..d43c6fc01d43 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -10,6 +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
-EBUILD webalizer-2.01.10-r17.ebuild 3851 RMD160 65298eb185a86fd2b06d6e2107ca6cb027929ea0 SHA1 c915620ac10b01194d156709aaedf51942282cc2 SHA256 15e806e8e99b48de828882ffcb8a36ebb1215c37fdfdb3e926ebd09f81e1c9fd
-MISC ChangeLog 10844 RMD160 532b58b5dbe04e5c44bdc902b8bbbc98afbe4889 SHA1 a7a2db8436d20ccc692447d02749811312eb9c04 SHA256 d8270cc2a028065cd34504723fa3dc73343611aeb6f1bf00debf9bae283fbefa
+EBUILD webalizer-2.01.10-r17.ebuild 4035 RMD160 ebc3d4f2906f89fb9209d10835dd02f783fcde94 SHA1 2d7239430a61a67fb4920ac74a2cb467ade1d740 SHA256 733ea632199eea2958c0f3232f42c1bac5331b2312d7d138c463baeeea3a8d05
+MISC ChangeLog 10994 RMD160 b7822ef7ff056fd1abef9e78b54450fa9231be71 SHA1 cc2ef495618ac7ea60d60c9d23e85cf619fe5c11 SHA256 c601644280894b9fb9d43e4cbb3c300e6a639390304392e171ade56a87031d23
MISC metadata.xml 233 RMD160 d096fc5efa30bb590a552300fdf51486f8990348 SHA1 935edd183d9e6436eccdcdf0275147b524f8b52f SHA256 508e864fe9eca5b8405c2d52503c5a4ed3c432bac41391cdefb1c79ec57ce7b9
diff --git a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
index 560a38810e21..1a963321a094 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v 1.2 2010/01/03 22:24:59 sping Exp $
# uses webapp.eclass to create directories with right permissions
# probably slight overkill but works well
@@ -78,6 +78,13 @@ src_compile() {
local myconf="${myconf} --with-language=english"
fi
+ if use xtended && use geoip ; then
+ # Rationale:
+ # 1. --enable-geoip broken on geolizer
+ # 2. --disable-geoip broken on webalizer xtended
+ myconf="${myconf} --enable-geoip"
+ fi
+
econf --enable-dns \
--with-db=$(db_includedir) \
--with-dblib=$(db_libname) \