Revbump to fix shebangs (bug #466390).

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

3 files changed, 123 insertions, 9 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index 9710655785a8..c4e23f725c08 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.92 2013/04/18 05:09:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.93 2013/04/21 21:08:23 radhermit Exp $
+
+*moinmoin-1.9.7-r1 (21 Apr 2013)
+
+  21 Apr 2013; Tim Harder <radhermit@gentoo.org> +moinmoin-1.9.7-r1.ebuild:
+  Revbump to fix shebangs (bug #466390).
 
   18 Apr 2013; Tim Harder <radhermit@gentoo.org> moinmoin-1.9.7.ebuild:
   Update werkzeug dep since a version uses distutils-r1 now.
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 584dfdd3334b..e861e3daf10a 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -6,17 +6,18 @@ AUX reconfig-1.9.4 457 SHA256 d23601f95da8a9abc02a439b5b3f257dda31ff8f20f1e42b44
 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
+EBUILD moinmoin-1.9.7-r1.ebuild 2768 SHA256 e041a1d9a899925a661ae82cf0bb9f7473b748edff1b1b7696a382608c30af7c SHA512 8e2895ba00bb3d97053fa5ec49526e61251609ed944ab34924e40350ca54148b1df9d86cfeb3cf08edc12d2ec746940f25a7b61799c218c604fd8f78d992ccdf WHIRLPOOL 60c508bd3b21b764289e32eebebb4f10469d8c17a7620f0744deb4aef362c528f5a68d62da7914966c89877634c33083fab6ef8a25590faca9d76705dee89317
 EBUILD moinmoin-1.9.7.ebuild 2538 SHA256 6f9c5f837a07fc45a3380136fb709669d5ea524746506cfe6484b250d9a812e1 SHA512 32d56894b369ca6386b2ce30481aee9644d27f7618d0f899a5ba5796fdb8f66fdc12d385fbd086f8754e189a540955ade26a2b9a932da31e88f39aa5215dcfdd WHIRLPOOL fecf7fe591760678ca3ce7dc149214020a7091a4cb56e5f17a87ddd210344d8e3c422035ad9fdfd6669153b1246347dd8e3721dbac85245cbd0e53784d7e4000
-MISC ChangeLog 13752 SHA256 04095f1f6476095ea8311a2ebcdce5a2425e8b4df55abf8b7abd92c570122ddd SHA512 9dae6cdd17d43c6981d8e628b04c6997263b6c5d4b3555108dc5a6dd0d8438197c6e751d716051d9fd67406ee7c0c108f948b7cbff77963138eea337610588bb WHIRLPOOL 4d240dd3cfd20cbbde3006b4176acfa6b278770fa98b0629fd50419f14cd12f6be143c6de3797a26b79144e84893eac14a21e1b2188127d6e07ef540d0c6970b
+MISC ChangeLog 13904 SHA256 ed040773bf85e02afa7cc5fc8ceee3c40203391c96bff70765c0898f4630e9b8 SHA512 79872f6976555052dd4c6dca91f6849dc5f4cd823caa9b5f93bde812afd85823b0c7f63534f8702a40418583deb0dd2b669cbad771c22aa5a591ef335de320cd WHIRLPOOL 12fa72f77d4b679f11550b312014523e843c9d8db93218181e6ea70658c7c3c82677888b1e1bb6b83f5816792c7623f53404870a9eebb27722f96f1335b1213f
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRb4AHAAoJEEqz6FtPBkyjRJYIALkYMGbd4uql/D7clRwx22BI
-U89LbefgusqyUA3hGuOYW2qFFDUp3bjlXne+sitU3cTRbv30H7BbYuMDpTZLzHpT
-0ruTEdDxGqWH3o46pXzc32iYo9Qd7hFEuHx8eYM3QEIRld0yJqE1JSR5nsIR6g7n
-3f+qSaBiL4qEEI+Cp0ArlzTx1mRWmceXKSSCaSBI5MrT51mPA64tWH1PIt5V1+Qc
-u1a0l0eoeWjQOVYjFQwYpWJrfzOHZnJOxiD1ek4z/vjyqEafDiCi73aWvSh04U8j
-lt0EHXN+L3a79Yi+Tj8ZmK+VXxJoTC+oBz5Dyp7hTrsBo7Ik3QuyGtXydXcq5GQ=
-=EqtC
+iQEcBAEBCAAGBQJRdFVLAAoJEEqz6FtPBkyjLr0H/2L+TNY8VuIdVMVBjt9O1aRS
++3aS390MlwsNtJhnuMto/SAPH9rRdWoSkUa9d9IhNBVUFckG4VHVPrBpCiMKVca4
+xw8TbmCyJdIB1zKCKp9tySP/xZbVWoM9MHr4EiirotZhNeYteAPOndV4OGmRU92u
+Ja/nmOZ3Ti9ZcEaxCEu2j3pBUB7Q/wCOteUdv8SJSbSrG92qJgXz8hITSuTQU3vE
+FdOP2aBPkRUgo71Dqf6+FM3WrW+JYuTlNJtSr3P5gzAl496+xgGKK2can22kdoxl
+88MeqrRKheGibvpXhE6fWNSfEFFxYNqlgN0xwRhDCWIMxXYvCfyychuTNTQxLp0=
+=ftXU
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild b/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
new file mode 100644
index 000000000000..18ca1115a49f
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
@@ -0,0 +1,108 @@
+# 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-r1.ebuild,v 1.1 2013/04/21 21:08:23 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit eutils 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=">=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[${PYTHON_USEDEP}]"
+
+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
+	python-single-r1_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
+
+	# needed for python_fix_shebang
+	edos2unix MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/py/*.py
+
+	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
+
+	# bug 466390
+	python_fix_shebang "${D}"
+}
+
+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
+}