Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/skunkweb: ChangeLog skunkweb-3.4.4.ebuild
Date: Thu, 22 Apr 2010 19:38:10
Message-Id: 20100422184253.21D602962B@corvid.gentoo.org
1 arfrever 10/04/22 18:42:52
2
3 Modified: ChangeLog skunkweb-3.4.4.ebuild
4 Log:
5 Use Python 2.
6 (Portage version: HEAD/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.22 www-servers/skunkweb/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/skunkweb/ChangeLog?rev=1.22&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/skunkweb/ChangeLog?rev=1.22&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/skunkweb/ChangeLog?r1=1.21&r2=1.22
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v
18 retrieving revision 1.21
19 retrieving revision 1.22
20 diff -u -r1.21 -r1.22
21 --- ChangeLog 14 Mar 2008 10:55:35 -0000 1.21
22 +++ ChangeLog 22 Apr 2010 18:42:52 -0000 1.22
23 @@ -1,6 +1,10 @@
24 # ChangeLog for www-servers/skunkweb
25 -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.21 2008/03/14 10:55:35 phreak Exp $
27 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.22 2010/04/22 18:42:52 arfrever Exp $
29 +
30 + 22 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
31 + skunkweb-3.4.4.ebuild:
32 + Use Python 2.
33
34 14 Mar 2008; Christian Heim <phreak@g.o> metadata.xml:
35 Removing Christian Andreetta (satya, #48841) from metadata.xml.
36
37
38
39 1.2 www-servers/skunkweb/skunkweb-3.4.4.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild?r1=1.1&r2=1.2
44
45 Index: skunkweb-3.4.4.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- skunkweb-3.4.4.ebuild 6 Feb 2008 09:55:18 -0000 1.1
52 +++ skunkweb-3.4.4.ebuild 22 Apr 2010 18:42:52 -0000 1.2
53 @@ -1,8 +1,11 @@
54 -# Copyright 1999-2008 Gentoo Foundation
55 +# Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild,v 1.1 2008/02/06 09:55:18 hollow Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild,v 1.2 2010/04/22 18:42:52 arfrever Exp $
59
60 -inherit eutils apache-module
61 +EAPI="3"
62 +PYTHON_DEPEND="2"
63 +
64 +inherit apache-module eutils multilib python
65
66 DESCRIPTION="robust Python web application server"
67 HOMEPAGE="http://skunkweb.sourceforge.net/"
68 @@ -13,9 +16,8 @@
69 KEYWORDS="~amd64 ~ppc ~x86"
70 IUSE=""
71
72 -DEPEND=">=dev-lang/python-2.2
73 - >=dev-python/egenix-mx-base-2.0.4
74 - app-admin/sudo"
75 +DEPEND="app-admin/sudo
76 + >=dev-python/egenix-mx-base-2.0.4"
77 RDEPEND="${DEPEND}"
78
79 need_apache
80 @@ -27,9 +29,11 @@
81 pkg_setup() {
82 enewgroup skunkweb
83 enewuser skunkweb -1 -1 /usr/share/skunkweb skunkweb
84 +
85 + python_set_active_version 2
86 }
87
88 -src_compile() {
89 +src_configure() {
90 econf \
91 --with-user=skunkweb \
92 --with-group=skunkweb \
93 @@ -41,16 +45,20 @@
94 --with-cache=/var/lib/skunkweb/cache \
95 --with-docdir=/usr/share/doc/${P} \
96 --with-logdir=/var/log/skunkweb \
97 - --with-python=/usr/bin/python \
98 - --with-apxs=${APXS} || die "configure failed"
99 + --with-python="$(PYTHON -a)" \
100 + --with-apxs=${APXS}
101 +}
102
103 - emake || die
104 +src_compile() {
105 + default
106 }
107
108 src_install() {
109 - make DESTDIR="${D}" APXSFLAGS="-c" install || die "make install failed"
110 + emake DESTDIR="${D}" APXSFLAGS="-c" install || die "emake install failed"
111 apache-module_src_install
112
113 + python_need_rebuild
114 +
115 keepdir /var/{lib,log}/${PN}
116 keepdir /var/lib/${PN}/run
117 fowners skunkweb:skunkweb /var/{lib,log}/${PN}
118 @@ -61,3 +69,12 @@
119
120 dodoc README ChangeLog NEWS HACKING ACKS INSTALL
121 }
122 +
123 +pkg_postinst() {
124 + apache-module_pkg_postinst
125 + python_mod_optimize /usr/$(get_libdir)/skunkweb
126 +}
127 +
128 +pkg_postrm() {
129 + python_mod_cleanup /usr/$(get_libdir)/skunkweb
130 +}