version bump; cleanup old version (#208706); cleanup ebuild

(Portage version: 2.1.4.1)

6 files changed, 50 insertions, 202 deletions

diff --git a/www-servers/skunkweb/ChangeLog b/www-servers/skunkweb/ChangeLog
index 6463241b50e9..99adf3822b27 100644
--- a/www-servers/skunkweb/ChangeLog
+++ b/www-servers/skunkweb/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2008/01/31 20:36:03 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.20 2008/02/06 09:55:18 hollow Exp $
+
+*skunkweb-3.4.4 (06 Feb 2008)
+
+  06 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  -skunkweb-3.4.0.ebuild, -skunkweb-3.4.0-r1.ebuild, -skunkweb-3.4.1.ebuild,
+  skunkweb-3.4.3.ebuild, +skunkweb-3.4.4.ebuild:
+  version bump; cleanup old version (#208706); cleanup ebuild
 
   31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> skunkweb-3.4.0-r1.ebuild,
   skunkweb-3.4.1.ebuild, skunkweb-3.4.3.ebuild:
diff --git a/www-servers/skunkweb/metadata.xml b/www-servers/skunkweb/metadata.xml
index 452b8e7f7d24..d6c1f44982b2 100644
--- a/www-servers/skunkweb/metadata.xml
+++ b/www-servers/skunkweb/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<maintainer>
-	<email>satya@gentoo.org</email>
-	<name>Christian Andreetta</name>
-</maintainer>
-<longdescription>
-SkunkWeb is a multi-process application server written in python, extensively using 'pickle' for caching. Ships with its own web server, or can be deployed with apache and mod-python. Includes server-side form management libraries (docs in cvs).
-</longdescription>
+	<herd>python</herd>
+	<herd>apache</herd>
+	<maintainer>
+		<email>satya@gentoo.org</email>
+		<name>Christian Andreetta</name>
+	</maintainer>
+	<longdescription>
+		SkunkWeb is a multi-process application server written in python,
+		extensively using 'pickle' for caching. Ships with its own web server,
+		or can be deployed with apache and mod-python. Includes server-side form
+		management libraries (docs in cvs).
+	</longdescription>
 </pkgmetadata>
diff --git a/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild b/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild
deleted file mode 100644
index 8957e1cd17b0..000000000000
--- a/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild,v 1.9 2008/01/31 20:36:03 hollow Exp $
-
-inherit eutils apache-module
-
-DESCRIPTION="robust Python web application server"
-HOMEPAGE="http://skunkweb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/skunkweb/${P}.tar.gz"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.2
-		>=dev-python/egenix-mx-base-2.0.4
-		app-admin/sudo"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
-
-APACHE2_MOD_DEFINE="SKUNKWEB"
-
-APACHE2_MOD_CONF="100_mod_skunkweb"
-
-need_apache
-
-pkg_setup() {
-	enewgroup skunkweb
-	enewuser skunkweb -1 -1 /usr/share/skunkweb skunkweb
-}
-
-src_compile() {
-	local apxs="${APXS}"
-
-	econf \
-		--with-user=skunkweb \
-		--with-group=skunkweb \
-		--localstatedir=/var/lib/skunkweb \
-		--bindir=/usr/bin \
-		--libdir=/usr/lib/skunkweb \
-		--sysconfdir=/etc/skunkweb \
-		--prefix=/usr/share/skunkweb \
-		--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"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} APXSFLAGS="-c" install || die "make install failed"
-	apache-module_src_install
-
-	# dirs --------------------------------------------------------------
-	keepdir /var/{lib,log}/${PN}
-	keepdir /var/lib/${PN}/run
-	chown -R skunkweb:skunkweb ${D}/var/{lib,log}/${PN}
-	# scripts------------------------------------------------------------
-	newinitd ${FILESDIR}/skunkweb-init skunkweb
-	exeinto /etc/cron.daily
-	newexe ${FILESDIR}/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner
-	# docs --------------------------------------------------------------
-	dodoc README ChangeLog NEWS HACKING ACKS INSTALL
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		cp docs/paper-letter/*.pdf ${D}/usr/share/doc/${PF}
-		ewarn "Some docs are still in upstream cvs (i.e.: formlib, pydo2)"
-	fi
-}
diff --git a/www-servers/skunkweb/skunkweb-3.4.0.ebuild b/www-servers/skunkweb/skunkweb-3.4.0.ebuild
deleted file mode 100644
index 1d35f0aa3f69..000000000000
--- a/www-servers/skunkweb/skunkweb-3.4.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0.ebuild,v 1.9 2007/07/29 17:45:36 phreak Exp $
-
-inherit eutils
-
-DESCRIPTION="robust Python web application server"
-HOMEPAGE="http://skunkweb.sourceforge.net/"
-MY_P=${P/_beta/b}
-S=${WORKDIR}/${MY_P}
-SRC_URI="mirror://sourceforge/skunkweb/${MY_P}.tar.gz"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="apache2 doc"
-DEPEND=">=dev-lang/python-2.2
-		>=dev-python/egenix-mx-base-2.0.4
-		apache2? ( >=www-servers/apache-2.0.47 )"
-
-pkg_setup() {
-	enewgroup skunkweb
-	enewuser skunkweb -1 -1 /usr/share/skunkweb skunkweb
-}
-
-src_compile() {
-	local myconf
-	if use apache2 ; then
-		myconf="${myconf} --with-apxs=/usr/sbin/apxs2"
-	else
-		myconf="${myconf} --without-mod_skunkweb"
-	fi
-	econf \
-		--with-user=skunkweb \
-		--with-group=skunkweb \
-		--localstatedir=/var/lib/skunkweb \
-		--bindir=/usr/bin \
-		--libdir=/usr/lib/skunkweb \
-		--sysconfdir=/etc/skunkweb \
-		--prefix=/usr/share/skunkweb \
-		--with-cache=/var/lib/skunkweb/cache \
-		--with-docdir=/usr/share/doc/${P} \
-		--with-logdir=/var/log/skunkweb \
-		--with-python=/usr/bin/python \
-		${myconf} || die "configure failed"
-
-	emake || die
-}
-
-src_install() {
-	INSTALLING="yes"
-	make DESTDIR=${D} APXSFLAGS="-c" install || die
-	if use apache2 ; then
-		exeinto /usr/lib/apache2-extramodules
-		doexe SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so
-		insinto /etc/apache2/conf/modules.d
-		newins SkunkWeb/mod_skunkweb/httpd_conf.stub mod_skunkweb.conf
-	fi
-	# dirs --------------------------------------------------------------
-	mkdir -p ${D}/var/{lib,log}/${PN}
-	chown skunkweb:skunkweb ${D}/var/{lib,log}/${PN}
-	mkdir -p ${D}/var/lib/${PN}/run
-	# scripts------------------------------------------------------------
-	newinitd ${FILESDIR}/skunkweb-init skunkweb
-	exeinto /etc/cron.daily
-		newexe ${FILESDIR}/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner
-	# docs --------------------------------------------------------------
-	dodoc README ChangeLog NEWS HACKING ACKS INSTALL
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		cp docs/paper-letter/*.pdf ${D}/usr/share/doc/${PF}
-		ewarn "Some docs are still in upstream cvs (i.e.: formlib, pydo2)"
-	fi
-}
diff --git a/www-servers/skunkweb/skunkweb-3.4.3.ebuild b/www-servers/skunkweb/skunkweb-3.4.3.ebuild
index 6950edc6fc74..10bd2d5b0d5c 100644
--- a/www-servers/skunkweb/skunkweb-3.4.3.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4.3.ebuild
@@ -1,38 +1,35 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.3.ebuild,v 1.6 2008/01/31 20:36:03 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.3.ebuild,v 1.7 2008/02/06 09:55:18 hollow Exp $
 
 inherit eutils apache-module
 
 DESCRIPTION="robust Python web application server"
 HOMEPAGE="http://skunkweb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/skunkweb/${P}.tar.gz"
+
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
-		>=dev-python/egenix-mx-base-2.0.4
-		app-admin/sudo"
+	>=dev-python/egenix-mx-base-2.0.4
+	app-admin/sudo"
 RDEPEND="${DEPEND}"
 
-APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
+need_apache
 
+APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
 APACHE2_MOD_DEFINE="SKUNKWEB"
-
 APACHE2_MOD_CONF="100_mod_skunkweb"
 
-need_apache
-
 pkg_setup() {
 	enewgroup skunkweb
 	enewuser skunkweb -1 -1 /usr/share/skunkweb skunkweb
 }
 
 src_compile() {
-	local apxs="${APXS}"
-
 	econf \
 		--with-user=skunkweb \
 		--with-group=skunkweb \
@@ -45,28 +42,22 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${P} \
 		--with-logdir=/var/log/skunkweb \
 		--with-python=/usr/bin/python \
-		--with-apxs=${apxs} || die "configure failed"
+		--with-apxs=${APXS} || die "configure failed"
 
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} APXSFLAGS="-c" install || die "make install failed"
+	make DESTDIR="${D}" APXSFLAGS="-c" install || die "make install failed"
 	apache-module_src_install
 
-	# dirs --------------------------------------------------------------
 	keepdir /var/{lib,log}/${PN}
 	keepdir /var/lib/${PN}/run
-	chown -R skunkweb:skunkweb ${D}/var/{lib,log}/${PN}
-	# scripts------------------------------------------------------------
-	newinitd ${FILESDIR}/skunkweb-init skunkweb
+	fowners skunkweb:skunkweb /var/{lib,log}/${PN}
+
+	newinitd "${FILESDIR}"/skunkweb-init skunkweb
 	exeinto /etc/cron.daily
-	newexe ${FILESDIR}/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner
-	# docs --------------------------------------------------------------
+	newexe "${FILESDIR}"/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner
+
 	dodoc README ChangeLog NEWS HACKING ACKS INSTALL
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		cp docs/paper-letter/*.pdf ${D}/usr/share/doc/${PF}
-		ewarn "Some docs are still in upstream cvs (i.e.: formlib, pydo2)"
-	fi
 }
diff --git a/www-servers/skunkweb/skunkweb-3.4.1.ebuild b/www-servers/skunkweb/skunkweb-3.4.4.ebuild
index 84a59d5584f1..e5e26b4750ac 100644
--- a/www-servers/skunkweb/skunkweb-3.4.1.ebuild
+++ b/www-servers/skunkweb/skunkweb-3.4.4.ebuild
@@ -1,72 +1,63 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.1.ebuild,v 1.5 2008/01/31 20:36:03 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.4.ebuild,v 1.1 2008/02/06 09:55:18 hollow Exp $
 
 inherit eutils apache-module
 
 DESCRIPTION="robust Python web application server"
 HOMEPAGE="http://skunkweb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/skunkweb/${P}.tar.gz"
+
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
-		>=dev-python/egenix-mx-base-2.0.4
-		app-admin/sudo"
+	>=dev-python/egenix-mx-base-2.0.4
+	app-admin/sudo"
 RDEPEND="${DEPEND}"
 
-APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
+need_apache
 
+APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
 APACHE2_MOD_DEFINE="SKUNKWEB"
-
 APACHE2_MOD_CONF="100_mod_skunkweb"
 
-need_apache
-
 pkg_setup() {
 	enewgroup skunkweb
 	enewuser skunkweb -1 -1 /usr/share/skunkweb skunkweb
 }
 
 src_compile() {
-	local apxs="${APXS}"
-
 	econf \
 		--with-user=skunkweb \
 		--with-group=skunkweb \
 		--localstatedir=/var/lib/skunkweb \
 		--bindir=/usr/bin \
-		--libdir=/usr/lib/skunkweb \
+		--libdir=/usr/$(get_libdir)/skunkweb \
 		--sysconfdir=/etc/skunkweb \
 		--prefix=/usr/share/skunkweb \
 		--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-apxs=${APXS} || die "configure failed"
 
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} APXSFLAGS="-c" install || die "make install failed"
+	make DESTDIR="${D}" APXSFLAGS="-c" install || die "make install failed"
 	apache-module_src_install
 
-	# dirs --------------------------------------------------------------
 	keepdir /var/{lib,log}/${PN}
 	keepdir /var/lib/${PN}/run
-	chown -R skunkweb:skunkweb ${D}/var/{lib,log}/${PN}
-	# scripts------------------------------------------------------------
-	newinitd ${FILESDIR}/skunkweb-init skunkweb
+	fowners skunkweb:skunkweb /var/{lib,log}/${PN}
+
+	newinitd "${FILESDIR}"/skunkweb-init skunkweb
 	exeinto /etc/cron.daily
-	newexe ${FILESDIR}/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner
-	# docs --------------------------------------------------------------
+	newexe "${FILESDIR}"/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner
+
 	dodoc README ChangeLog NEWS HACKING ACKS INSTALL
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		cp docs/paper-letter/*.pdf ${D}/usr/share/doc/${PF}
-		ewarn "Some docs are still in upstream cvs (i.e.: formlib, pydo2)"
-	fi
 }