1 |
nelchael 07/11/10 20:52:05 |
2 |
|
3 |
Modified: ChangeLog resin-3.0.24.ebuild resin-3.1.3.ebuild |
4 |
Removed: resin-3.0.22.ebuild |
5 |
Log: |
6 |
multilib fixes, stable on amd64, see bug #191740. |
7 |
(Portage version: 2.1.3.19) |
8 |
|
9 |
Revision Changes Path |
10 |
1.60 www-servers/resin/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.60&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.60&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?r1=1.59&r2=1.60 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v |
19 |
retrieving revision 1.59 |
20 |
retrieving revision 1.60 |
21 |
diff -u -r1.59 -r1.60 |
22 |
--- ChangeLog 10 Nov 2007 12:42:43 -0000 1.59 |
23 |
+++ ChangeLog 10 Nov 2007 20:52:05 -0000 1.60 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for www-servers/resin |
26 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.59 2007/11/10 12:42:43 nelchael Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.60 2007/11/10 20:52:05 nelchael Exp $ |
29 |
+ |
30 |
+ 10 Nov 2007; Krzysiek Pawlik <nelchael@g.o> |
31 |
+ -files/3.0.22/resin.conf, -files/3.0.22/resin-3.0.22-gentoo.patch, |
32 |
+ -files/3.0.22/resin.init, files/3.0.24/resin.conf, -resin-3.0.22.ebuild, |
33 |
+ resin-3.0.24.ebuild, resin-3.1.3.ebuild: |
34 |
+ multilib fixes, stable on amd64, see bug #191740. |
35 |
|
36 |
10 Nov 2007; Krzysiek Pawlik <nelchael@g.o> |
37 |
-files/3.0.24/resin-3.0.24-gentoo.patch, |
38 |
|
39 |
|
40 |
|
41 |
1.8 www-servers/resin/resin-3.0.24.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild?rev=1.8&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild?rev=1.8&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild?r1=1.7&r2=1.8 |
46 |
|
47 |
Index: resin-3.0.24.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v |
50 |
retrieving revision 1.7 |
51 |
retrieving revision 1.8 |
52 |
diff -u -r1.7 -r1.8 |
53 |
--- resin-3.0.24.ebuild 10 Nov 2007 12:42:43 -0000 1.7 |
54 |
+++ resin-3.0.24.ebuild 10 Nov 2007 20:52:05 -0000 1.8 |
55 |
@@ -1,10 +1,10 @@ |
56 |
# Copyright 1999-2007 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v 1.7 2007/11/10 12:42:43 nelchael Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v 1.8 2007/11/10 20:52:05 nelchael Exp $ |
60 |
|
61 |
JAVA_PKG_IUSE="doc source" |
62 |
|
63 |
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic |
64 |
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib |
65 |
|
66 |
DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine." |
67 |
HOMEPAGE="http://www.caucho.com" |
68 |
@@ -14,7 +14,7 @@ |
69 |
SLOT="0" |
70 |
IUSE="" |
71 |
|
72 |
-KEYWORDS="~amd64 ppc ppc64 x86" |
73 |
+KEYWORDS="amd64 ppc ppc64 x86" |
74 |
|
75 |
COMMON_DEP="~dev-java/resin-servlet-api-${PV} |
76 |
dev-java/aopalliance |
77 |
@@ -30,7 +30,7 @@ |
78 |
dev-libs/openssl |
79 |
${COMMON_DEP}" |
80 |
|
81 |
-RESIN_HOME="/usr/lib/resin" |
82 |
+RESIN_HOME="/usr/$(get_libdir)/resin" |
83 |
|
84 |
# Rewrites build.xml in documentation |
85 |
JAVA_PKG_BSFIX="off" |
86 |
@@ -126,6 +126,8 @@ |
87 |
rm -f "${D}"/${RESIN_HOME}/bin/*.in |
88 |
rm -f "${D}"/etc/resin/*.orig |
89 |
|
90 |
+ sed -i -e "s,__RESIN_HOME__,${RESIN_HOME}," "${D}/etc/conf.d/resin" |
91 |
+ |
92 |
einfo "Fixing permissions..." |
93 |
chown -R resin:resin "${D}${RESIN_HOME}" |
94 |
chown -R resin:resin "${D}/etc/resin" |
95 |
|
96 |
|
97 |
|
98 |
1.3 www-servers/resin/resin-3.1.3.ebuild |
99 |
|
100 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.3.ebuild?rev=1.3&view=markup |
101 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.3.ebuild?rev=1.3&content-type=text/plain |
102 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.3.ebuild?r1=1.2&r2=1.3 |
103 |
|
104 |
Index: resin-3.1.3.ebuild |
105 |
=================================================================== |
106 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.3.ebuild,v |
107 |
retrieving revision 1.2 |
108 |
retrieving revision 1.3 |
109 |
diff -u -r1.2 -r1.3 |
110 |
--- resin-3.1.3.ebuild 10 Nov 2007 12:42:43 -0000 1.2 |
111 |
+++ resin-3.1.3.ebuild 10 Nov 2007 20:52:05 -0000 1.3 |
112 |
@@ -1,10 +1,10 @@ |
113 |
# Copyright 1999-2007 Gentoo Foundation |
114 |
# Distributed under the terms of the GNU General Public License v2 |
115 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.3.ebuild,v 1.2 2007/11/10 12:42:43 nelchael Exp $ |
116 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.3.ebuild,v 1.3 2007/11/10 20:52:05 nelchael Exp $ |
117 |
|
118 |
JAVA_PKG_IUSE="doc source" |
119 |
|
120 |
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic |
121 |
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib |
122 |
|
123 |
DESCRIPTION="A fast Servlet 2.5 and JSP 2.0 engine." |
124 |
HOMEPAGE="http://www.caucho.com" |
125 |
@@ -30,7 +30,7 @@ |
126 |
dev-libs/openssl |
127 |
${COMMON_DEP}" |
128 |
|
129 |
-RESIN_HOME="/usr/lib/resin" |
130 |
+RESIN_HOME="/usr/$(get_libdir)/resin" |
131 |
|
132 |
# Rewrites build.xml in documentation |
133 |
JAVA_PKG_BSFIX="off" |
134 |
|
135 |
|
136 |
|
137 |
-- |
138 |
gentoo-commits@g.o mailing list |