1 |
sping 10/10/28 03:35:18 |
2 |
|
3 |
Modified: ChangeLog webalizer-2.01.10-r15.ebuild |
4 |
webalizer-2.01.10-r16.ebuild |
5 |
webalizer-2.01.10-r17.ebuild |
6 |
Log: |
7 |
app-admin/webalizer: Fix pre-stripping files with USE=geoip (bug #331035) |
8 |
|
9 |
(Portage version: 2.1.9.22/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.81 app-admin/webalizer/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/ChangeLog?rev=1.81&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/ChangeLog?rev=1.81&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/ChangeLog?r1=1.80&r2=1.81 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v |
21 |
retrieving revision 1.80 |
22 |
retrieving revision 1.81 |
23 |
diff -u -r1.80 -r1.81 |
24 |
--- ChangeLog 28 Oct 2010 03:14:50 -0000 1.80 |
25 |
+++ ChangeLog 28 Oct 2010 03:35:18 -0000 1.81 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for app-admin/webalizer |
28 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.80 2010/10/28 03:14:50 sping Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.81 2010/10/28 03:35:18 sping Exp $ |
31 |
+ |
32 |
+ 28 Oct 2010; Sebastian Pipping <sping@g.o> |
33 |
+ webalizer-2.01.10-r15.ebuild, webalizer-2.01.10-r16.ebuild, |
34 |
+ webalizer-2.01.10-r17.ebuild, |
35 |
+ +files/geolizer-2.01.10_p20070115-strip.patch: |
36 |
+ Fix pre-stripping files with USE=geoip (bug #331035) |
37 |
|
38 |
28 Oct 2010; Sebastian Pipping <sping@g.o> |
39 |
webalizer-2.01.10-r15.ebuild, webalizer-2.01.10-r16.ebuild, |
40 |
|
41 |
|
42 |
|
43 |
1.14 app-admin/webalizer/webalizer-2.01.10-r15.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?rev=1.14&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?rev=1.14&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?r1=1.13&r2=1.14 |
48 |
|
49 |
Index: webalizer-2.01.10-r15.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v |
52 |
retrieving revision 1.13 |
53 |
retrieving revision 1.14 |
54 |
diff -u -r1.13 -r1.14 |
55 |
--- webalizer-2.01.10-r15.ebuild 28 Oct 2010 03:14:50 -0000 1.13 |
56 |
+++ webalizer-2.01.10-r15.ebuild 28 Oct 2010 03:35:18 -0000 1.14 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2010 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $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 $ |
61 |
+# $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 $ |
62 |
|
63 |
EAPI="2" |
64 |
|
65 |
@@ -49,7 +49,8 @@ |
66 |
|
67 |
src_prepare() { |
68 |
if use geoip; then |
69 |
- epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch || die |
70 |
+ epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \ |
71 |
+ "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch |
72 |
use xtended && elog "Xtended doesn't work with geolizer, skipping" |
73 |
else |
74 |
epatch "${FILESDIR}"/${PN}-db4.2.patch || die |
75 |
|
76 |
|
77 |
|
78 |
1.5 app-admin/webalizer/webalizer-2.01.10-r16.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild?rev=1.5&view=markup |
81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild?rev=1.5&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild?r1=1.4&r2=1.5 |
83 |
|
84 |
Index: webalizer-2.01.10-r16.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v |
87 |
retrieving revision 1.4 |
88 |
retrieving revision 1.5 |
89 |
diff -u -r1.4 -r1.5 |
90 |
--- webalizer-2.01.10-r16.ebuild 28 Oct 2010 03:14:50 -0000 1.4 |
91 |
+++ webalizer-2.01.10-r16.ebuild 28 Oct 2010 03:35:18 -0000 1.5 |
92 |
@@ -1,6 +1,6 @@ |
93 |
# Copyright 1999-2010 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $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 $ |
96 |
+# $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 $ |
97 |
|
98 |
EAPI="2" |
99 |
|
100 |
@@ -53,7 +53,8 @@ |
101 |
|
102 |
src_prepare() { |
103 |
if use geoip && ! use xtended; then |
104 |
- epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch |
105 |
+ epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \ |
106 |
+ "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch |
107 |
else |
108 |
epatch "${FILESDIR}"/${PN}-db4.2.patch |
109 |
if use xtended; then |
110 |
|
111 |
|
112 |
|
113 |
1.6 app-admin/webalizer/webalizer-2.01.10-r17.ebuild |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild?rev=1.6&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild?rev=1.6&content-type=text/plain |
117 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild?r1=1.5&r2=1.6 |
118 |
|
119 |
Index: webalizer-2.01.10-r17.ebuild |
120 |
=================================================================== |
121 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v |
122 |
retrieving revision 1.5 |
123 |
retrieving revision 1.6 |
124 |
diff -u -r1.5 -r1.6 |
125 |
--- webalizer-2.01.10-r17.ebuild 28 Oct 2010 03:14:50 -0000 1.5 |
126 |
+++ webalizer-2.01.10-r17.ebuild 28 Oct 2010 03:35:18 -0000 1.6 |
127 |
@@ -1,6 +1,6 @@ |
128 |
# Copyright 1999-2010 Gentoo Foundation |
129 |
# Distributed under the terms of the GNU General Public License v2 |
130 |
-# $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 $ |
131 |
+# $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 $ |
132 |
|
133 |
EAPI="2" |
134 |
|
135 |
@@ -53,7 +53,8 @@ |
136 |
|
137 |
src_prepare() { |
138 |
if use geoip && ! use xtended; then |
139 |
- epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch |
140 |
+ epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \ |
141 |
+ "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch |
142 |
else |
143 |
epatch "${FILESDIR}"/${PN}-db4.2.patch |
144 |
if use xtended; then |