Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Krzysiek Pawlik (nelchael)" <nelchael@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-apache/mod_caucho: ChangeLog mod_caucho-3.1.3.ebuild mod_caucho-3.0.24.ebuild
Date: Sat, 10 Nov 2007 12:47:45
Message-Id: E1IqpkQ-0007fs-Jt@stork.gentoo.org
1 nelchael 07/11/10 12:47:38
2
3 Modified: ChangeLog mod_caucho-3.1.3.ebuild
4 mod_caucho-3.0.24.ebuild
5 Log:
6 Use tarball of patches.
7 (Portage version: 2.1.3.19)
8
9 Revision Changes Path
10 1.27 www-apache/mod_caucho/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/ChangeLog?rev=1.27&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/ChangeLog?rev=1.27&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/ChangeLog?r1=1.26&r2=1.27
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v
19 retrieving revision 1.26
20 retrieving revision 1.27
21 diff -u -r1.26 -r1.27
22 --- ChangeLog 10 Nov 2007 11:21:02 -0000 1.26
23 +++ ChangeLog 10 Nov 2007 12:47:38 -0000 1.27
24 @@ -1,6 +1,15 @@
25 # ChangeLog for www-apache/mod_caucho
26 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.26 2007/11/10 11:21:02 nelchael Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.27 2007/11/10 12:47:38 nelchael Exp $
29 +
30 + 10 Nov 2007; Krzysiek Pawlik <nelchael@g.o>
31 + -files/mod_caucho-3.0.24-disable-sticky-sessions.patch,
32 + -files/mod_caucho-3.0.24-gentoo.patch,
33 + -files/mod_caucho-3.0.24-java.patch, -files/mod_caucho-3.0.24-ssl.patch,
34 + -files/mod_caucho-3.1.3-gentoo.patch, -files/mod_caucho-3.1.3-java.patch,
35 + -files/mod_caucho-3.1.3-ssl.patch, mod_caucho-3.0.24.ebuild,
36 + mod_caucho-3.1.3.ebuild:
37 + Use tarball of patches.
38
39 *mod_caucho-3.1.3 (10 Nov 2007)
40
41
42
43
44 1.2 www-apache/mod_caucho/mod_caucho-3.1.3.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild?rev=1.2&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild?rev=1.2&content-type=text/plain
48 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild?r1=1.1&r2=1.2
49
50 Index: mod_caucho-3.1.3.ebuild
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild,v
53 retrieving revision 1.1
54 retrieving revision 1.2
55 diff -u -r1.1 -r1.2
56 --- mod_caucho-3.1.3.ebuild 10 Nov 2007 11:21:02 -0000 1.1
57 +++ mod_caucho-3.1.3.ebuild 10 Nov 2007 12:47:38 -0000 1.2
58 @@ -1,6 +1,6 @@
59 # Copyright 1999-2007 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild,v 1.1 2007/11/10 11:21:02 nelchael Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild,v 1.2 2007/11/10 12:47:38 nelchael Exp $
63
64 inherit eutils apache-module autotools
65
66 @@ -8,7 +8,8 @@
67
68 DESCRIPTION="mod_caucho connects Resin and Apache2."
69 HOMEPAGE="http://www.caucho.com/"
70 -SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
71 +SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
72 + mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
73 LICENSE="GPL-2"
74 SLOT="0"
75 IUSE=""
76 @@ -28,27 +29,34 @@
77 app-arch/unzip"
78
79 src_unpack() {
80 +
81 unpack ${A}
82 +
83 cd "${S}"
84
85 - epatch "${FILESDIR}/${P}-gentoo.patch"
86 - epatch "${FILESDIR}/${P}-ssl.patch"
87 - epatch "${FILESDIR}/${P}-java.patch"
88 + for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
89 + epatch "${i}"
90 + done
91 +
92 eautoreconf
93 chmod 755 ./configure
94 +
95 }
96
97 src_compile() {
98 - econf --with-apxs=${APXS2} || die "econf failed"
99
100 + econf --with-apxs=${APXS2} || die "econf failed"
101 emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
102 +
103 }
104
105 src_install() {
106 +
107 cd "${S}/modules/c/src/apache2"
108 emake -j1 DESTDIR="${D}" install || die "emake install failed"
109
110 insinto "${APACHE2_MODULES_CONFDIR}"
111 doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
112 - || die "internal ebuild error: ${APACHE2_MOD_CONF}.conf not found."
113 + || die "internal ebuild error: ${APACHE2_MOD_CONF}.conf not found."
114 +
115 }
116
117
118
119 1.8 www-apache/mod_caucho/mod_caucho-3.0.24.ebuild
120
121 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild?rev=1.8&view=markup
122 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild?rev=1.8&content-type=text/plain
123 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild?r1=1.7&r2=1.8
124
125 Index: mod_caucho-3.0.24.ebuild
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild,v
128 retrieving revision 1.7
129 retrieving revision 1.8
130 diff -u -r1.7 -r1.8
131 --- mod_caucho-3.0.24.ebuild 10 Nov 2007 11:21:02 -0000 1.7
132 +++ mod_caucho-3.0.24.ebuild 10 Nov 2007 12:47:38 -0000 1.8
133 @@ -1,6 +1,6 @@
134 # Copyright 1999-2007 Gentoo Foundation
135 # Distributed under the terms of the GNU General Public License v2
136 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild,v 1.7 2007/11/10 11:21:02 nelchael Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild,v 1.8 2007/11/10 12:47:38 nelchael Exp $
138
139 inherit eutils apache-module autotools
140
141 @@ -8,7 +8,8 @@
142
143 DESCRIPTION="mod_caucho connects Resin and Apache2."
144 HOMEPAGE="http://www.caucho.com/"
145 -SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
146 +SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
147 + mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
148 LICENSE="GPL-2"
149 SLOT="0"
150 IUSE=""
151 @@ -28,10 +29,9 @@
152 unpack ${A}
153 cd "${S}"
154
155 - epatch "${FILESDIR}/${P}-gentoo.patch"
156 - epatch "${FILESDIR}/${P}-ssl.patch"
157 - epatch "${FILESDIR}/${P}-java.patch"
158 - epatch "${FILESDIR}/${P}-disable-sticky-sessions.patch"
159 + for i in "${WORKDIR}"/${PV}/mod_caucho-*; do
160 + epatch "${i}"
161 + done
162 eautoreconf
163 chmod 755 ./configure
164 }
165
166
167
168 --
169 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups