summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-04-22 18:42:52 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-04-22 18:42:52 +0000
commita6124ed992a8e13bb7cc248a1eebadb2c0c5cbaa (patch)
tree295c6ecacc71018216f39d3bdc7f8ea1c296ef66 /www-servers
parentDelete older ebuild. (diff)
downloadgentoo-2-a6124ed992a8e13bb7cc248a1eebadb2c0c5cbaa.tar.gz
gentoo-2-a6124ed992a8e13bb7cc248a1eebadb2c0c5cbaa.tar.bz2
gentoo-2-a6124ed992a8e13bb7cc248a1eebadb2c0c5cbaa.zip
Use Python 2.
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/skunkweb/ChangeLog8
-rw-r--r--www-servers/skunkweb/skunkweb-3.4.4.ebuild39
2 files changed, 34 insertions, 13 deletions
diff --git a/www-servers/skunkweb/ChangeLog b/www-servers/skunkweb/ChangeLog
index 39ed1eecdd85..de83e2d4febc 100644
--- a/www-servers/skunkweb/ChangeLog
+++ b/www-servers/skunkweb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/skunkweb
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.21 2008/03/14 10:55:35 phreak Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.22 2010/04/22 18:42:52 arfrever Exp $
+
+ 22 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ skunkweb-3.4.4.ebuild:
+ Use Python 2.
14 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing Christian Andreetta (satya, #48841) from metadata.xml.
diff --git a/www-servers/skunkweb/skunkweb-3.4.4.ebuild b/www-servers/skunkweb/skunkweb-3.4.4.ebuild
index e5e26b4750ac..f738b671ad66 100644
--- a/www-servers/skunkweb/skunkweb-3.4.4.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4.4.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild,v 1.1 2008/02/06 09:55:18 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild,v 1.2 2010/04/22 18:42:52 arfrever Exp $
-inherit eutils apache-module
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit apache-module eutils multilib python
DESCRIPTION="robust Python web application server"
HOMEPAGE="http://skunkweb.sourceforge.net/"
@@ -13,9 +16,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
-DEPEND=">=dev-lang/python-2.2
- >=dev-python/egenix-mx-base-2.0.4
- app-admin/sudo"
+DEPEND="app-admin/sudo
+ >=dev-python/egenix-mx-base-2.0.4"
RDEPEND="${DEPEND}"
need_apache
@@ -27,9 +29,11 @@ APACHE2_MOD_CONF="100_mod_skunkweb"
pkg_setup() {
enewgroup skunkweb
enewuser skunkweb -1 -1 /usr/share/skunkweb skunkweb
+
+ python_set_active_version 2
}
-src_compile() {
+src_configure() {
econf \
--with-user=skunkweb \
--with-group=skunkweb \
@@ -41,16 +45,20 @@ src_compile() {
--with-cache=/var/lib/skunkweb/cache \
--with-docdir=/usr/share/doc/${P} \
--with-logdir=/var/log/skunkweb \
- --with-python=/usr/bin/python \
- --with-apxs=${APXS} || die "configure failed"
+ --with-python="$(PYTHON -a)" \
+ --with-apxs=${APXS}
+}
- emake || die
+src_compile() {
+ default
}
src_install() {
- make DESTDIR="${D}" APXSFLAGS="-c" install || die "make install failed"
+ emake DESTDIR="${D}" APXSFLAGS="-c" install || die "emake install failed"
apache-module_src_install
+ python_need_rebuild
+
keepdir /var/{lib,log}/${PN}
keepdir /var/lib/${PN}/run
fowners skunkweb:skunkweb /var/{lib,log}/${PN}
@@ -61,3 +69,12 @@ src_install() {
dodoc README ChangeLog NEWS HACKING ACKS INSTALL
}
+
+pkg_postinst() {
+ apache-module_pkg_postinst
+ python_mod_optimize /usr/$(get_libdir)/skunkweb
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/$(get_libdir)/skunkweb
+}