Version bump (bug #374389 by Robert Trace).

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

5 files changed, 161 insertions, 17 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index 0b2cae830162..7c38853f8a34 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/moinmoin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.72 2011/04/20 19:11:38 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.73 2012/09/05 00:55:15 radhermit Exp $
+
+*moinmoin-1.9.4 (05 Sep 2012)
+
+  05 Sep 2012; Tim Harder <radhermit@gentoo.org> +files/reconfig-1.9.4,
+  +moinmoin-1.9.4.ebuild, +files/postinstall-en-1.9.4.txt:
+  Version bump (bug #374389 by Robert Trace).
 
   20 Apr 2011; Tim Harder <radhermit@gentoo.org> moinmoin-1.8.8.ebuild:
   Restrict to at most dev-lang/python-2.6* since 2.7 won't work.
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index df4d0085a72e..db3768fd60e4 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX postinstall-en.txt 803 RMD160 1f7b69fc48e35c5b85d0bc2488c0287b9097463e SHA1 3f3e50325301da74a6d2245c7693494c0b4650c0 SHA256 fe1e197f7b4108b28b4061790b77e63c743e6382605f266df7676a0b1182da8b
-AUX reconfig-3 596 RMD160 8be97aa5ac68a26c6aec0d132bdfdea59837b233 SHA1 954e33cca005ae5a66cb6ece80bcac891454a331 SHA256 6f281643ef1b4744b488686815f6b5b5511ab8848497d9340594ad96c5ecbd44
-DIST moin-1.8.8.tar.gz 6704374 RMD160 39e31113e3b0ced434ec3a89efef6f486c1623b4 SHA1 c869853e35c7c80253626b78322ee3d7e3ba2ca0 SHA256 8ec59fe808747c3442017dcda098b0bfd40e90020e26aabd654cbc52ec85fbca
-EBUILD moinmoin-1.8.8.ebuild 1813 RMD160 469492c9c65e0972a992442182bec8585893ac8a SHA1 889a421f2f0056fe4020ff7318042dcb46355397 SHA256 dcb15823eadf539d516c208bb39f397e01f46b67e57152f213d9f5a4da7f347e
-MISC ChangeLog 11360 RMD160 9337d9714a2480e4aa6bf0e6ec3802d3a36d2e3d SHA1 90b08d2ac326f4d9083f1c04a91205d8de4ebcc8 SHA256 c3a386d2d83dcde399825c1522b803d135627f1c84d9d5f17ea57f422db51630
-MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
+AUX postinstall-en-1.9.4.txt 548 SHA256 ca92d8231b3bf6859e7d9ab4c6a605d12d3ee617eb244b8265f4c5e51857070c SHA512 a007244d5807ca89ad515f738cdcf739d3f4ba0a6c2ee35f05435856c4ccc9c993d44ed08a06b5d8555450b6b34013d3254628480900e515bb19ba80719a05ba WHIRLPOOL d6b0766b23f99bd32c4849be2d4aa2ae984363f1a6cf0a89becdc66d1bb942c9962efce68c22a47e127704628ddc07792481b06be5c5018c0c0d5814898de275
+AUX postinstall-en.txt 803 SHA256 fe1e197f7b4108b28b4061790b77e63c743e6382605f266df7676a0b1182da8b SHA512 cff63acd0214849725ce2bf970d14c525719bb351ba992d0289f4dda44d585affa4ac81aeaa432ecbc10d238b0b735a5c51ac87506cd94266522c68f2285bf9d WHIRLPOOL b54663849b5472c3076c685871c2367a35f36a5a1bcba3fee9b9622994652b8f46465855bb7cae0a11df8d217a809b2a9c6a42e7e77c5267a9d3dca9b6383889
+AUX reconfig-1.9.4 457 SHA256 d23601f95da8a9abc02a439b5b3f257dda31ff8f20f1e42b4492fef461fe6e1e SHA512 c5b493354e44e0a81e540eb80469b6787e2b898dbb2737ea8b6a52c95e92ba79af78bb0fc67b406a23ef2ca5d3df9a88c7e89c688e2d139abd2a3f480b30299c WHIRLPOOL eb8a8e871f64896722e9a3b4d61b282300eb5db106036e484b7cf8e5e2b7e7f13ed6bd99be86ee20b06bc91967a1c7575fb66e2fb594f18c300c7a3f65769af4
+AUX reconfig-3 596 SHA256 6f281643ef1b4744b488686815f6b5b5511ab8848497d9340594ad96c5ecbd44 SHA512 e5ba00170981542d8cc5ac134d26a7ffecebb6a8f2e9518c0f7788c473c7dde80ecc3d5ee672d09d8355d83a268c1bc906da18a8ff4a7c8537ef8b4b70602fa7 WHIRLPOOL 21494a8b23107b234a09a141a83804867b79255c0d2b0c6a123c941dad171b0dc492f64f5918d9b46c9d328f69724324d367aed20660a8233e75aed709920d58
+DIST moin-1.8.8.tar.gz 6704374 SHA256 8ec59fe808747c3442017dcda098b0bfd40e90020e26aabd654cbc52ec85fbca
+DIST moin-1.9.4.tar.gz 36718571 SHA256 a11502c31ce617a51d2f96be0d71a5fb3e7736c748ddd957aacfc23f9babe395 SHA512 5b0a38c52851f35ca4a8dc321a0196ba62ad791295b03e765993a00f7191e4f7af243f2256b704a481209d012aed42b4324c5dc43e45eae98d0c66a559247f77 WHIRLPOOL d4deda07f50e1a2bf531f8c8c4a07f09b5578131ae24993817754355a6d74a0463e68c406bb37d49a55121509a0d3db3db43d555af04156544a83637f2954cb1
+EBUILD moinmoin-1.8.8.ebuild 1813 SHA256 dcb15823eadf539d516c208bb39f397e01f46b67e57152f213d9f5a4da7f347e SHA512 4148eb5996514aa08257fac918078dabc108295d7b467f2edd09a6ccdb67e3a959498e668da88bfd9d63656fc3e5c3510d3be5cb724927eb254c61a5fb7a6b99 WHIRLPOOL 8ad5ea936d4809b24ffdbb3f8d9e8569491cad4336b5f78e300709763418fb55639250b62d995edeaa908d2704872a6605f2e31624040d002eddda5238deae98
+EBUILD moinmoin-1.9.4.ebuild 2467 SHA256 2e204284082def053e2a11e9a699c9797f4adfedce230cfdd51f6974152a2169 SHA512 2fae61b8ee22237e9ce92571e6aa2299bd251e5d2fd82fa7c42418d2ffa499ebe0cb210ab8171e47d5f82439e402f4e8d6622b6a83774a1699ea1758a2b1b5af WHIRLPOOL 96dd0c88984c830b240deeeb2eed543f8b1dede4e8a9481baa585e4f193879823b58ff3d729142fa414f72e74cd95bea962686e9a2119cff532264757122e5f6
+MISC ChangeLog 11569 SHA256 020828e36bd345dd6d5f8a21c02c09730e6fcd2a30a0c214326ebb13fe770278 SHA512 3ad015c249e96f5986ff412f919e61f26478de988de658c4518a7fa30017a62feca0b45f845de98eb612511638476f61cc22e42a63f7bd76e0e5e77386fb75ff WHIRLPOOL b825a5f64df2f2932c7459c20fea47666b54d41d5124b31b78f955cbd5ee536c9b1a3e758c124bc08e8ca8a1b15682a44418f06b0c9b98f7d6a0c87cae105685
+MISC metadata.xml 225 SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 SHA512 e67b4fd44c15753127e812b6997821b845a37410131a0bb2e492a0bf7efcb19baaeba356ac138ed986b124af2900c3cabf12ff96285560f931480bb691953c1d WHIRLPOOL da350b519be3dcdbcfc19ca3bba70001548ab34b76c1649e5fba2c4ba84f2cc0b2e02d7f3624ef66657e1d60e1097fea536b7a19a313d5ef76a807324f6fd68e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNry/zAAoJEEqz6FtPBkyjLv8H/iX8huODb9siWLhno69l2Qfb
-R4kYrwyYscGj69MLnfJQ0odSXRC7bZ4MWZyA2q4ZB5stX6Pz/zCwAaTNfot89SHP
-LTPVrFVpIWujdoP1rjim6aH9vQJI0RhHwRqcIw/G8AJi9zMNONWQXP+XSqm4D2Lc
-Ly3rQRzkU5QCjLlJXKZ/Bw+f0RZBcuYJzN6//v8ejYDP62YJmnRETzvHclOGplau
-bzYVZA7LkQcC8jIJsy/eloArCLBTcJpauT7L3ww18Nb4vITP0Zi0XiJvZgi7Wmq0
-BekdxhPCaKcHe5DsfoF6tSf0M4bFDmWFFxy2mJ96s+LvJV8L+3lREZzSbGcg8Xc=
-=GBAI
+iQEcBAEBCAAGBQJQRqL8AAoJEEqz6FtPBkyjYbgH/3mUFWe3kqkjPi/EFAq9hxRl
+j2tePJ9aTx8ViiP9Xy06L3ocyxPzfduNUmSVDOdVD0TKVaJgemBZMkCFCAqYf3TV
+SFylRxJKv/TTiC7R+KrC0V7AsXe+ZhH8JF4MBZIdn5oDTo5Q1U82IPCIb0mZcw2v
+9mDkPMQXkHPQH0a01x9yUCWXNXfBpxv9lqRBF4l41Y/sX4csbM8exJ28Kd61AObi
+hfhUsrKsvusv2/Bu4pHpTCHHHssjCeCNjB3u/mOIv1EpNZmN/vk6soWktl9Wqd2d
+wP3z8LKqP0WPqF8v5yrDXV++Wsh672TQwxh6rXg8Lzvtx4mX6eGnxSvT3khQL3c=
+=xV/s
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/files/postinstall-en-1.9.4.txt b/www-apps/moinmoin/files/postinstall-en-1.9.4.txt
new file mode 100644
index 000000000000..6a6baf764ead
--- /dev/null
+++ b/www-apps/moinmoin/files/postinstall-en-1.9.4.txt
@@ -0,0 +1,16 @@
+Now please read the installation manual at
+/usr/share/doc/${PF}/html
+
+MoinMoin can work with a variety of webservers. Simple Apache instructions
+are given below:
+
+1. ExecCGI needs to be enabled in your Moinmoin directory by doing:
+# echo "Options ExecCGI" > ${MY_INSTALLDIR}/.htaccess
+# echo "AddHandler cgi-script .cgi" >> ${MY_INSTALLDIR}/.htaccess
+
+2. Add the following lines to your Apache configs:
+ScriptAlias /mywiki "${MY_INSTALLDIR}/moin.cgi"
+
+3. Restart Apache
+
+4. Go to http://${VHOST_HOSTNAME}/mywiki/ and follow the instructions there.
diff --git a/www-apps/moinmoin/files/reconfig-1.9.4 b/www-apps/moinmoin/files/reconfig-1.9.4
new file mode 100644
index 000000000000..698da419fdb5
--- /dev/null
+++ b/www-apps/moinmoin/files/reconfig-1.9.4
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed -e "s|^#\(.*\)/path/to/wikiconfigdir|\1${VHOST_ROOT}/${PN}-${PVR}|g" -i ${MY_INSTALLDIR}/moin.cgi || die "sed failed"
+	sed -e "s|#url_prefix_static|url_prefix_static|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
+	sed -e "s|//|/|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
+
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/www-apps/moinmoin/moinmoin-1.9.4.ebuild b/www-apps/moinmoin/moinmoin-1.9.4.ebuild
new file mode 100644
index 000000000000..c0b8cd51651d
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.9.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.9.4.ebuild,v 1.1 2012/09/05 00:55:15 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.5"
+PYTHON_MODNAME="MoinMoin"
+
+inherit distutils webapp
+
+MY_PN="moin"
+
+DESCRIPTION="Python WikiClone"
+HOMEPAGE="http://moinmo.in/"
+SRC_URI="http://static.moinmo.in/files/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/docutils-0.4
+	>=dev-python/flup-1.0.2
+	>=dev-python/pygments-1.1.1
+	>=dev-python/werkzeug-0.7.0"
+
+need_httpd_cgi
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	if has_version "<www-apps/moinmoin-1.9" ; then
+		ewarn
+		ewarn "You already have a version of moinmoin prior to 1.9 installed."
+		ewarn "moinmoin-1.9 has a very different configuration than 1.8 (among"
+		ewarn "other changes, static content is no longer installed under the"
+		ewarn "htdocs directory)."
+		ewarn
+		ewarn "Please read http://moinmo.in/MoinMoinRelease1.9 and"
+		ewarn "README.migration in /usr/share/doc/${PF}"
+		ewarn
+	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	# remove bundled -- parsedatetime and xappy not packaged yet
+	rm -r MoinMoin/support/{pygments,werkzeug,flup} || die
+	sed -i "/\(flup\|pygments\|werkzeug\)/d" setup.py || die
+}
+
+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 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-${PV}
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-${PV}.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
+}