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

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 182 insertions, 3 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/Manifest b/app-admin/webalizer-xtended/Manifest
index 0f8fa65254b4..641832f05706 100644
--- a/app-admin/webalizer-xtended/Manifest
+++ b/app-admin/webalizer-xtended/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apache.webalizer-xtended 219 RMD160 ae431a479361d1b8bedf69afb3772c2fabdf4e2d SHA1 3de8b01916c6a021a4b70fb67a52e15cdb0ab2e2 SHA256 e393c989a5f16d94d830cab6dca68e0b5a3a9a59d929a74c555afffe56507a78
 AUX webalizer-db4.2.patch 645 RMD160 21d9f26c3af35e0fb2c04f65804dc6b7e9aead8c SHA1 00e9cbb99c271b77247eab831ffab5ffbd17c0ee SHA256 46bf2db93b155bd0c29a86fd9a77dc122c205b6cb9f7387c137ff196c29ad3f2
 AUX webalizer-language-list.txt 1520 RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 SHA1 0563e9b42eb63ca24d6dacf48126f0a9ec1a5a16 SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4
 AUX webalizer-xtended-2.01.10_p21-etc-webalizer-xtended-conf.patch 2854 RMD160 0c9ac22c98a13b56e64027805e2a6e9d5640ade5 SHA1 af64ca4e2765c5ee9c4e1bc2388ad92ac45fac20 SHA256 eee7d0102516fb2e31c045e229b007bee38605fa6bd7c7527a4148fafcbc484e
+AUX webalizer-xtended-2.01.10_p21-static-libs.patch 1790 RMD160 52667634aa35cc373283c7da668d0bbb9b066705 SHA1 f0c88af552a0486aa121db9bcb1ca73887562ec1 SHA256 b49f5f9f8646b8388fc72f99ab0db81a989b2435cbe86c61e0f9a456e3e74244
 AUX webalizer-xtended-2.01.10_p21-strip.patch 442 RMD160 f670b78e25f7d419b8f02d4e754e724e1f78f6b1 SHA1 35d052f1c35e6f80aded04672debf6a55c2cce2c SHA256 80b72fa993438ed69c493df9c6ccce694f29bfed8e2215abbe6fae2e54a71929
 DIST webalizer-2.01-10-RB21-patch.tar.gz 585340 RMD160 bfd020cf078342ebc5b660793a6eb5486ff46edb SHA1 6d70e043368e3d459f6f053580f8b9da6a0a82aa SHA256 6ac3bfcba695e0c124ea3bc23581e0d7a14d2cda05caf47beb6b09bdfcf3541d
 DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 SHA1 fbf6ad78fc2b0189d065e661dc02a781e858b31a SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262
 DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA1 557406236b10630fb213b12ef30c810a76eac6e5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71
+EBUILD webalizer-xtended-2.01.10_p21-r1.ebuild 4135 RMD160 c1905e533a614c39fc948bf7be423780fee108b9 SHA1 302ff34aa10aa53d80a19c954d74e2a7f7a15bce SHA256 6ac032d08001a0a1271c70b94874eafd54b6553f186ad9d7192bc46e8d6745bc
 EBUILD webalizer-xtended-2.01.10_p21.ebuild 4085 RMD160 04498a7eea3201ce9e6e85f85c7ee854744de8eb SHA1 f94d134a24faf3023185c685dd8377fbd8e9712d SHA256 363e3c47e6d1a648adbbe7c993fca05422e6ff602340b965e20bb6638aff36db
-MISC ChangeLog 780 RMD160 fbdcec230059b726452511c618e7cd77f5d9c43d SHA1 c42d40586d4620ed7d50214ab290258435a0d667 SHA256 387d7c56c569d3ff0c453a764e4cd0e96884b527a5a1cbd81700bfe8ca1d6d93
+MISC ChangeLog 1056 RMD160 97ba6ca232114be891dafff93761c5b6b3b9c21b SHA1 63552d4605ef9ac79d8dce9b793ee1c8c4e9f9ac SHA256 86c672776f3716a1ebe5ae7a38459d922d9fa22b5efe6ce355fd75b995e3faf7
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk88XgsACgkQVWmRsqeSphN30wCffumQtC4q0UkZEZsbUKVkhHOV
++ewAni7IMheYIRV/zJ7lcUDhJ4d26Tb6
+=+C+8
+-----END PGP SIGNATURE-----
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
+}