app-admin/geolizer: Fix pre-stripped binaries (QA bug #337608)

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

5 files changed, 144 insertions, 20 deletions

diff --git a/app-admin/geolizer/ChangeLog b/app-admin/geolizer/ChangeLog
index 9334c6ae276f..99ad8c32550e 100644
--- a/app-admin/geolizer/ChangeLog
+++ b/app-admin/geolizer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/geolizer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/geolizer/ChangeLog,v 1.2 2010/03/12 23:08:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/geolizer/ChangeLog,v 1.3 2010/09/17 06:47:32 sping Exp $
+
+*geolizer-2.01.10_p20070115-r1 (17 Sep 2010)
+
+  17 Sep 2010; Sebastian Pipping <sping@gentoo.org>
+  geolizer-2.01.10_p20070115.ebuild, +geolizer-2.01.10_p20070115-r1.ebuild,
+  +files/geolizer-2.01.10_p20070115-strip.patch:
+  Fix pre-stripped binaries (QA bug #337608)
 
   12 Mar 2010; Dror Levin <spatz@gentoo.org>
   geolizer-2.01.10_p20070115.ebuild:
diff --git a/app-admin/geolizer/Manifest b/app-admin/geolizer/Manifest
index 99a1f8771ea0..06f328a72706 100644
--- a/app-admin/geolizer/Manifest
+++ b/app-admin/geolizer/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX apache.geolizer 201 RMD160 e21f55236aece4458aed556d7b6ca960b0fcfada SHA1 2f2f47c9ea2d80e7ef2b400f3c71ba8941961af0 SHA256 4dfc00b436ce1412e6039acf2a2f4388e8c12e7e20e06d1d12b1f2807b1a4bdc
 AUX geolizer-2.01.10_p20070115-etc-geolizer-conf.patch 2888 RMD160 557187409fd424b3cd98be790ed1db1e78d3ba16 SHA1 12c31f3c3b4408fc367e1d93b68fa95e096802e2 SHA256 8ca080d72368cbaec84671fef4874f012653234d7cfed4c095a08b94bfafaac6
+AUX geolizer-2.01.10_p20070115-strip.patch 442 RMD160 f670b78e25f7d419b8f02d4e754e724e1f78f6b1 SHA1 35d052f1c35e6f80aded04672debf6a55c2cce2c SHA256 80b72fa993438ed69c493df9c6ccce694f29bfed8e2215abbe6fae2e54a71929
 AUX geolizer-language-list.txt 1520 RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 SHA1 0563e9b42eb63ca24d6dacf48126f0a9ec1a5a16 SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4
 DIST geolizer_2.01-10-patch.20070115.tar.gz 76862 RMD160 69cfce9dad0a1d339870d14fba526da36bb11fcf SHA1 96938412c9a276278fc5d77f7157aa02b85f2b56 SHA256 a619f863c9a65a06580080702e770251b8b4dc635e2ebf0fdb56a40b0f7eb1b3
 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 geolizer-2.01.10_p20070115.ebuild 3555 RMD160 cd17e695769e8ff89dbdcbdb263a98e1832507b8 SHA1 5a6e7185bdd0596d6321cc71550772bfd3d0aebe SHA256 301cfcf576c6556945856b3aec52b6fe451da1cde2b003f804b9ea4e68d04477
-MISC ChangeLog 631 RMD160 e92012075353f76411a610057e6e13c3034c355e SHA1 5bf777cb5f206d832103f80b4d56db9ef3fcaf3d SHA256 c94ac4faaf025385cacb741c398f8cd921305fd0c243ed2df4527c99ca3b28d7
+EBUILD geolizer-2.01.10_p20070115-r1.ebuild 3591 RMD160 dc06c722c002a7c047a196448e1e9ef0f37d3cfc SHA1 fc0819fb6bdf6844c6a30834ed658d5e1a94bbda SHA256 898decccfb980b0df8e7a7d0b044ae66c564538186b8ff5241b1822381f11af3
+EBUILD geolizer-2.01.10_p20070115.ebuild 3588 RMD160 67e9e5629c4db7195a100f47a91e334a0daa7d64 SHA1 683cd870ffb6618d62c60fdeb414aac420da9268 SHA256 c96ab0e18b23a2a654749cef62c3a466060810e151fc29f94057c978d662a580
+MISC ChangeLog 900 RMD160 1d9dc6fcdf979852404335f8811c7d517022f300 SHA1 fb97800eab8e0b2fdd0da041fbcce0668649dda1 SHA256 fa9f706a61dcf64c809897f37c7d2a5df1c81ec48c0b16a547af8517e7149822
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQEcBAEBCgAGBQJLmsmKAAoJEAWF714uGAc6F9gH/j1vDJatzDY4F7GwTXa320lg
-ct9TRdZEV7KrAjSJTxep/62EKS99juaMZ3YVqlVaJ6sU7xdvb1vrH4UMTzeqHXqZ
-vOmyQAEa5m9m4kvagDNfqYKpl28Qnb4T9cLWn7TqnGxwFJALb9WxclNhY62uRZsH
-m/YstpVbiZD5wKYFXnPc1sADmWyFZ2hFBkCQ5NyOOgptusqjP3H5YjpbtYdnG7ci
-7cAK2hHuDMDYiRNAvVfpEflpcAjjoAvREBRQsN2hWIFGg/4vmY5/oDM4xNaBxOJQ
-rgkrpDIVS3dWwWGLH9RkXwQIx2YL0YB2YzDDawGZiUjfC8PG0eH21Ral6ucElS0=
-=SSJ4
------END PGP SIGNATURE-----
diff --git a/app-admin/geolizer/files/geolizer-2.01.10_p20070115-strip.patch b/app-admin/geolizer/files/geolizer-2.01.10_p20070115-strip.patch
new file mode 100644
index 000000000000..8cf07532bda2
--- /dev/null
+++ b/app-admin/geolizer/files/geolizer-2.01.10_p20070115-strip.patch
@@ -0,0 +1,10 @@
+--- webalizer-2.01-10/Makefile.in_BACKUP	2010-09-17 08:39:52.000000000 +0200
++++ webalizer-2.01-10/Makefile.in	2010-09-17 08:40:02.000000000 +0200
+@@ -45,7 +45,6 @@
+                 output.o output.h graphs.o graphs.h lang.h   \
+ 		webalizer_lang.h
+ 	$(CC) ${LDFLAGS} -o webalizer webalizer.o hashtab.o linklist.o preserve.o parser.o output.o dns_resolv.o graphs.o ${LIBS}
+-	strip webalizer
+ 	rm -f webazolver
+ 	@LN_S@ webalizer webazolver
+ 
diff --git a/app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild b/app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild
new file mode 100644
index 000000000000..0fd3204128e8
--- /dev/null
+++ b/app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild,v 1.1 2010/09/17 06:47:32 sping Exp $
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+
+EAPI="2"
+
+inherit versionator confutils eutils webapp db-use autotools
+
+WEBAPP_MANUAL_SLOT="yes"
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+WEBALIZER_P="webalizer-${MY_PV}"
+GEOLIZER_P="${PN}_${MY_PV}-patch.${PV/*_p/}"
+
+DESCRIPTION="Webserver log file analyzer"
+HOMEPAGE="http://sysd.org/stas/node/10"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${WEBALIZER_P}-src.tar.bz2
+	http://sysd.org/stas/files/active/0/${GEOLIZER_P}.tar.gz
+	mirror://gentoo/webalizer.conf.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="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
+	dev-libs/geoip"
+
+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 "${WORKDIR}"/${PN}_${MY_PV}-patch/${PN}.patch \
+			"${FILESDIR}"/${P}-etc-geolizer-conf.patch \
+			"${FILESDIR}"/${P}-strip.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}"/geolizer-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"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	newbin webalizer geolizer
+	fperms 755 /usr/bin/geolizer
+	dosym geolizer /usr/bin/geozolver || die 'dosym failed'
+	newman webalizer.1 geolizer.1 || die 'newman failed'
+
+	insinto /etc
+	newins "${WORKDIR}"/webalizer.conf geolizer.conf || die 'doins failed'
+	dosed "s/apache/apache2/g" /etc/geolizer.conf || die 'dosed failed'
+
+	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.geolizer || die 'dodoc failed'
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog
+	elog "It is suggested that you restart apache before using geolizer"
+	elog "You may want to review /etc/geolizer.conf and ensure that"
+	elog "OutputDir is set correctly"
+	elog
+	elog "Then just type geolizer 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/geolizer"
+	elog
+	elog "A sample Apache config file has been installed into"
+	elog "/usr/share/doc/${PF}/apache.geolizer"
+	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
+
+	webapp_pkg_postinst
+}
diff --git a/app-admin/geolizer/geolizer-2.01.10_p20070115.ebuild b/app-admin/geolizer/geolizer-2.01.10_p20070115.ebuild
index 4087327261d9..f8181e65ff94 100644
--- a/app-admin/geolizer/geolizer-2.01.10_p20070115.ebuild
+++ b/app-admin/geolizer/geolizer-2.01.10_p20070115.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/geolizer/geolizer-2.01.10_p20070115.ebuild,v 1.2 2010/03/12 23:08:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/geolizer/geolizer-2.01.10_p20070115.ebuild,v 1.3 2010/09/17 06:47:32 sping Exp $
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@@ -47,8 +47,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${MY_PV}-patch/${PN}.patch
-	epatch "${FILESDIR}"/${P}-etc-geolizer-conf.patch
+	epatch "${WORKDIR}"/${PN}_${MY_PV}-patch/${PN}.patch \
+			"${FILESDIR}"/${P}-etc-geolizer-conf.patch \
+			"${FILESDIR}"/${P}-strip.patch
 	eautoreconf
 }