Remove old.

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

6 files changed, 13 insertions, 237 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index fa1aa12816f8..0d30d79e31a4 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/moinmoin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.84 2012/09/27 06:51:37 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.85 2012/11/30 09:37:47 radhermit Exp $
+
+  30 Nov 2012; Tim Harder <radhermit@gentoo.org> -moinmoin-1.8.8.ebuild,
+  -moinmoin-1.9.4.ebuild, -files/reconfig-3, -files/postinstall-en.txt:
+  Remove old.
 
   27 Sep 2012; Andreas Schuerch <nativemad@gentoo.org> moinmoin-1.9.5.ebuild:
   x86 stable, see bug 433898
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index e95b9ff2db75..28dbf7452a0e 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA256
 
 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
 DIST moin-1.9.5.tar.gz 36740561 SHA256 74e1d1420723aaf202f46082540524987f47c40a444f8444d58d57c66324811c SHA512 bc60199082f4c5363e9d491a040bca703762c479b546a6423a4316ecee75f164b8c81b5182db1f3536d19516e4efb9a798a8b50883c0c9cbb403aeb10404a84f WHIRLPOOL 2dc3a26d80525fccdf2193cb4295c7f6d96b4fba546f6906d9bcb17de51a7f265a59cd0724974c84cfd5467f4f91f3891e21c0147c53beb9c8536b3cb928fe20
-EBUILD moinmoin-1.8.8.ebuild 1805 SHA256 f29e68b399156fe723778c701b0a8e47f553ebf214468c8513b919900d58c1c4 SHA512 316291a23af8243a2c5be624ed8c7e375a561e8cf59fce7c53ed6e00309df869e030e52bfcfceefd42098850e1132314f9e545815704249bf2f35df32451c10f WHIRLPOOL f9ed2cb78a8d013b9532abdc89180483f4ed2a0f4a5c99377991f4bdc74314eaa051d9b28beebdccb8ab4679e49210e528f3c82371c3ca2996d3f6f3704241bb
-EBUILD moinmoin-1.9.4.ebuild 2496 SHA256 e01172581d0eacbe514a4089051531f929c5c6919b67214f887e9ae3a9a1aeda SHA512 aeede462573665d00ed39f0191483550e3a3a8bb2d3fc8b969d634f377fcec35be3bf834d02da3e00715a3e1dad3427f9cefe15dd0026e76640b98b2a361694e WHIRLPOOL a83abce5bb36f4a844c6e615636b6bbc0d4a69c2bdf0b85312f719912ab615999dc499db1154022b1012fccc120605ce0ed262285e23d6c90c1c48d63beb46fa
 EBUILD moinmoin-1.9.5.ebuild 2496 SHA256 2fba1867d01391bea94809be047fb9218111ada68f3829290f6c338c885d1eaa SHA512 90391a5768c142461bd51a088bd131c786ee71b637b9e70afad4cc5005361c0b0291b156c5eb532e20438dca0f4dcc2375fa58378f1491927fa5d6a1b2900de5 WHIRLPOOL 1670d7c02694d16600598a2ecb0c4b92f4fd808434d0942c10fec9d65027b23e51a8e6f90e1ef8d7900586c6d1fd9434768eb87ec51826ca330396f639c86e10
-MISC ChangeLog 12762 SHA256 a4110c6bdfb23450d61ad2cdcfaf2a9635485885be822ba974e4ff722eb17358 SHA512 853d431967e1a05123ce8b62b9c284c7a0000b1720aeb0581a88736363a9c657539543b410839c0e6b042d6417a96f5738b0ec656146f4dd65a9a41eea9ed613 WHIRLPOOL a030cd1f8ac2b492c2429cc0acb430ca500196c431c94dbe384a6def9cdf3af1f1e2ef8484f3d3d27b49503091cb7db817fef88684452a9e53680f637a554ef0
+MISC ChangeLog 12922 SHA256 5a3fcb541a60acc22109d62288c442deaa5caf3addb61de55852f4e95ad6d15e SHA512 8f3a53b68a0c64c3917ae2eb50596366d70532dabd073ec0a8bc7f5f467286d948a13e1199de7f86ed22fb0db2e5f4a2cd5df0888126d00f97c5bdda2ff8fca5 WHIRLPOOL 3d27dd381ee74a0742b943c1921f6c1cc9dbaefb3e78602e936966594cf3df373b0f3ad6e739afa3fbc7ad6c785d4d14b8191a43b6566c13f4acaa0b118f2b13
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBj9igACgkQakKUmsHeVLJJBQCfdUfjt7CdSb1GS03xflLU7Xj0
-MzUAnRty+5ObjthHETT3/FqePqXDt91n
-=R/bm
+iQEcBAEBCAAGBQJQuH5yAAoJEEqz6FtPBkyjrZ0IAKQbLe3jAFzoSIGgNWbOlHhN
+Ng63ts+cWm265aJEvsqEuhO7DLJ8TTJuUtVkEr3ylDf3+gfwHqU6x39GjJO61YcO
+juglQsr8+7U5vCnfTyQnVOC7pSQKEY07BdMaqFDfudTyJvXVK8Fs6F+l/ougG05s
+O2kIHwPt1E+wEUbPCbaAXA2rSR3mGuhZWlhlwxITqWwBnBvGoj9Y1MMJcR3lvJSQ
+OINGwSAF1TjUTifNmzMHyANlp5/mTa4exOGnYa4nNiyO+fCb8GiQptZuDXq5uxSc
+bJDhQnLjrCfbNYZbR1c/heOwZRhrsqQZnXqbP/q0QBCwUiQAlOB1G6culUYqlDo=
+=ob2X
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/files/postinstall-en.txt b/www-apps/moinmoin/files/postinstall-en.txt
deleted file mode 100644
index b4f5381a5514..000000000000
--- a/www-apps/moinmoin/files/postinstall-en.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Now please read the installation manual at
-http://master18.moinmo.in/HelpOnInstalling
-
-MoinMoin can work with a variety of webservers. Simple Apache instructions
-are given below:
-
-1. ExecCGI needs to be enabled in your Moinmoin directory. You can do this by
-simply
-# echo "Options ExecCGI" > ${MY_INSTALLDIR}/.htaccess
-# echo "AddHandler cgi-script .cgi" >> ${MY_INSTALLDIR}/.htaccess
-
-2. Add the following lines to your Apache configs:
-Alias /wiki "${MY_INSTALLDIR}"
-ScriptAlias /mymoin "${MY_INSTALLDIR}/moin.cgi"
-
-3. If you are running >=net-www/apache-2.0.52-r2, then you also need to turn
-on .htaccess.  Look for the <Directory "/var/www/localhost/htdocs/"> stanza 
-in httpd.conf, and change "AllowOverride None" to "AllowOverride All".
-
-4. Restart Apache
-
-5. Go to http://${VHOST_HOSTNAME}/mymoin
diff --git a/www-apps/moinmoin/files/reconfig-3 b/www-apps/moinmoin/files/reconfig-3
deleted file mode 100644
index c237fd0b5b07..000000000000
--- a/www-apps/moinmoin/files/reconfig-3
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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|\./data/|${VHOST_ROOT}/${PN}-${PVR}/data|
-			s|\./underlay/|${VHOST_ROOT}/${PN}-${PVR}/underlay|
-			s|moin_static171|${VHOST_APPDIR}|
-			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.8.8.ebuild b/www-apps/moinmoin/moinmoin-1.8.8.ebuild
deleted file mode 100644
index 9522a7965b7a..000000000000
--- a/www-apps/moinmoin/moinmoin-1.8.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.8.8.ebuild,v 1.9 2012/09/09 11:22:16 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2::2.6"
-
-inherit distutils webapp
-
-MY_PN="moin"
-
-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 ~arm ppc 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}
-
-PYTHON_MODNAME="MoinMoin"
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	webapp_pkg_setup
-}
-
-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
-}
diff --git a/www-apps/moinmoin/moinmoin-1.9.4.ebuild b/www-apps/moinmoin/moinmoin-1.9.4.ebuild
deleted file mode 100644
index 932d7dd9502d..000000000000
--- a/www-apps/moinmoin/moinmoin-1.9.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.6 2012/09/22 02:10:23 blueness Exp $
-
-EAPI="4"
-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-${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
-}