Patch for dev-libs/geoip[static-libs] by Philippe Chaintreuil (bug #403983).

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

3 files changed, 169 insertions, 2 deletions

diff --git a/app-admin/webalizer-xtended/ChangeLog b/app-admin/webalizer-xtended/ChangeLog
index d74ddc9e9c33..81f9d0242f93 100644
--- a/app-admin/webalizer-xtended/ChangeLog
+++ b/app-admin/webalizer-xtended/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webalizer-xtended
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer-xtended/ChangeLog,v 1.2 2010/10/13 12:11:32 sping Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer-xtended/ChangeLog,v 1.3 2012/02/16 01:38:14 jer Exp $
+
+*webalizer-xtended-2.01.10_p21-r1 (16 Feb 2012)
+
+  16 Feb 2012; Jeroen Roovers <jer@gentoo.org>
+  +webalizer-xtended-2.01.10_p21-r1.ebuild,
+  +files/webalizer-xtended-2.01.10_p21-static-libs.patch:
+  Patch for dev-libs/geoip[static-libs] by Philippe Chaintreuil (bug #403983).
 
   13 Oct 2010; Sebastian Pipping <sping@gentoo.org>
   webalizer-xtended-2.01.10_p21.ebuild,
diff --git a/app-admin/webalizer-xtended/files/webalizer-xtended-2.01.10_p21-static-libs.patch b/app-admin/webalizer-xtended/files/webalizer-xtended-2.01.10_p21-static-libs.patch
new file mode 100644
index 000000000000..e043c1d55523
--- /dev/null
+++ b/app-admin/webalizer-xtended/files/webalizer-xtended-2.01.10_p21-static-libs.patch
@@ -0,0 +1,29 @@
+--- configure.in.org	2012-02-16 02:30:19.953528344 +0100
++++ configure.in	2012-02-16 02:30:20.193512290 +0100
+@@ -40,7 +40,7 @@
+ AC_ARG_WITH(etcdir,--with-etcdir=DIR         Where to look for default config file [[/etc]],
+ ETCDIR="${withval}",CACHE_ETC="yes")
+ 
+-AC_ARG_WITH(gdlib,--with-gdlib=DIR          Where to additionally look for libgd.a,
++AC_ARG_WITH(gdlib,--with-gdlib=DIR          Where to additionally look for libgd.so,
+ EXTRA_GDLIB="${withval}", EXTRA_GDLIB="")
+ AC_ARG_WITH(gd,--with-gd=DIR             Where to additionally look for gd headers,
+ EXTRA_GD="${withval}"; CFLAGS="-I${withval} ${CFLAGS}", EXTRA_GD="")
+@@ -137,7 +137,7 @@
+ fi
+ 
+ if test "$HAVE_LIBGD" = ""; then
+- AC_FIND_PATH(GDLOC,libgd.a,"", ${PREFIX}/lib ${PREFIX}/lib/gd /usr/local/lib /usr/local/lib/gd /usr/local/gd /usr/local/include /usr/local/include/gd /usr/lib/gd /usr/lib /lib ./ ./gd ../gd ${EXTRA_GDLIB} ${EXTRA_GD})
++ AC_FIND_PATH(GDLOC,libgd.so,"", ${PREFIX}/lib ${PREFIX}/lib/gd /usr/local/lib /usr/local/lib/gd /usr/local/gd /usr/local/include /usr/local/include/gd /usr/lib/gd /usr/lib /lib ./ ./gd ../gd ${EXTRA_GDLIB} ${EXTRA_GD})
+  if test "$GDLOC" = ""; then
+    AC_FIND_PATH(GDLOC,libgd.so,"", ${PREFIX}/lib ${PREFIX}/lib/gd /usr/local/lib /usr/local/lib/gd /usr/local/gd /usr/local/include /usr/local/include/gd /usr/lib/gd /usr/lib /lib ./ ./gd ../gd ${EXTRA_GDLIB} ${EXTRA_GD})
+  fi
+@@ -167,7 +167,7 @@
+  fi
+ 
+  dnl Check for GeoIP library
+- AC_FIND_PATH(GEOIPLIB,libGeoIP.a,"", ${PREFIX}/lib /usr/local/lib /usr/lib /lib ${prefix}/lib ./ ${EXTRA_GEOIPLIB})
++ AC_FIND_PATH(GEOIPLIB,libGeoIP.so,"", ${PREFIX}/lib /usr/local/lib /usr/lib /lib ${prefix}/lib ./ ${EXTRA_GEOIPLIB})
+  if test "$GEOIPLIB" = ""; then
+   AC_MSG_ERROR(GeoIP library not found... please install GeoIP.)
+  else
diff --git a/app-admin/webalizer-xtended/webalizer-xtended-2.01.10_p21-r1.ebuild b/app-admin/webalizer-xtended/webalizer-xtended-2.01.10_p21-r1.ebuild
new file mode 100644
index 000000000000..05025c8fa371
--- /dev/null
+++ b/app-admin/webalizer-xtended/webalizer-xtended-2.01.10_p21-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer-xtended/webalizer-xtended-2.01.10_p21-r1.ebuild,v 1.1 2012/02/16 01:38:14 jer Exp $
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+
+EAPI="2"
+
+inherit autotools confutils db-use eutils versionator webapp
+
+WEBAPP_MANUAL_SLOT="yes"
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+WEBALIZER_P="webalizer-${MY_PV}"
+
+DESCRIPTION="Webserver log file analyzer"
+HOMEPAGE="http://www.patrickfrei.ch/webalizer/index.html"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${WEBALIZER_P}-src.tar.bz2
+	http://patrickfrei.ch/webalizer/rb${PV/*_p/}/webalizer-${MY_PV}-RB${PV/*_p/}-patch.tar.gz
+	mirror://gentoo/webalizer.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
+	geoip? ( dev-libs/geoip )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${WEBALIZER_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_prepare() {
+	epatch "${FILESDIR}"/webalizer-db4.2.patch \
+		"${WORKDIR}"/webalizer-${MY_PV}-RB${PV/*_p/}-patch \
+		"${FILESDIR}"/${P}-etc-webalizer-xtended-conf.patch \
+		"${FILESDIR}"/${P}-strip.patch \
+		"${FILESDIR}"/${P}-static-libs.patch
+
+	eautoreconf
+}
+
+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
+
+	if 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) \
+		${myconf} \
+		|| die "econf failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	newbin webalizer webalizer-xtended
+	fperms 755 /usr/bin/webalizer-xtended || die 'fperms failed'
+	dosym webalizer-xtended /usr/bin/webazolver-xtended || die 'dosym failed'
+	newman webalizer.1 webalizer-xtended.1 || die 'newman failed'
+
+	insinto /etc
+	newins "${WORKDIR}"/webalizer.conf webalizer-xtended.conf || die 'doins failed'
+	dosed "s/apache/apache2/g" /etc/webalizer-xtended.conf
+
+	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer-xtended
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog
+	elog "It is suggested that you restart apache before using webalizer"
+	elog "xtended.  You may want to review /etc/webalizer-xtended.conf"
+	elog "and ensure that OutputDir is set correctly."
+	elog
+	elog "Then just type webalizer-xtended 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-xtended"
+	elog
+	elog "A sample Apache config file has been installed into"
+	elog "/usr/share/doc/${PF}/apache.webalizer-xtended"
+	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
+
+	elog "Read http://patrickfrei.ch/webalizer/rb${PV/*_p/}/INSTALL"
+	elog "if you are switching from stock webalizer to xtended"
+
+	webapp_pkg_postinst
+}