Gentoo Archives: gentoo-commits

From: "Jose Alberto Suarez Lopez (bass)" <bass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/cherokee: ChangeLog cherokee-1.0.10.ebuild
Date: Thu, 25 Nov 2010 13:00:39
Message-Id: 20101125125601.2A16420051@flycatcher.gentoo.org
1 bass 10/11/25 12:56:01
2
3 Modified: ChangeLog
4 Added: cherokee-1.0.10.ebuild
5 Log:
6 version bump
7 (Portage version: 2.1.8.3/cvs/Linux i686)
8
9 Revision Changes Path
10 1.78 www-servers/cherokee/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/ChangeLog?rev=1.78&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/ChangeLog?rev=1.78&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/ChangeLog?r1=1.77&r2=1.78
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v
19 retrieving revision 1.77
20 retrieving revision 1.78
21 diff -u -r1.77 -r1.78
22 --- ChangeLog 18 Nov 2010 10:30:59 -0000 1.77
23 +++ ChangeLog 25 Nov 2010 12:56:01 -0000 1.78
24 @@ -1,6 +1,12 @@
25 # ChangeLog for www-servers/cherokee
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.77 2010/11/18 10:30:59 bass Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.78 2010/11/25 12:56:01 bass Exp $
29 +
30 +*cherokee-1.0.10 (25 Nov 2010)
31 +
32 + 25 Nov 2010; J. Alberto Suárez López <bass@g.o>
33 + +cherokee-1.0.10.ebuild:
34 + version bump
35
36 *cherokee-1.0.9 (18 Nov 2010)
37
38
39
40
41 1.1 www-servers/cherokee/cherokee-1.0.10.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/cherokee-1.0.10.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/cherokee-1.0.10.ebuild?rev=1.1&content-type=text/plain
45
46 Index: cherokee-1.0.10.ebuild
47 ===================================================================
48 # Copyright 1999-2010 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.10.ebuild,v 1.1 2010/11/25 12:56:01 bass Exp $
51
52 EAPI=2
53 PYTHON_DEPEND="admin? 2"
54
55 inherit python eutils pam versionator libtool
56
57 DESCRIPTION="An extremely fast and tiny web server."
58 SRC_URI="http://www.cherokee-project.com/download/$(get_version_component_range 1-2)/${PV}/${P}.tar.gz"
59 HOMEPAGE="http://www.cherokee-project.com/"
60
61 LICENSE="GPL-2"
62 SLOT="0"
63 KEYWORDS="~x86 ~amd64"
64 IUSE="ipv6 nls ssl static pam coverpage threads kernel_linux admin debug geoip
65 ldap mysql ffmpeg fastcgi rrdtool"
66
67 RDEPEND="
68 >=sys-libs/zlib-1.1.4-r1
69 rrdtool? ( net-analyzer/rrdtool )
70 nls? ( sys-devel/gettext )
71 ssl? ( dev-libs/openssl )
72 pam? ( virtual/pam )
73 geoip? ( dev-libs/geoip )
74 ldap? ( net-nds/openldap )
75 mysql? ( virtual/mysql )
76 fastcgi? ( www-servers/spawn-fcgi )
77 ffmpeg? ( media-video/ffmpeg )"
78 DEPEND="${RDEPEND}"
79
80 src_prepare() {
81 python_convert_shebangs -r 2 .
82 }
83
84 src_configure() {
85 local myconf
86
87 if use static ; then
88 myconf="${myconf} --enable-static --enable-static-module=all"
89 else
90 myconf="${myconf} --disable-static"
91 fi
92
93 if use debug ; then
94 myconf="${myconf} --enable-trace"
95 fi
96
97 local os="Unknown"
98 case "${CHOST}" in
99 *-freebsd*)
100 os="FreeBSD" ;;
101 *-netbsd*)
102 os="NetBSD" ;;
103 *-openbsd*)
104 os="OpenBSD" ;;
105 *)
106 os="Linux" ;;
107 esac
108
109 # No options to enable or disable ssl since Cherokee 0.11
110 econf \
111 ${myconf} \
112 $(use_enable pam) \
113 $(use_enable ipv6) \
114 $(use_enable nls) \
115 $(use_enable threads pthread) \
116 $(use_enable kernel_linux epoll) \
117 $(use_with geoip) \
118 $(use_with ldap) \
119 $(use_with mysql) \
120 $(use_with ffmpeg) \
121 --disable-dependency-tracking \
122 --enable-os-string="Gentoo ${os}" \
123 --with-wwwroot=/var/www/localhost/htdocs \
124 --prefix=/usr \
125 --sysconfdir=/etc \
126 --localstatedir=/var \
127 || die "configure failed"
128 }
129
130 src_compile() {
131 emake -j1 || die "emake failed"
132 }
133
134 src_install () {
135 emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
136
137 dodoc AUTHORS ChangeLog
138
139 use pam && pamd_mimic system-auth cherokee auth account session
140 newinitd "${FILESDIR}/${PN}-initd-0.99.23" ${PN} || die "newinitd failed"
141
142 dodir /usr/share/doc/${PF}/contrib
143 insinto /usr/share/${PF}/contrib
144 doins contrib/07to08.py
145 doins contrib/08to09.py
146 doins contrib/09to010.py
147 doins contrib/011to098.py
148 doins contrib/098to099.py
149 doins contrib/0999to09910.py
150 doins contrib/make-cert.sh
151
152 keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs
153
154 use coverpage || rm -rf "${D}"/var/www/localhost/htdocs/{index.html,images}
155 if use admin ; then
156 exeinto /usr/share/cherokee/admin
157 doexe admin/server.py
158 else
159 rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin
160 fi
161
162 # Puts logs in /var/log/cherokee/
163 dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
164
165 }
166
167 pkg_setup() {
168 python_set_active_version 2
169 }
170
171 pkg_postinst() {
172 enewgroup cherokee
173 enewuser cherokee -1 -1 /var/www/localhost cherokee
174 install -o cherokee -g cherokee -m0775 -d "${ROOT}"var/log/cherokee
175
176 # check if user/group was defined if not add it
177 gr="/bin/grep -q"
178 ec="/bin/echo"
179 $gr server\!user /etc/cherokee/cherokee.conf ; rtu=$?
180 $gr server\!group /etc/cherokee/cherokee.conf ; rtg=$?
181
182 [[ "x$rtu" == "x1" ]] && $ec server\!user = cherokee >> /etc/cherokee/cherokee.conf
183 [[ "x$rtg" == "x1" ]] && $ec server\!group = cherokee >> /etc/cherokee/cherokee.conf
184
185 if use admin ; then
186 echo ""
187 elog "Just run 'cherokee-admin' and go to: http://localhost:9090"
188 echo ""
189 else
190 echo ""
191 elog "Try USE=admin if you want an easy way to configure cherokee."
192 echo ""
193 fi
194
195 echo ""
196 elog "Config format can change in different versions. Check converter script in:"
197 elog " /usr/share/cherokee-0.99.15/contrib/"
198 elog "for example:"
199 elog " PYTHONPATH="/usr/share/cherokee/admin/" python \\"
200 elog " /usr/share/cherokee-0.99.15/contrib/0999to09910.py \\"
201 elog " /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
202
203 }