Version bump, migrate to distutils-r1.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 117 insertions, 9 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index a517db92ccfe..62dc6c0ae349 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/moinmoin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.90 2013/01/05 05:10:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.91 2013/03/17 23:52:20 radhermit Exp $
+
+*moinmoin-1.9.7 (17 Mar 2013)
+
+  17 Mar 2013; Tim Harder <radhermit@gentoo.org> +moinmoin-1.9.7.ebuild:
+  Version bump, migrate to distutils-r1.
 
   05 Jan 2013; Tim Harder <radhermit@gentoo.org> -moinmoin-1.9.5.ebuild:
   Remove old, insecure version.
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 0db67fb22c54..ed50fb777f42 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -4,17 +4,19 @@ Hash: SHA256
 AUX postinstall-en-1.9.4.txt 548 SHA256 ca92d8231b3bf6859e7d9ab4c6a605d12d3ee617eb244b8265f4c5e51857070c SHA512 a007244d5807ca89ad515f738cdcf739d3f4ba0a6c2ee35f05435856c4ccc9c993d44ed08a06b5d8555450b6b34013d3254628480900e515bb19ba80719a05ba WHIRLPOOL d6b0766b23f99bd32c4849be2d4aa2ae984363f1a6cf0a89becdc66d1bb942c9962efce68c22a47e127704628ddc07792481b06be5c5018c0c0d5814898de275
 AUX reconfig-1.9.4 457 SHA256 d23601f95da8a9abc02a439b5b3f257dda31ff8f20f1e42b4492fef461fe6e1e SHA512 c5b493354e44e0a81e540eb80469b6787e2b898dbb2737ea8b6a52c95e92ba79af78bb0fc67b406a23ef2ca5d3df9a88c7e89c688e2d139abd2a3f480b30299c WHIRLPOOL eb8a8e871f64896722e9a3b4d61b282300eb5db106036e484b7cf8e5e2b7e7f13ed6bd99be86ee20b06bc91967a1c7575fb66e2fb594f18c300c7a3f65769af4
 DIST moin-1.9.6.tar.gz 36754215 SHA256 816f0454808e8abdc44e9839ed08802bea78c174bdbd72b9644c72fce891f6f6 SHA512 295647b4edaedc582c7e3727eae1d443ec23c8511a70d7ffcb45875614cf69e523687340ad742d7eda9e191e65f1d34aeb629041071212ac0388e25eaaeb59fe WHIRLPOOL 569b048756da7356c6203e39c78ec5c8c8ecd3121e8c6bde4831498e855aed6e69fc9fe3e5a068cf4134678ef98984df35945c988c4a59a636111a2e5ed7e5f8
+DIST moin-1.9.7.tar.gz 36911772 SHA256 f4ba1b5c956bd96d2a61e27e68d297aa63d1afbc80d5740e139dcdf0affb4db5 SHA512 5cb6c205fb0c18b83fe7cee83bf88098bfbbc357c89004f8b7cf484bd7efd35af4ace78d0e80df71b01f70861e8bbb63aeefdd831768989d5b7f511ca24fb60c WHIRLPOOL 8f7919e1672a9a192249221864b1ac8cda47eb75e6f328485ef54ae45d344beeaac8070b281f7612f59795e359ad93bdf060e4930411ee7509ec77aa5396c30a
 EBUILD moinmoin-1.9.6.ebuild 2490 SHA256 7d0adb84600455fa15e50f4ac7e5740e6f10f544863af5ac691a5a81c24c7737 SHA512 2b25f1a3d14cf1088d8028bec38519a6273a6d919da4b585826a3c3fd91f817348588272fa85beca4fec54873da8096b0fbf200bb5373014b1ccaf7cd10cb8b2 WHIRLPOOL 400eee36f8522f6ea0ce0981ae1cec86451274619ad06040a8e5bb01b4b94f7838e44a43f63e0c1e53c31349861ff224fd9882839b1c0f62c40752c7dcfad035
-MISC ChangeLog 13472 SHA256 9cd356a3fca21ff711d6c9cdc4cc4e40193055beec3698295c654271c8013de7 SHA512 9fec38b98f811eb69851e97d802cfe5b8f27ed3efede6e61f60bb17d3b38ac538492f2a1f6e135f396d18e5c726eb546e89ccf0bdae37b348efe5e3bb04a231a WHIRLPOOL 45079cc120764fc98c404628c2e33e259fc9f3c95a9f14eac8544b400b7d2b0dac78faea95b079bec2987dc86042f8fb8f792906f1ad7f51bb749cb36b33737a
+EBUILD moinmoin-1.9.7.ebuild 2536 SHA256 b5d05c7b04656ffa3814fe06359a241087de736ba110440d8cbce16bdd95b5c0 SHA512 c2cb0509249b1ed5d1966edfa60e526845220b1b12bef14136035e02e2d7a6b1f50e4027338c3f5c09b89a7f723be2543274377505da2d87daead2c4396f0a43 WHIRLPOOL 6b165ea3357edc7a3c2a57808c2bbc0a5e15a9813f8b69731dddab809fb5862d71c3b912565f97fefe550f231f529eebcac402cabfbcbcb50938dbda7a46a8ff
+MISC ChangeLog 13618 SHA256 c344d59281d10e61ce131b3c62f421e9b3e251b3a5a0e0ad52683f8822654e72 SHA512 a3640a4ebda05a616ce0257d3327271748f1a063756ddea5b19b0a4726a9a2413e5f8a51a3f1d1054ebcb34833a9e9c58a62f83c9e881d280e0d3fadec4e0a70 WHIRLPOOL 1c4e1e21a14346974e2cc1e3385929804ec49cabb7bf6c154d7d559231a14a28ae84e684a547cda2bcbd71879fe1e859f58c346f947fe09a0a31759cfe32b5ab
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ57XBAAoJEEqz6FtPBkyjw/gH/3CHaYkQycrgR/zuZaBvlIG0
-MJhwxhc4DPBiuLzrIU8z46ocqsXJlM8KdGfjB3xudaZo/B37R31taM9CouDUIyoO
-Y+0oIbN8hM3peQzXvE1Lkaq5b4fyCgbqgDQsGLlDH8F65WJqqvl6Xa+JpTY+RoEE
-4SPUw7tsObNTI5j2jzx0paTo9+G6op74DxKBx6JqN8vEtakguYagsbFMyat1d3hk
-kc9HrYlMW5HM9iogQMdtrxyqkYkcHVrj8vtO/QMuuXrsPicjhy92YMs/d3sjZT8Y
-/p9zLXX1DxbhxD2siDZ/2nQJ9od/7cJ+AtqYZgVjO4yvkfIXEpGttQrIk/XH7as=
-=47HN
+iQEcBAEBCAAGBQJRRlc1AAoJEEqz6FtPBkyjW3UIAJUCHkFRrpl6Z3zw8CroUirq
+05Gg+enHIaeYRpEQeZPaaghKZaDmTblD6sVnewMp08Auhb78FSxjOdOdr6068klP
+P46MRRc0sFNOD41QFVQvQ+U0IEcs7x/z9wX2219pOQ4+r8Zl5JI7MIHaveaAnsxY
+hqQyqkKcUFoMpkElALAx1dBSFCaA78m+gYNeZnWqriILy9xGhffjzcrTrchq0JD1
+/bZ1nGnPGADYOE7slplisfeH6HAjCMhNXJK3uM9mTRs5Kq4cfVDZOe9GNFt9seDh
+PDPUvmJjys7iE0ijkJKMZFeXLonVsp+zRci09Akz5SzqarEzn8PfJLN8TXShlgY=
+=mlqk
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/moinmoin-1.9.7.ebuild b/www-apps/moinmoin/moinmoin-1.9.7.ebuild
new file mode 100644
index 000000000000..5e321d383d84
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.9.7.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.9.7.ebuild,v 1.1 2013/03/17 23:52:20 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 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 ~arm ~ppc ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/docutils-0.4[${PYTHON_USEDEP}]
+	>=dev-python/flup-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.1.1[${PYTHON_USEDEP}]
+	>=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
+
+	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
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_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-1.9.4
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-1.9.4.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
+}