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

(Portage version: 2.2_rc67_p185/cvs/Linux i686)

4 files changed, 140 insertions, 4 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/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
 }