From ce15e005f373d7c9603bcc6f07eae54c42e0dfce Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Thu, 22 Apr 2010 18:42:52 +0000 Subject: [PATCH] Use Python 2. Package-Manager: portage-HEAD/cvs/Linux x86_64 --- www-servers/skunkweb/ChangeLog | 8 +++-- www-servers/skunkweb/Manifest | 16 ++------- www-servers/skunkweb/skunkweb-3.4.4.ebuild | 39 ++++++++++++++++------ 3 files changed, 36 insertions(+), 27 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 + skunkweb-3.4.4.ebuild: + Use Python 2. 14 Mar 2008; Christian Heim metadata.xml: Removing Christian Andreetta (satya, #48841) from metadata.xml. diff --git a/www-servers/skunkweb/Manifest b/www-servers/skunkweb/Manifest index 7765469bdd22..dc43a712c93d 100644 --- a/www-servers/skunkweb/Manifest +++ b/www-servers/skunkweb/Manifest @@ -1,19 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 100_mod_skunkweb.conf 1727 RMD160 40e158ed5a23553c04c43752f6697a9546a3a0bd SHA1 822d6af3b84bd25de5a2a72a9d22555a3fdfa725 SHA256 9aac3364aba8cd5ec04d92fe193aff709ed2e879944494679acabbac6f938641 AUX skunkweb-cron-cache_cleaner 108 RMD160 ad5b93db2625c701391069f6e74c2beca0c942da SHA1 9d424aca084efea9584846699fc2d0689a094b45 SHA256 02927df2a6c76daeb39f1fc71e59c31a5c4862badd087fcc5047935006791189 AUX skunkweb-init 518 RMD160 71441eb5c328eba063c21cce437dc799beb2cea1 SHA1 7344b96466c1b1d5c90f4436d9d4c91807790326 SHA256 3c8077ad2429c0ed083fe8157b7ea19e421c67b433de81b6e9ff9916f76b4abb -DIST skunkweb-3.4.3.tar.gz 1406288 RMD160 79b18c800847e67bfbefb023f0c193cf2b4f1b04 SHA1 6ee98d679e4619754ea9c2162cf9c739f055f84c SHA256 5a55978c94e62627310dea48f4447308be55439b01c23e0db45cd13b659824af DIST skunkweb-3.4.4.tar.gz 1411045 RMD160 118b25f272bd10157c3ffb10725f3c4b21067cfa SHA1 44aaff73138dde75a2d620e1539141cf6089b581 SHA256 a7f0bc47788cdb01882d53f433599fc1837013f45b7d13ea67d60a81f8c6f1e0 -EBUILD skunkweb-3.4.3.ebuild 1689 RMD160 0911b82d36f2cac438344e11aed95ff67acf5cb7 SHA1 2bdfc111f9ad15b647aa53c7189bc42dcd2e305d SHA256 3722d7a47d470aeb7b2ec8788b40e0b122c81eea213bd945db871d056da9216f -EBUILD skunkweb-3.4.4.ebuild 1689 RMD160 0b9928da2f3c043cd75936611b2e9716860baa1d SHA1 751bf7c0a5e4f6124a532fa8871c4ca96ffcfb6f SHA256 f7605f67a3d2b1b9df14def7ef0759dafce7d52ca29e430aca9c4ba0cabcf9fb -MISC ChangeLog 5117 RMD160 dbcab139142cc9586a1bbc88cdda58c4323eb9e3 SHA1 b9f4eabad26c7bd78ac90295eb27acd5da53eba8 SHA256 87b03d7db6fec0b39942247328421395ec0779b596d42353561b0ee5189942de +EBUILD skunkweb-3.4.4.ebuild 1917 RMD160 06941d76f208f82c71a13d5f2c1ca0b92cada6fb SHA1 3c556decb45c200716ec68d2176ca09e740b3336 SHA256 d330d02ed024f43d8dcdeaa96bd8aedffdef1bc35f0e1dc8e296e48c022a8b18 +MISC ChangeLog 5234 RMD160 57d280df023ff4f6e694df4ffa22c775225b19c3 SHA1 8a55be7bcd7e002e2f493c77add9acdd9a1ddbd7 SHA256 999c22833d34891207b4a3c2ed7da4bba9ab7d0dd7b2fba7ec027f5db935bd87 MISC metadata.xml 484 RMD160 30d6f08f8625ad0eb6a7c2105cd540e999ccbd9d SHA1 604ec89915f051cb100dabfe26322366f4237d2f SHA256 11a372f89f16f4b2ffb0477efeb468aec6a822386faa0d3f19491c020839a0f9 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFH2lmsyuNVb5qfaOYRAijNAJ9f0BzbTMz0OcQNHCIYOdqo9a8jfACgz7+F -GrAI+4BYylI6mSrvTF3fkR8= -=gp9T ------END PGP SIGNATURE----- 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 +} -- 2.26.2