1 |
hollow 08/02/04 08:24:05 |
2 |
|
3 |
Modified: mod_survey-3.2.4.ebuild ChangeLog |
4 |
Log: |
5 |
merge from webapps overlay wrt #208584 |
6 |
(Portage version: 2.1.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.4 www-apps/mod_survey/mod_survey-3.2.4.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.4.ebuild?rev=1.4&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.4.ebuild?rev=1.4&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.4.ebuild?r1=1.3&r2=1.4 |
14 |
|
15 |
Index: mod_survey-3.2.4.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.4.ebuild,v |
18 |
retrieving revision 1.3 |
19 |
retrieving revision 1.4 |
20 |
diff -u -r1.3 -r1.4 |
21 |
--- mod_survey-3.2.4.ebuild 29 Jul 2007 17:30:56 -0000 1.3 |
22 |
+++ mod_survey-3.2.4.ebuild 4 Feb 2008 08:24:04 -0000 1.4 |
23 |
@@ -1,6 +1,6 @@ |
24 |
-# Copyright 1999-2007 Gentoo Foundation |
25 |
+# Copyright 1999-2008 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.4.ebuild,v 1.3 2007/07/29 17:30:56 phreak Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.4.ebuild,v 1.4 2008/02/04 08:24:04 hollow Exp $ |
29 |
|
30 |
inherit webapp |
31 |
|
32 |
@@ -10,53 +10,65 @@ |
33 |
DESCRIPTION="XML-defined web questionnaires as a plug-in module using Apache." |
34 |
HOMEPAGE="http://www.modsurvey.org" |
35 |
KEYWORDS="~amd64 ~ppc ~x86" |
36 |
- |
37 |
IUSE="doc mysql nls postgres" |
38 |
+ |
39 |
+# Note: sw is invalid LINGUAS value, it should be sv instead. |
40 |
+# commented out since I have zero interested in sed-ing the code |
41 |
+# for this screw-up. |
42 |
+LANGS="en de fr it" # sv |
43 |
+for i in ${LANGS} ; do |
44 |
+ IUSE="${IUSE} linguas_${i}" |
45 |
+done |
46 |
+ |
47 |
MY_PN=${PN/_/} |
48 |
MY_PV=${PV/_/-} |
49 |
S=${WORKDIR}/${PN} |
50 |
SRC_URI="http://www.modsurvey.org/download/tarballs/${MY_PN}-${MY_PV}.tgz |
51 |
-doc? ( http://www.modsurvey.org/download/tarballs/${MY_PN}-docs-${MY_PV}.tgz )" |
52 |
+ doc? ( http://www.modsurvey.org/download/tarballs/${MY_PN}-docs-${MY_PV}.tgz )" |
53 |
|
54 |
DEPEND=">=dev-lang/perl-5.6.1" |
55 |
RDEPEND="${DEPEND} |
56 |
- >=www-servers/apache-2 >=www-apache/mod_perl-1.99 |
57 |
+ >=www-apache/mod_perl-1.99 |
58 |
postgres? ( >=dev-perl/DBI-1.38 dev-perl/DBD-Pg ) |
59 |
mysql? ( >=dev-perl/DBI-1.38 dev-perl/DBD-mysql ) |
60 |
>=virtual/perl-CGI-3.0.0" |
61 |
LICENSE="GPL-2" |
62 |
|
63 |
pkg_setup() { |
64 |
- webapp_pkg_setup |
65 |
- |
66 |
- # stolen from app-admin/webalizer |
67 |
- # USE=nls has no real meaning if LINGUAS isn't set |
68 |
- if use nls && [[ -z "${LINGUAS}" ]] ; then |
69 |
- ewarn "you must set LINGUAS in /etc/make.conf" |
70 |
- ewarn "if you want to USE=nls" |
71 |
- die "please either set LINGUAS or do not use nls" |
72 |
+ # unfortunatly, this program only allows for one lang, so only the first |
73 |
+ # supported entry in LINGUAS is used |
74 |
+ if use nls ; then |
75 |
+ for i in ${LINGUAS} ; do |
76 |
+ if has linguas_${i} ${IUSE} ; then |
77 |
+ if use linguas_${i} ; then |
78 |
+ locallang="${i}" |
79 |
+ ewarn "Due to the limitations of this package, it will be built" |
80 |
+ ewarn "only with ${i} LINGUAS support. If this is not what" |
81 |
+ ewarn "you intended, please place the language you desire" |
82 |
+ ewarn "as _first_ in the list of LINGUAS in /etc/make.conf" |
83 |
+ ewarn |
84 |
+ break |
85 |
+ fi |
86 |
+ else |
87 |
+ einfo "LINGUAS=${i} is not supported by ${P}" |
88 |
+ shift |
89 |
+ fi |
90 |
+ done |
91 |
fi |
92 |
+ if [[ -z ${locallang} ]] ; then |
93 |
+ use nls && ewarn "None of ${LINGUAS} supported, sorry. Will use English." |
94 |
+ locallang="en" |
95 |
+ fi |
96 |
+ webapp_pkg_setup |
97 |
} |
98 |
|
99 |
src_unpack() { |
100 |
unpack ${A} |
101 |
cd "${S}" |
102 |
rm -f docs/LICENSE.txt |
103 |
+ sed "s|\$lang = \"en\"|\$lang = \"${locallang}\"|" -i installer.pl |
104 |
sed -i "s|/usr/local/mod_survey/|${D}/usr/lib/mod_survey/|g" installer.pl |
105 |
use doc && unpack ${MY_PN}-docs-${PV}.tgz |
106 |
- |
107 |
- # unfortunatly, this program only allows for one lang, so only the first |
108 |
- # entry in LINGUAS is used |
109 |
- if use nls ; then |
110 |
- local locallang |
111 |
- if ! grep -q ${LINGUAS:0:2} ${FILESDIR}/language-list.txt ; then |
112 |
- ewarn "Language ${LINGUAS:0:2} is not supported, using English" |
113 |
- else |
114 |
- elog "Using language ${LINGUAS:0:2}" |
115 |
- locallang="$(grep ^${LINGUAS:0:2} ${FILESDIR}/language-list.txt)" |
116 |
- sed "s|\$lang = \"en\"|\$lang = \"${locallang}\"|" -i installer.pl |
117 |
- fi |
118 |
- fi |
119 |
} |
120 |
|
121 |
src_install() { |
122 |
@@ -69,28 +81,16 @@ |
123 |
dodoc README.txt docs/* |
124 |
|
125 |
perl installer.pl < /dev/null > /dev/null 2>&1 |
126 |
- dosed /usr/lib/mod_survey/survey.conf |
127 |
- sed -i "s|/usr/lib/mod_survey/data/|/var/lib/mod_survey/data/|" ${D}/usr/lib/mod_survey/survey.conf |
128 |
- mv ${D}/usr/lib/mod_survey/survey.conf ${D}/${MY_HOSTROOTDIR}/${PN} |
129 |
+ dosed "s|/usr/lib/mod_survey/data/|/var/lib/mod_survey/data/|" /usr/lib/mod_survey/survey.conf |
130 |
+ |
131 |
+ mv "${D}"/usr/lib/mod_survey/survey.conf "${D}"/${MY_HOSTROOTDIR}/${PN} |
132 |
+ rm -rf "${D}"/usr/lib/mod_survey/webroot "${D}"/usr/lib/mod_survey/data |
133 |
|
134 |
- rm -rf ${D}/usr/lib/mod_survey/webroot ${D}/usr/lib/mod_survey/data |
135 |
- cp -R webroot/* ${D}/${MY_HTDOCSDIR} |
136 |
+ cp -R webroot/* "${D}"/${MY_HTDOCSDIR} |
137 |
|
138 |
- webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt |
139 |
- webapp_hook_script ${FILESDIR}/reconfig |
140 |
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
141 |
+ webapp_hook_script "${FILESDIR}"/reconfig |
142 |
webapp_src_install |
143 |
- fowners apache:apache /var/lib/mod_survey/data |
144 |
-} |
145 |
|
146 |
-pkg_postinst(){ |
147 |
- if [[ ${#LINGUAS} -gt 2 ]] && use nls ; then |
148 |
- ewarn |
149 |
- ewarn "You have more than one language in LINGUAS" |
150 |
- ewarn "Due to the limitations of this package, it was built" |
151 |
- ewarn "only with ${LINGUAS:0:2} support. If this is not what" |
152 |
- ewarn "you intended, please place the language you desire" |
153 |
- ewarn "_first_ in the list of LINGUAS in /etc/make.conf" |
154 |
- ewarn |
155 |
- fi |
156 |
- webapp_pkg_postinst |
157 |
+ fowners apache:apache /var/lib/mod_survey/data |
158 |
} |
159 |
|
160 |
|
161 |
|
162 |
1.4 www-apps/mod_survey/ChangeLog |
163 |
|
164 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mod_survey/ChangeLog?rev=1.4&view=markup |
165 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mod_survey/ChangeLog?rev=1.4&content-type=text/plain |
166 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mod_survey/ChangeLog?r1=1.3&r2=1.4 |
167 |
|
168 |
Index: ChangeLog |
169 |
=================================================================== |
170 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v |
171 |
retrieving revision 1.3 |
172 |
retrieving revision 1.4 |
173 |
diff -u -r1.3 -r1.4 |
174 |
--- ChangeLog 29 Jul 2007 17:30:56 -0000 1.3 |
175 |
+++ ChangeLog 4 Feb 2008 08:24:04 -0000 1.4 |
176 |
@@ -1,6 +1,13 @@ |
177 |
# ChangeLog for www-apps/mod_survey |
178 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
179 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v 1.3 2007/07/29 17:30:56 phreak Exp $ |
180 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
181 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v 1.4 2008/02/04 08:24:04 hollow Exp $ |
182 |
+ |
183 |
+ 04 Feb 2008; Benedikt Böhm <hollow@g.o> mod_survey-3.2.4.ebuild: |
184 |
+ merge from webapps overlay wrt #208584 |
185 |
+ |
186 |
+ 02 Feb 2008; Jakub Moc <jakub@g.o> mod_survey-3.2.4.ebuild: |
187 |
+ Nuke unneeded apache dependency already implied by mod_perl for Bug 208584. |
188 |
+ Fix LINGUAS handling, fix dosed, fix quoting, ebuild clean-up. |
189 |
|
190 |
29 Jul 2007; Christian Heim <phreak@g.o> mod_survey-3.2.4.ebuild: |
191 |
Fixing the DEPEND/RDEPEND for the move of net-www/apache to |
192 |
|
193 |
|
194 |
|
195 |
-- |
196 |
gentoo-commits@l.g.o mailing list |