Version / security bump.

5 files changed, 83 insertions, 3 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index d6541eb0e49a..d74e29d99c28 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/moinmoin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.1 2004/08/15 15:10:32 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.2 2004/08/16 19:12:55 g2boojum Exp $
+
+*moinmoin-1.2.3 (16 Aug 2004)
+
+  16 Aug 2004; Grant Goodyear <g2boojum@gentoo.org> +files/postinstall-en.txt,
+  +moinmoin-1.2.3.ebuild:
+  Version / security bump (bug 57913).
+  I think that 58381 still needs work before it can be added.
 
 *moinmoin-1.2.2 (15 Aug 2004)
 
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 70b5acac6aa2..ddd0f2d4b8c9 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -1,4 +1,7 @@
-MD5 0ff336477fb9bc231e2b6548afd9f58d ChangeLog 1633
+MD5 b06c9778e1309e3eb608b2603e6d7d00 moinmoin-1.2.3.ebuild 1324
+MD5 c25780be9eb4cdd25fb48323e1b247f6 ChangeLog 2049
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 5fd6f49d0d05986d0480e6336effa9f1 moinmoin-1.2.2.ebuild 1320
+MD5 fed52f08c9db4329e4eaeb3a2d7388be moinmoin-1.2.2.ebuild 1322
+MD5 c7f9a5535e64dcb8a7f4520c1a5fb617 files/postinstall-en.txt 357
 MD5 9f892950e59827ee9c7a8a082a880bd2 files/digest-moinmoin-1.2.2 63
+MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3 63
diff --git a/www-apps/moinmoin/files/digest-moinmoin-1.2.3 b/www-apps/moinmoin/files/digest-moinmoin-1.2.3
new file mode 100644
index 000000000000..4683a0b4b5c8
--- /dev/null
+++ b/www-apps/moinmoin/files/digest-moinmoin-1.2.3
@@ -0,0 +1 @@
+MD5 7604429f54468df23abda22d80bec7d1 moin-1.2.3.tar.gz 1267566
diff --git a/www-apps/moinmoin/files/postinstall-en.txt b/www-apps/moinmoin/files/postinstall-en.txt
new file mode 100644
index 000000000000..c459414cd1be
--- /dev/null
+++ b/www-apps/moinmoin/files/postinstall-en.txt
@@ -0,0 +1,16 @@
+
+You are almost done!
+
+1. ExecCGI needs to be enabled in your Moinmoin directory. You con do this by
+simply
+# echo "Options ExecCGI" > ${MY_INSTALLDIR}/.htaccess
+
+2. Add the following lines to your Apache configs:
+Alias /moinmoin "${MY_INSTALLDIR}"
+ScriptAlias /mymoin "${MY_INSTALLDIR}/moin.cgi"
+
+3. Restart Apache
+
+4. Go to http://YOURHOST/mymoin
+
+Enjoy!
diff --git a/www-apps/moinmoin/moinmoin-1.2.3.ebuild b/www-apps/moinmoin/moinmoin-1.2.3.ebuild
new file mode 100644
index 000000000000..83cff7494930
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.2.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.2.3.ebuild,v 1.1 2004/08/16 19:12:55 g2boojum Exp $
+
+inherit webapp-apache
+
+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"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.2"
+
+pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
+}
+
+src_compile() {
+	python setup.py build || die "python build failed"
+}
+
+src_install () {
+	webapp-mkdirs
+
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/${PN}
+	dodir ${destdir}
+
+	python setup.py install --root=${D} --prefix=/usr install || die "python install failed"
+
+	cd ${D}/usr/share/moin
+	cp -r data htdocs/* ${D}/${HTTPD_ROOT}/${PN}
+	cp cgi-bin/* ${D}/${HTTPD_ROOT}/${PN}
+	cd ${D}/${HTTPD_ROOT}
+	chown -R ${HTTPD_USER}:${HTTPD_USER} ${PN}
+	cd ${D}/${HTTPD_ROOT}/${PN}
+	chmod  a+x moin.cgi
+	sed -i -e "s/\/wiki/\/moinmoin/" moin_config.py
+}
+
+pkg_postinst() {
+	einfo
+	einfo "MoinMoin requires that cgi be turned on in ${HTTPD_ROOT}/${P}."
+	einfo
+}