Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 6 insertions, 204 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/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
-}