Old ebuild cleanup. 3.4.1 version bump (at the moment, the mvc service requires a dependency not in portage tree: later :-) )

Package-Manager: portage-2.1_pre5-r4

8 files changed, 98 insertions, 181 deletions

diff --git a/www-servers/skunkweb/ChangeLog b/www-servers/skunkweb/ChangeLog
index 042262a9aa05..b3163ec86e67 100644
--- a/www-servers/skunkweb/ChangeLog
+++ b/www-servers/skunkweb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/skunkweb
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.9 2006/02/13 11:55:39 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.10 2006/03/14 09:21:01 satya Exp $
+
+*skunkweb-3.4.1 (14 Mar 2006)
+
+  14 Mar 2006; Christian Andreetta <satya@gentoo.org>
+  -skunkweb-3.4_beta5.ebuild, -skunkweb-3.4_beta5-r1.ebuild,
+  +skunkweb-3.4.1.ebuild:
+  Old ebuild cleanup. 3.4.1 version bump (at the moment, the "mvc" service
+  requires a dependency not in portage tree: later :-) )
 
   13 Feb 2006; Christian Andreetta <satya@gentoo.org>
   skunkweb-3.4_beta5.ebuild, skunkweb-3.4_beta5-r1.ebuild,
diff --git a/www-servers/skunkweb/Manifest b/www-servers/skunkweb/Manifest
index 99abd3758d2f..2dbc705afef4 100644
--- a/www-servers/skunkweb/Manifest
+++ b/www-servers/skunkweb/Manifest
@@ -1,6 +1,6 @@
-MD5 fe3373bb56bcb4535c12bc2c76f29650 ChangeLog 2944
-RMD160 c458f0df488cc60dacaf78219eea4b0fdcaf7c3a ChangeLog 2944
-SHA256 6e98541e3022a7c9786499352a5a84d49290674960438c7fc01df64128052340 ChangeLog 2944
+MD5 89d312b2f0ae97208e2e2407b8c68f4b ChangeLog 3250
+RMD160 7ffa1a647d0d669cc36ef57ecc1216506d9a14be ChangeLog 3250
+SHA256 f2060dda04b3cd233efeda0d4efff9c43ebeb1a11c18020c3eac2648deeeeb3d ChangeLog 3250
 MD5 2843ae875786bb890bad903d0f005381 files/100_mod_skunkweb.conf 1727
 RMD160 40e158ed5a23553c04c43752f6697a9546a3a0bd files/100_mod_skunkweb.conf 1727
 SHA256 9aac3364aba8cd5ec04d92fe193aff709ed2e879944494679acabbac6f938641 files/100_mod_skunkweb.conf 1727
@@ -10,12 +10,9 @@ SHA256 3d2ed6412a88c3d3ca6d250a3c2c7f8ad2b8c0ce0ad0526178b5dd3957c49ff7 files/di
 MD5 f649daf3fb435a3f6edc0307de265e57 files/digest-skunkweb-3.4.0-r1 67
 RMD160 7d03d9906d5c923042ee3cb8a17bf88b6e5a6f70 files/digest-skunkweb-3.4.0-r1 67
 SHA256 3d2ed6412a88c3d3ca6d250a3c2c7f8ad2b8c0ce0ad0526178b5dd3957c49ff7 files/digest-skunkweb-3.4.0-r1 67
-MD5 33defac2f69099260dac7f1a043b2643 files/digest-skunkweb-3.4_beta5 67
-RMD160 d438ec685d5ff0a895d55ce28a9f400fe2a9dd3c files/digest-skunkweb-3.4_beta5 67
-SHA256 6c8464cffdedfd347792c5ee5e90d416de90f38fb21a3b08894eaa14ddf9a442 files/digest-skunkweb-3.4_beta5 67
-MD5 33defac2f69099260dac7f1a043b2643 files/digest-skunkweb-3.4_beta5-r1 67
-RMD160 d438ec685d5ff0a895d55ce28a9f400fe2a9dd3c files/digest-skunkweb-3.4_beta5-r1 67
-SHA256 6c8464cffdedfd347792c5ee5e90d416de90f38fb21a3b08894eaa14ddf9a442 files/digest-skunkweb-3.4_beta5-r1 67
+MD5 750db253c253371b2ea673119aaefca9 files/digest-skunkweb-3.4.1 247
+RMD160 57ca8b2f0971ae9103080e1df96bd35cebf11cbc files/digest-skunkweb-3.4.1 247
+SHA256 e846b5f3c2ace185da1971e14ae5809d1151ba0739dda3fe37e799e03188f75f files/digest-skunkweb-3.4.1 247
 MD5 595ca4b94aee6033c092990fdaed80e2 files/skunkweb-cron-cache_cleaner 108
 RMD160 ad5b93db2625c701391069f6e74c2beca0c942da files/skunkweb-cron-cache_cleaner 108
 SHA256 02927df2a6c76daeb39f1fc71e59c31a5c4862badd087fcc5047935006791189 files/skunkweb-cron-cache_cleaner 108
@@ -31,9 +28,6 @@ SHA256 7f8a7d429d0fd907dbb477e0b4c72bf68b2e5e35fc6b1f085465786081dbc415 skunkweb
 MD5 8897f3e1347f3f7bdb3d0bae93d1e445 skunkweb-3.4.0.ebuild 2659
 RMD160 2f1b334cb5491243384883c3a0b9a88b9a5a58d3 skunkweb-3.4.0.ebuild 2659
 SHA256 b2d3b1f3f7e16af64d59912a735d69c8e5484daf4b683453e55624bdd5b7d78b skunkweb-3.4.0.ebuild 2659
-MD5 9f99669ca68585c1f4f4c38b52bb218a skunkweb-3.4_beta5-r1.ebuild 2600
-RMD160 5a2f4a672783d6ad63103ea954f0f95b9daf692b skunkweb-3.4_beta5-r1.ebuild 2600
-SHA256 2f467629da1da336160102c158705d9e96ed361ae3523d9176c79e8b16bae8cb skunkweb-3.4_beta5-r1.ebuild 2600
-MD5 3ac16513b2908313306768a1d1a9024f skunkweb-3.4_beta5.ebuild 2221
-RMD160 bd62db0980a40a1e560d6b9b638d447e70da10d1 skunkweb-3.4_beta5.ebuild 2221
-SHA256 a712f6ada653bbfb5ff29f1290a45155209bb45616fb764b9001e28787100a01 skunkweb-3.4_beta5.ebuild 2221
+MD5 045e5845986925b66de0b019d971673e skunkweb-3.4.1.ebuild 2273
+RMD160 9e2551c5f9149cc131e275b89e5783aca48efdc8 skunkweb-3.4.1.ebuild 2273
+SHA256 e5c01d0cc80555ab6123042a162fe6d9270d93c9d646b6824e44dd5072c806c6 skunkweb-3.4.1.ebuild 2273
diff --git a/www-servers/skunkweb/files/digest-skunkweb-3.4.1 b/www-servers/skunkweb/files/digest-skunkweb-3.4.1
new file mode 100644
index 000000000000..53937959bf0a
--- /dev/null
+++ b/www-servers/skunkweb/files/digest-skunkweb-3.4.1
@@ -0,0 +1,3 @@
+MD5 37905ad051b929a81af308a528b89432 skunkweb-3.4.1.tar.gz 1523805
+RMD160 ac9ea1dd37796523c5eec528f7896bb2044d646e skunkweb-3.4.1.tar.gz 1523805
+SHA256 0c1371fe00be335b303fdc2739a529d6558ad3feb9e0f095986cc807cc76a1be skunkweb-3.4.1.tar.gz 1523805
diff --git a/www-servers/skunkweb/files/digest-skunkweb-3.4_beta5 b/www-servers/skunkweb/files/digest-skunkweb-3.4_beta5
deleted file mode 100644
index 3a7dc4213de5..000000000000
--- a/www-servers/skunkweb/files/digest-skunkweb-3.4_beta5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 74fc5c98c036d0453ede0c9aaa51f4b0 skunkweb-3.4b5.tar.gz 1952771
diff --git a/www-servers/skunkweb/files/digest-skunkweb-3.4_beta5-r1 b/www-servers/skunkweb/files/digest-skunkweb-3.4_beta5-r1
deleted file mode 100644
index 3a7dc4213de5..000000000000
--- a/www-servers/skunkweb/files/digest-skunkweb-3.4_beta5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 74fc5c98c036d0453ede0c9aaa51f4b0 skunkweb-3.4b5.tar.gz 1952771
diff --git a/www-servers/skunkweb/skunkweb-3.4.1.ebuild b/www-servers/skunkweb/skunkweb-3.4.1.ebuild
new file mode 100644
index 000000000000..e3cd5677fb5c
--- /dev/null
+++ b/www-servers/skunkweb/skunkweb-3.4.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 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.1 2006/03/14 09:21:01 satya 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="apache2 doc"
+
+DEPEND=">=dev-lang/python-2.2
+		>=dev-python/egenix-mx-base-2.0.4
+		app-admin/sudo"
+
+APACHE1_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/mod_skunkweb.so"
+APACHE2_MOD_FILE="${S}/SkunkWeb/mod_skunkweb/.libs/mod_skunkweb.so"
+
+APACHE1_MOD_DEFINE="SKUNKWEB"
+APACHE2_MOD_DEFINE="SKUNKWEB"
+
+APACHE1_MOD_CONF="100_mod_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
+	use apache2 && apxs="${APXS2}"
+	use apache2 || apxs="${APXS1}"
+
+	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------------------------------------------------------------
+	exeinto /etc/init.d
+	newexe ${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_beta5-r1.ebuild b/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild
deleted file mode 100644
index 18c55d151a2e..000000000000
--- a/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4_beta5-r1.ebuild,v 1.4 2006/02/13 11:55:39 satya Exp $
-
-inherit eutils
-
-DESCRIPTION="robust Python web application server"
-HOMEPAGE="http://skunkweb.sourceforge.net/"
-#NEWP=`echo ${P} | sed -e 's|_beta|b|'`
-NEWP=${P/_beta/b}
-S=${WORKDIR}/${NEWP}
-SRC_URI="mirror://sourceforge/skunkweb/${NEWP}.tar.gz"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="apache apache2 doc"
-DEPEND=">=dev-lang/python-2.2
-		>=dev-python/egenix-mx-base-2.0.4
-		apache2? ( >=net-www/apache-2.0.47 )
-		!apache2? ( apache? ( <=net-www/apache-2 ) )"
-
-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
-		if use apache; then
-			myconf="${myconf} --with-apxs=/usr/sbin/apxs"
-		else
-			myconf="${myconf} --without-mod_skunkweb"
-		fi
-	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
-	else
-		if use apache; then
-			exeinto /usr/lib/apache-extramodules
-			doexe SkunkWeb/mod_skunkweb/mod_skunkweb.so
-			insinto /etc/apache/conf/addon-modules
-			newins SkunkWeb/mod_skunkweb/httpd_conf.stub mod_skunkweb.conf
-		fi
-	fi
-	# dirs --------------------------------------------------------------
-	mkdir -p ${D}/var/{lib,log}/${PN}
-	chown skunkweb:skunkweb ${D}/var/{lib,log}/${PN}
-	mkdir -p ${D}/var/lib/${PN}/run
-	# init --------------------------------------------------------------
-	exeinto /etc/init.d; newexe ${FILESDIR}/skunkweb-init skunkweb
-	# docs --------------------------------------------------------------
-	dodoc README ChangeLog NEWS HACKING ACKS INSTALL
-	if use doc; then
-		cd ${S}/doc
-		dodir /usr/share/doc/${PF}
-		#cp docs/paper-letter/*.pdf ${D}/usr/share/doc/${PF}
-		cp docs/paper-a4/*.pdf ${D}/usr/share/doc/${PF}
-	fi
-}
diff --git a/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild b/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild
deleted file mode 100644
index d017c381654b..000000000000
--- a/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4_beta5.ebuild,v 1.4 2006/02/13 11:55:39 satya Exp $
-
-inherit eutils
-
-DESCRIPTION="robust Python web application server"
-HOMEPAGE="http://skunkweb.sourceforge.net/"
-#NEWP=`echo ${P} | sed -e 's|_beta|b|'`
-NEWP=${P/_beta/b}
-S=${WORKDIR}/${NEWP}
-SRC_URI="mirror://sourceforge/skunkweb/${NEWP}.tar.gz"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="apache apache2 doc"
-DEPEND=">=dev-lang/python-2.2
-		>=dev-python/egenix-mx-base-2.0.4
-		apache2? ( >=net-www/apache-2.0.47 )
-		!apache2? ( apache? ( <=net-www/apache-2 ) )"
-
-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
-		if use apache; then
-			myconf="${myconf} --with-apxs=/usr/sbin/apxs"
-		else
-			myconf="${myconf} --without-mod_skunkweb"
-		fi
-	fi
-	./configure \
-		--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/apache/conf/addon-modules
-		newins SkunkWeb/mod_skunkweb/http_conf.stub mod_skunkweb.conf
-	else
-		if use apache; then
-			exeinto /usr/lib/apache-extramodules
-			doexe SkunkWeb/mod_skunkweb/mod_skunkweb.so
-			insinto /etc/apache/conf/addon-modules
-			newins SkunkWeb/mod_skunkweb/http_conf.stub mod_skunkweb.conf
-		fi
-	fi
-	exeinto /etc/init.d; newexe ${FILESDIR}/skunkweb-init skunkweb
-	dodoc README ChangeLog NEWS HACKING ACKS INSTALL
-	if use doc; then
-		cd ${S}/doc
-		dodir /usr/share/doc/${PF}
-		cp docs/paper-letter/*.pdf ${D}/usr/share/doc/${PF}
-	fi
-}