Version bump to latest security release for bug #339295 and security bugs #305663 and #334697. Bump to EAPI=3, use PYTHON_DEPEND, and update dead links.

Package-Manager: portage-2.2_rc90/cvs/Linux x86_64

4 files changed, 98 insertions, 9 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index b15f7a554a8f..39fa260c6dd1 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/moinmoin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.64 2009/06/26 08:59:49 a3li Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.65 2010/10/13 00:15:54 radhermit Exp $
+
+*moinmoin-1.8.8 (13 Oct 2010)
+
+  13 Oct 2010; Tim Harder <radhermit@gentoo.org> +moinmoin-1.8.8.ebuild,
+  files/postinstall-en.txt:
+  Version bump to latest security release for bug #339295 and security bugs
+  #305663 and #334697. Bump to EAPI=3, use PYTHON_DEPEND, and update dead
+  links.
 
   26 Jun 2009; Alex Legler <a3li@gentoo.org> -moinmoin-1.8.1.ebuild:
   Removing vulnerable version, security bug 268565.
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index edd96786dd31..e0b0c93a117d 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -1,17 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX postinstall-en.txt 808 RMD160 3588cba97e7bd235f140da8bd919f52af26d85e1 SHA1 ca94a45143e3f9be652559580d258cb822dc52af SHA256 43e2ee06036c7582e5b0ad40ffd1b9afd96e6abb90a0e4208c6e53eae243571a
+AUX postinstall-en.txt 803 RMD160 1f7b69fc48e35c5b85d0bc2488c0287b9097463e SHA1 3f3e50325301da74a6d2245c7693494c0b4650c0 SHA256 fe1e197f7b4108b28b4061790b77e63c743e6382605f266df7676a0b1182da8b
 AUX reconfig-2 421 RMD160 5589dd4a8a87158bf88a99eda91695c7f938599c SHA1 b7d1df9ae27a6fa7ab3b55c53e4f8f382bb47775 SHA256 e885eb6c78df793fe2954a35631f3b611429412e78761bde00587cc14df26657
 AUX reconfig-3 596 RMD160 8be97aa5ac68a26c6aec0d132bdfdea59837b233 SHA1 954e33cca005ae5a66cb6ece80bcac891454a331 SHA256 6f281643ef1b4744b488686815f6b5b5511ab8848497d9340594ad96c5ecbd44
 DIST moin-1.8.4.tar.gz 5959517 RMD160 e417a44379b06eb33656264443770b5156ac4d92 SHA1 1c411d7312ca184666732ca3a37758cdd2ad561e SHA256 7e664d96cde9eb5b8d01fddcab58b903760a55e56e7959dd97f2711a5fc3b48c
+DIST moin-1.8.8.tar.gz 6704374 RMD160 39e31113e3b0ced434ec3a89efef6f486c1623b4 SHA1 c869853e35c7c80253626b78322ee3d7e3ba2ca0 SHA256 8ec59fe808747c3442017dcda098b0bfd40e90020e26aabd654cbc52ec85fbca
 EBUILD moinmoin-1.8.4.ebuild 1769 RMD160 890361210a170ef3565895e8abb54560a1dc1bae SHA1 5924e40d3e15f0421e49c54669fc52272a7d1ca0 SHA256 5f8de48316c9223ba03d7c1bd23b59139d43de5ab76fcb633a1fb1378b0ec09e
-MISC ChangeLog 10251 RMD160 8e5ca5d8146e59e0d1c884e187a17c20ba097ff0 SHA1 b6b8fd207b0525f853c780daa106028ccffbd17f SHA256 b227991e5ed94b3d8da567d1cbc7862c4e7986a18368f8847a95480d8bf9fad9
+EBUILD moinmoin-1.8.8.ebuild 1731 RMD160 c1aea86fb713cf3f0367f111384a392d51b4b581 SHA1 0b620088b5fcfb3af36288086ba5e98302deb2c9 SHA256 da0c0b304ed98b8287316df8d0672fee4952b19e04b4f64d7768c4db6822be2e
+MISC ChangeLog 10548 RMD160 2fb9618c162d5686fd71df3e5ff9989e7da68d1b SHA1 1bd3a6579d463c003916b3e7de2e152d0b324fd2 SHA256 f825357cf8bb09485d2721a0e7c5247e19194d11585592dd0351d63853ea6a81
 MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkpEjgwACgkQaGsKqSU7eCTtzACffcrw/R2uWIU6hwLAGqx/tmOz
-JcUAnAoUUS/gS69Qole4oY0o87P3ws4A
-=qrQ3
+iQEcBAEBAgAGBQJMtPpDAAoJEEqz6FtPBkyjEesH/RMmAi+BhCNlsPnPcXqSYWNq
+2cLP464c1z/XyYAQoNUg0XZPEtYY2nIsJavsYDJoKQYi8NMnH7WDsqWtgg4DBQNf
+F42dnYJ88FsDd/Bhjye4o8AldYCv+YCinz3Nldxbx3Psjuhbj2LxNV5X7q61igQ6
+4Tqft+TCy76XHQydUFLUnl7hwfRjdtrn038W1UA4qsT/liJLhGUCpITS2a6AvH3Y
+R0YKwGnPw4JYuBKUhxWW/hURShYeGwKcc7htNNFaDbAYTkk7sRhuDlhXaYFQFbCA
++Ngk+PnySOsOBTmfnsOKmIxW+Wq6oZ82oFXNgFZ/oCazQ2ax6gr3ykQg8muqeHo=
+=F8i6
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/files/postinstall-en.txt b/www-apps/moinmoin/files/postinstall-en.txt
index 568aaf0f5373..b4f5381a5514 100644
--- a/www-apps/moinmoin/files/postinstall-en.txt
+++ b/www-apps/moinmoin/files/postinstall-en.txt
@@ -1,5 +1,5 @@
 Now please read the installation manual at
-http://moinmoin.wikiwikiweb.de/HelpOnInstalling
+http://master18.moinmo.in/HelpOnInstalling
 
 MoinMoin can work with a variety of webservers. Simple Apache instructions
 are given below:
diff --git a/www-apps/moinmoin/moinmoin-1.8.8.ebuild b/www-apps/moinmoin/moinmoin-1.8.8.ebuild
new file mode 100644
index 000000000000..d57ffd2abc2c
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.8.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.8.8.ebuild,v 1.1 2010/10/13 00:15:54 radhermit Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+MY_PN="moin"
+PYTHON_MODNAME="MoinMoin"
+
+inherit webapp distutils python
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="Python WikiClone"
+SRC_URI="http://static.moinmo.in/files/${MY_PN}-${PV}.tar.gz"
+HOMEPAGE="http://moinmo.in/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="rss"
+
+DEPEND=""
+RDEPEND=">=dev-python/docutils-0.4
+	rss? ( >=dev-python/pyxml-0.8.4 )"
+
+need_httpd_cgi
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+src_install() {
+	webapp_src_preinst
+	distutils_src_install
+
+	dodoc README docs/CHANGES* docs/README.migration
+	dohtml docs/INSTALL.html
+	rm -rf README docs/
+
+	cd "${D}"/usr/share/moin
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* server/moin.cgi
+	fperms +x "${MY_HTDOCSDIR}/moin.cgi"
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}
+	doins -r data underlay config/wikiconfig.py
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}/altconfigs
+	doins -r config
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}/altserver
+	doins -r server
+
+	# data needs to be server owned 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-3
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you are upgrading from an older version, please read"
+	ewarn "README.migration in /usr/share/doc/${PF}"
+	ewarn
+
+	distutils_pkg_postinst
+	webapp_pkg_postinst
+}