Version bump, close bugs #74939, #68848

(Portage version: 2.0.51.22-r2)

6 files changed, 97 insertions, 12 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index d3b9a0ec41d7..ca94855c5dbe 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/moinmoin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.8 2005/06/24 10:12:57 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.9 2005/08/28 23:38:26 rl03 Exp $
+
+*moinmoin-1.3.5 (28 Aug 2005)
+
+  28 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +files/reconfig, +moinmoin-1.3.5.ebuild:
+  Version bump, close bugs #74939, #68848
 
   24 Jun 2005; Christian Parpart <trapni@gentoo.org>
   files/postinstall-en.txt:
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 258eb805eaee..8845130cb502 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -1,11 +1,14 @@
 MD5 77013058e89d7f7fbb52a276f071b95d moinmoin-1.2.3-r1.ebuild 1040
-MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 074fafad23e03d29c5d50539860bcfcf moinmoin-1.3.3.ebuild 1401
-MD5 803c1dd135efc6b751540bf48cae1ca6 moinmoin-1.2.2.ebuild 1323
 MD5 1e73d40d888212699794efd23c42a5a5 moinmoin-1.2.3.ebuild 1323
+MD5 074fafad23e03d29c5d50539860bcfcf moinmoin-1.3.3.ebuild 1401
 MD5 99a3298df3d3637a13915d3690908413 ChangeLog 3062
+MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
+MD5 803c1dd135efc6b751540bf48cae1ca6 moinmoin-1.2.2.ebuild 1323
+MD5 d54c725c97d2303552502b6526ed9a3d moinmoin-1.3.5.ebuild 1642
 MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3-r1 63
-MD5 4a15b460b1bb9ff77b8b08e71a0f1f14 files/digest-moinmoin-1.3.3 63
-MD5 8dc623df9b05239a79dc417e8bc06387 files/postinstall-en.txt 645
-MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3 63
+MD5 6fb347eae42824c20e1dac8cd73f0ce6 files/postinstall-en.txt 808
+MD5 986a7f0ef30ca0797647e0723b3ed041 files/reconfig 251
 MD5 9f892950e59827ee9c7a8a082a880bd2 files/digest-moinmoin-1.2.2 63
+MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3 63
+MD5 4a15b460b1bb9ff77b8b08e71a0f1f14 files/digest-moinmoin-1.3.3 63
+MD5 4b756ef0b0c4eb10b5b2646ce792c0dc files/digest-moinmoin-1.3.5 63
diff --git a/www-apps/moinmoin/files/digest-moinmoin-1.3.5 b/www-apps/moinmoin/files/digest-moinmoin-1.3.5
new file mode 100644
index 000000000000..bc593c1b1767
--- /dev/null
+++ b/www-apps/moinmoin/files/digest-moinmoin-1.3.5
@@ -0,0 +1 @@
+MD5 7194abf16cd6fe24c046013ce3a7c13d moin-1.3.5.tar.gz 3456657
diff --git a/www-apps/moinmoin/files/postinstall-en.txt b/www-apps/moinmoin/files/postinstall-en.txt
index 4fa7ca85bd2f..568aaf0f5373 100644
--- a/www-apps/moinmoin/files/postinstall-en.txt
+++ b/www-apps/moinmoin/files/postinstall-en.txt
@@ -1,7 +1,10 @@
+Now please read the installation manual at
+http://moinmoin.wikiwikiweb.de/HelpOnInstalling
 
-You are almost done!
+MoinMoin can work with a variety of webservers. Simple Apache instructions
+are given below:
 
-1. ExecCGI needs to be enabled in your Moinmoin directory. You con do this by
+1. ExecCGI needs to be enabled in your Moinmoin directory. You can do this by
 simply
 # echo "Options ExecCGI" > ${MY_INSTALLDIR}/.htaccess
 # echo "AddHandler cgi-script .cgi" >> ${MY_INSTALLDIR}/.htaccess
@@ -16,6 +19,4 @@ in httpd.conf, and change "AllowOverride None" to "AllowOverride All".
 
 4. Restart Apache
 
-5. Go to http://YOURHOST/mymoin
-
-Enjoy!
+5. Go to http://${VHOST_HOSTNAME}/mymoin
diff --git a/www-apps/moinmoin/files/reconfig b/www-apps/moinmoin/files/reconfig
new file mode 100644
index 000000000000..810a9ef6d43e
--- /dev/null
+++ b/www-apps/moinmoin/files/reconfig
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed -e "s|/path/to/wikiconfig|${MY_INSTALLDIR}/wikiconfig.py|g" -i ${MY_INSTALLDIR}/moin.cgi || die "sed failed"
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/www-apps/moinmoin/moinmoin-1.3.5.ebuild b/www-apps/moinmoin/moinmoin-1.3.5.ebuild
new file mode 100644
index 000000000000..1abae69a33b8
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.3.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.3.5.ebuild,v 1.1 2005/08/28 23:38:26 rl03 Exp $
+
+inherit webapp
+
+PN0="moin"
+S=${WORKDIR}/${PN0}-${PV}
+
+DESCRIPTION="Python WikiClone"
+SRC_URI="http://download.sourceforge.net/${PN0}/${PN0}-${PV}.tar.gz"
+HOMEPAGE="http://moin.sourceforge.net"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+LICENSE="GPL-2"
+IUSE="rss"
+
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+DEPEND=">=dev-lang/python-2.2"
+RDEPEND="${DEPEND}
+	rss? ( >=dev-python/pyxml-0.8.4 )
+	!<www-apps/moinmoin-1.3.5"
+
+src_compile() {
+	python setup.py build || die "python build failed"
+}
+
+src_install () {
+	webapp_src_preinst
+
+	python setup.py install --root=${D} --prefix=/usr install || die "python install failed"
+
+	dodoc ChangeLog README docs/CHANGES docs/README.migration
+	dohtml docs/INSTALL.html docs/UPDATE.html
+	cd ${D}/usr/share/moin
+	cp -r data underlay htdocs/* server/moin.cgi config/wikiconfig.py \
+		${D}/${MY_HTDOCSDIR}
+	cp -r config ${D}/${MY_HTDOCSDIR}/altconfigs
+	cp -r server ${D}/${MY_HTDOCSDIR}/altserver
+	cd ${D}/${MY_HTDOCSDIR}
+
+	# data needs to be serverowned per moin devs
+	for file in `find data underlay`; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	done
+	chmod +x moin.cgi
+
+	webapp_configfile ${MY_HTDOCSDIR}/wikiconfig.py
+	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn "If you are upgrading from 1.2.x to 1.3.x, please read"
+	ewarn "/usr/share/doc/${P}/README.migration.gz"
+	webapp_pkg_postinst
+}