Remove old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 14 insertions, 221 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index 343595648571..cd70acc18a46 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.97 2013/12/24 12:54:20 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.98 2014/01/26 13:54:22 radhermit Exp $
+
+  26 Jan 2014; Tim Harder <radhermit@gentoo.org> -moinmoin-1.9.6.ebuild,
+  -moinmoin-1.9.7.ebuild:
+  Remove old.
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> moinmoin-1.9.7-r1.ebuild:
   Stable for x86, wrt bug #494464
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 4e950d46bd3d..4cfd548b8660 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -3,27 +3,18 @@ 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
 EBUILD moinmoin-1.9.7-r1.ebuild 2755 SHA256 e8638cd12e4ee8b4c8daf3c88d5c8ec5696f1b08ea776a0bc9875a345640dcc2 SHA512 76a0ef308d531adf19a39ab8916b8d02eb32597537ea7482983687f2fd11ab56dce2b853c8c4e10314d2eff6a2ca010f60872af33027b4f9aeba4d53487c9e95 WHIRLPOOL eeccc0bcd456ab8d514ffd07089a409037945df767c4596a5b117468907c6e22c979ee75ae87bbb91ec10cad4187970c00bdf3eeb2d878a32c0b6e9150f1eeac
-EBUILD moinmoin-1.9.7.ebuild 2532 SHA256 af141d8808d19bc76f6e280a36ddd3a4feb559d6ac7893d9037cc7cf00ca9b9f SHA512 37abc83d7343f09c6944446e3bca21beba2f2b3bcb611e234ab811f5c719651ed6a5765609c259a753273b4e74fe24d280f023184167aa03c25c208bcbfa7e33 WHIRLPOOL aa226d421198dde2c0cb2ed1e14b3bae3e36899ced2a03c4bbb090ad6575ec1d3a8fdddaeabc4718a88ca1c54349deb18795b9a55bdc53f76ac216c2bc02928c
-MISC ChangeLog 14365 SHA256 1132184ca3a15669a679b791ecb8ac13186089eba98e6e59140d801336220662 SHA512 a8bda61319fafb6f2745d3664cf30192ba080aa12c50865b236492111531da551b6dbc651c9d01098a22d6fe22b6259065c8403934cc0f1694824e25790273dd WHIRLPOOL b54b49bbdcf080fdae583cae770ef11ac887ad024320c31c090ca74528306d53eb405b531942f6d670b5dfc802d8edcc88dc79bfdc029ee98a93b74b0aed03cc
+MISC ChangeLog 14485 SHA256 62cf5524a399b1ef8dfa9bc3e1847eb5ef1262c5a509f6813bc59391a9b0cf7a SHA512 c9c996f90d83a172f8a05f476cca5b80cedbdd1aaea367d71bd586877a75b9e5b802e7ab536cf08acc11c703f334b328bc64bc3e8145773867944520077768d6 WHIRLPOOL b3463a57841fba0eb222ea3712b8f7b0f84d478afbe008370c916b6feeb334c66bc70b969f67e941bc5f8494e4089ef2bd32f250a0057938b7deb9a05238c0fe
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYP+AAoJELp701BxlEWfGrAQAJIuPwegUNKkVKugXGxP750L
-7tkSv5zSXqz22wbV2vkNnAQCbfzn6FOmoTZnf5C8RWyFtE3O+sJOEfcMtonV+epF
-XVL2chsGhK+ssXSmUlunzSPEwbxEioqDRw8aqVsjrwtGXG9Ncqu8MfbgLMC0OEVm
-qc/7/9BqTo532YCyKM8OicMVTfymmORTKBezxS28q6985MCERxYOs2UvB1vwRgpU
-r6XixbdCJul8LdV5AotqL4RvaHuAltrRmOlx2Ih6oO8Yro/EOH5JT4F7F2CoaURj
-6Z/29dfHYxV7qdNObc+zRvShg7tTENz57lJCtmnJNgbVSnvdqmGKofFO0HgTrCns
-5Jimw1caT75avrQSx0w1jBaN8SyX8rinwv2oPs5uamduz8lRx56BWnYYB802tSh7
-JSxKrhYWFigCuSEbfNJbzJj10bmICaOuvoTGkLZSjUMfzcpdVBMFuNrgy1zunZGm
-J09/LZDyD+7iIQETjR0vOq3s42ZuMTdqQNkB4NidPf76VIpP6DoVckqswLZ6Icm1
-677Z2KiWyrOjRQnMaf45N/ybPrcBWZ/K/uWDuOIkJ3xN8i4yq+rXUHZ8A1+Wk9nH
-B7R6rGlbPer2W5HTjyN6O9IN8OLlgwIQ+86Zm059T0RqzGR9suwAXeMJKE0yfsSD
-+xeSFVAGxHwl3ye+Gudn
-=q7oX
+iQEcBAEBCAAGBQJS5ROPAAoJEEqz6FtPBkyjloYH/iHnBChMoXDXAFK61nBuzvS8
+6GnjfMGzpMr+VVEhwGaE/2hv8MljRgSl3PV5YGMdiDSxi5nj5UviwgI/rN9AZfhj
+SnK8Jd5wKJcKZMOwj9sKr+EFc5U1gG1QTCqUpYu9aC0zKdFbC5YE5mRD6/QXPU3m
+dpEoBS1b364RkymPWkAFHPYLsrwrMfNfIGp/oIpTK34YDR2FHL0O3GH4n+E3273y
+3XJFjpEeBFyw+kx8/vaZWx4etXo04GYV7TU2CmMqAClqQKwC28lj+oLTkEkKKJYQ
++/mlWZv5954W27DslyBQAymyLa5+Bbot7PV/65kYDfmkkyOiuTavHSRzknMpNJA=
+=ekRF
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/moinmoin-1.9.6.ebuild b/www-apps/moinmoin/moinmoin-1.9.6.ebuild
deleted file mode 100644
index 3be53c4bc7b5..000000000000
--- a/www-apps/moinmoin/moinmoin-1.9.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.6.ebuild,v 1.4 2013/01/04 12:54:20 ago Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-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 ~arm ppc 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-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
-}
diff --git a/www-apps/moinmoin/moinmoin-1.9.7.ebuild b/www-apps/moinmoin/moinmoin-1.9.7.ebuild
deleted file mode 100644
index 3442b1a9c10e..000000000000
--- a/www-apps/moinmoin/moinmoin-1.9.7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.3 2013/06/17 02:41:49 patrick Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{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=">=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
-}
-
-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
-}