3 files changed, 73 insertions, 1 deletions
diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index 3fe3391a7f35..28b76cfeeacc 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/moinmoin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.14 2006/04/23 21:27:24 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.15 2006/07/02 00:59:07 rl03 Exp $
+
+*moinmoin-1.5.4 (02 Jul 2006)
+
+  02 Jul 2006; Renat Lumpau <rl03@gentoo.org> -moinmoin-1.5.3.ebuild,
+  +moinmoin-1.5.4.ebuild:
+  Version bump
 
 *moinmoin-1.5.3 (23 Apr 2006)
 
diff --git a/www-apps/moinmoin/files/digest-moinmoin-1.5.4 b/www-apps/moinmoin/files/digest-moinmoin-1.5.4
new file mode 100644
index 000000000000..5d5004fe13e8
--- /dev/null
+++ b/www-apps/moinmoin/files/digest-moinmoin-1.5.4
@@ -0,0 +1,3 @@
+MD5 dcb85c72126c2fe39de66ef781a7dd39 moin-1.5.4.tar.gz 4329975
+RMD160 18655332b6f19e8e28645fe5bb1c05cdcbdac728 moin-1.5.4.tar.gz 4329975
+SHA256 f102ef0542e33c03b0837fc38fcd50392d5840d74a83fe6845fc0ea4a0362460 moin-1.5.4.tar.gz 4329975
diff --git a/www-apps/moinmoin/moinmoin-1.5.4.ebuild b/www-apps/moinmoin/moinmoin-1.5.4.ebuild
new file mode 100644
index 000000000000..7b48753b18eb
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.5.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.5.4.ebuild,v 1.1 2006/07/02 00:59:07 rl03 Exp $
+
+inherit webapp
+
+MY_PN="moin"
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Python WikiClone"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${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.3"
+RDEPEND="${DEPEND}
+	>=dev-python/docutils-0.4
+	rss? ( >=dev-python/pyxml-0.8.4 )"
+
+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/HACKS docs/README.migration
+	dohtml docs/INSTALL.html
+	dodir ${MY_HOSTROOTDIR}/${PF}
+
+	cd ${D}/usr/share/moin
+	cp -r htdocs/* server/moin.cgi ${D}/${MY_HTDOCSDIR}
+	chmod +x ${D}/${MY_HTDOCSDIR}/moin.cgi
+	cp -r data underlay config/wikiconfig.py ${D}/${MY_HOSTROOTDIR}/${PF}
+	cp -r config ${D}/${MY_HOSTROOTDIR}/${PF}/altconfigs
+	cp -r server ${D}/${MY_HOSTROOTDIR}/${PF}/altserver
+
+	# data needs to be serverowned per moin devs
+	cd ${D}/${MY_HOSTROOTDIR}/${PF}
+	for file in $(find data underlay); do
+		webapp_serverowned "${MY_HOSTROOTDIR}/${PF}/${file}"
+	done
+
+	webapp_configfile ${MY_HOSTROOTDIR}/${PF}/wikiconfig.py
+	webapp_hook_script ${FILESDIR}/reconfig-2
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn "If you are upgrading from 1.3.x, please read"
+	ewarn "/usr/share/doc/${PF}/README.migration.gz"
+	ewarn "and http://moinmoin.wikiwikiweb.de/HelpOnUpdating"
+	webapp_pkg_postinst
+}