[gentoo-commits] gentoo-x86 commit in app-admin/webalizer: webalizer-2.01.10-r15.ebuild ChangeLog metadata.xml webalizer-2.01.10-r16.ebuild webalizer-2.01.10-r13.ebuild webalizer-2.01.10-r14.ebuild webalizer-2.01.10-r12.ebuild

[Benedikt Boehm (hollow)]

hollow      08/02/23 16:52:35

  Modified:             webalizer-2.01.10-r15.ebuild ChangeLog metadata.xml
  Added:                webalizer-2.01.10-r16.ebuild
  Removed:              webalizer-2.01.10-r13.ebuild
                        webalizer-2.01.10-r14.ebuild
                        webalizer-2.01.10-r12.ebuild
  Log:
  ebuild cleanup wrt #208584; fixes #156785, #200855 and maybe #184732; bumps geolizer and xtended to current versions
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.9                  app-admin/webalizer/webalizer-2.01.10-r15.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?r1=1.8&r2=1.9

Index: webalizer-2.01.10-r15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- webalizer-2.01.10-r15.ebuild	10 Jul 2007 20:53:03 -0000	1.8
+++ webalizer-2.01.10-r15.ebuild	23 Feb 2008 16:52:34 -0000	1.9
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.8 2007/07/10 20:53:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.9 2008/02/23 16:52:34 hollow Exp $
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well



1.69                 app-admin/webalizer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/ChangeLog?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/ChangeLog?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/ChangeLog?r1=1.68&r2=1.69

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog	10 Jul 2007 20:53:03 -0000	1.68
+++ ChangeLog	23 Feb 2008 16:52:34 -0000	1.69
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/webalizer
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.68 2007/07/10 20:53:03 gustavoz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.69 2008/02/23 16:52:34 hollow Exp $
+
+*webalizer-2.01.10-r16 (23 Feb 2008)
+
+  23 Feb 2008; Benedikt Böhm <hollow@g.o> files/apache.webalizer,
+  -files/webalizer-readability.patch, +files/webalizer-storage-size.patch,
+  metadata.xml, -webalizer-2.01.10-r12.ebuild,
+  -webalizer-2.01.10-r13.ebuild, -webalizer-2.01.10-r14.ebuild,
+  +webalizer-2.01.10-r16.ebuild:
+  ebuild cleanup wrt #208584; fixes #156785, #200855 and maybe #184732; bumps
+  geolizer and xtended to current versions
 
   10 Jul 2007; Gustavo Zacarias <gustavoz@g.o>
   webalizer-2.01.10-r15.ebuild:



1.5                  app-admin/webalizer/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/metadata.xml?r1=1.4&r2=1.5

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml	9 Aug 2005 22:43:02 -0000	1.4
+++ metadata.xml	23 Feb 2008 16:52:34 -0000	1.5
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-  <email>smithj@g.o</email>
-</maintainer>
+	<herd>web-apps</herd>
+	<maintainer>
+		<email>smithj@g.o</email>
+	</maintainer>
 </pkgmetadata>



1.1                  app-admin/webalizer/webalizer-2.01.10-r16.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild?rev=1.1&content-type=text/plain

Index: webalizer-2.01.10-r16.ebuild
===================================================================
# Copyright 1999-2008 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-r16.ebuild,v 1.1 2008/02/23 16:52:34 hollow 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) \
		$(use_enable geoip) \
		${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
}



-- 
gentoo-commits@l.g.o mailing list