diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2010-10-28 03:35:18 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2010-10-28 03:35:18 +0000 |
| commit | 4d128dc02d03a16a082809053d1a3a732f0e8fee (patch) | |
| tree | 7b98dd015d87145f0c58e0f6b57e2b0bdeb0be6a /app-admin/webalizer | |
| parent | app-admin/webalizer: Replace built_with_use by use dependency, explicitly ass... (diff) | |
| download | gentoo-2-4d128dc02d03a16a082809053d1a3a732f0e8fee.tar.gz gentoo-2-4d128dc02d03a16a082809053d1a3a732f0e8fee.tar.bz2 gentoo-2-4d128dc02d03a16a082809053d1a3a732f0e8fee.zip | |
app-admin/webalizer: Fix pre-stripping files with USE=geoip (bug #331035)
(Portage version: 2.1.9.22/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/webalizer')
| -rw-r--r-- | app-admin/webalizer/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/webalizer/files/geolizer-2.01.10_p20070115-strip.patch | 10 | ||||
| -rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r15.ebuild | 5 | ||||
| -rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r16.ebuild | 5 | ||||
| -rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r17.ebuild | 5 |
5 files changed, 26 insertions, 7 deletions
diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog index f9795fee7f18..6bca6e8f4abb 100644 --- a/app-admin/webalizer/ChangeLog +++ b/app-admin/webalizer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/webalizer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.80 2010/10/28 03:14:50 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.81 2010/10/28 03:35:18 sping Exp $ + + 28 Oct 2010; Sebastian Pipping <sping@gentoo.org> + webalizer-2.01.10-r15.ebuild, webalizer-2.01.10-r16.ebuild, + webalizer-2.01.10-r17.ebuild, + +files/geolizer-2.01.10_p20070115-strip.patch: + Fix pre-stripping files with USE=geoip (bug #331035) 28 Oct 2010; Sebastian Pipping <sping@gentoo.org> webalizer-2.01.10-r15.ebuild, webalizer-2.01.10-r16.ebuild, diff --git a/app-admin/webalizer/files/geolizer-2.01.10_p20070115-strip.patch b/app-admin/webalizer/files/geolizer-2.01.10_p20070115-strip.patch new file mode 100644 index 000000000000..8cf07532bda2 --- /dev/null +++ b/app-admin/webalizer/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/webalizer/webalizer-2.01.10-r15.ebuild b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild index f704b3f41715..5c3e581e18f8 100644 --- a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild +++ b/app-admin/webalizer/webalizer-2.01.10-r15.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/webalizer/webalizer-2.01.10-r15.ebuild,v 1.13 2010/10/28 03:14:50 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.14 2010/10/28 03:35:18 sping Exp $ EAPI="2" @@ -49,7 +49,8 @@ pkg_setup() { src_prepare() { if use geoip; then - epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch || die + epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \ + "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch use xtended && elog "Xtended doesn't work with geolizer, skipping" else epatch "${FILESDIR}"/${PN}-db4.2.patch || die diff --git a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild b/app-admin/webalizer/webalizer-2.01.10-r16.ebuild index 24c3f07adc5b..ba48708926e8 100644 --- a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild +++ b/app-admin/webalizer/webalizer-2.01.10-r16.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/webalizer/webalizer-2.01.10-r16.ebuild,v 1.4 2010/10/28 03:14:50 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v 1.5 2010/10/28 03:35:18 sping Exp $ EAPI="2" @@ -53,7 +53,8 @@ pkg_setup() { src_prepare() { if use geoip && ! use xtended; then - epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch + epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \ + "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch else epatch "${FILESDIR}"/${PN}-db4.2.patch if use xtended; then diff --git a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild index 3d4aaf7fe6e6..7e11ad4bb33c 100644 --- a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild +++ b/app-admin/webalizer/webalizer-2.01.10-r17.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/webalizer/webalizer-2.01.10-r17.ebuild,v 1.5 2010/10/28 03:14:50 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v 1.6 2010/10/28 03:35:18 sping Exp $ EAPI="2" @@ -53,7 +53,8 @@ pkg_setup() { src_prepare() { if use geoip && ! use xtended; then - epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch + epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \ + "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch else epatch "${FILESDIR}"/${PN}-db4.2.patch if use xtended; then |