Version bump

Package-Manager: portage-2.1

3 files changed, 23 insertions, 92 deletions

diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 2284f8fad98c..eca3c877bde7 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -1,53 +1,50 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX postinstall-en.txt 808 RMD160 3588cba97e7bd235f140da8bd919f52af26d85e1 SHA1 ca94a45143e3f9be652559580d258cb822dc52af SHA256 43e2ee06036c7582e5b0ad40ffd1b9afd96e6abb90a0e4208c6e53eae243571a size 808
+AUX postinstall-en.txt 808 RMD160 3588cba97e7bd235f140da8bd919f52af26d85e1 SHA1 ca94a45143e3f9be652559580d258cb822dc52af SHA256 43e2ee06036c7582e5b0ad40ffd1b9afd96e6abb90a0e4208c6e53eae243571a
 MD5 6fb347eae42824c20e1dac8cd73f0ce6 files/postinstall-en.txt 808
 RMD160 3588cba97e7bd235f140da8bd919f52af26d85e1 files/postinstall-en.txt 808
 SHA256 43e2ee06036c7582e5b0ad40ffd1b9afd96e6abb90a0e4208c6e53eae243571a files/postinstall-en.txt 808
-AUX reconfig-2 421 RMD160 5589dd4a8a87158bf88a99eda91695c7f938599c SHA1 b7d1df9ae27a6fa7ab3b55c53e4f8f382bb47775 SHA256 e885eb6c78df793fe2954a35631f3b611429412e78761bde00587cc14df26657 size 421
+AUX reconfig-2 421 RMD160 5589dd4a8a87158bf88a99eda91695c7f938599c SHA1 b7d1df9ae27a6fa7ab3b55c53e4f8f382bb47775 SHA256 e885eb6c78df793fe2954a35631f3b611429412e78761bde00587cc14df26657
 MD5 929e3e71ef7af009d9f289c33c382026 files/reconfig-2 421
 RMD160 5589dd4a8a87158bf88a99eda91695c7f938599c files/reconfig-2 421
 SHA256 e885eb6c78df793fe2954a35631f3b611429412e78761bde00587cc14df26657 files/reconfig-2 421
-DIST moin-1.2.3.tar.gz 1267566 size 1267566
-DIST moin-1.3.5.tar.gz 3456657 size 3456657
-DIST moin-1.5.3.tar.gz 4187091 RMD160 208d2409893532bae447e59b3f654befd4f95ade SHA256 57a2b779ac53f42d77ab5788d1274a8122a12763fe479fb1aa97de5861094e57 size 4187091
-EBUILD moinmoin-1.2.3.ebuild 1323 RMD160 73ef8b16c58499a693b092dcc762b159c97d4d7a SHA1 601be7b0cd36234478e893e620bf726aef548f58 SHA256 72242d0eac60bbd6d109c77bb08cb5241ec0452b33cbba18f81591b3ea28b821 size 1323
+DIST moin-1.2.3.tar.gz 1267566
+DIST moin-1.3.5.tar.gz 3456657
+DIST moin-1.5.4.tar.gz 4329975 RMD160 18655332b6f19e8e28645fe5bb1c05cdcbdac728 SHA1 37a7b98d5565a3b65570870fcbe2b97a575a41a7 SHA256 f102ef0542e33c03b0837fc38fcd50392d5840d74a83fe6845fc0ea4a0362460
+EBUILD moinmoin-1.2.3.ebuild 1323 RMD160 73ef8b16c58499a693b092dcc762b159c97d4d7a SHA1 601be7b0cd36234478e893e620bf726aef548f58 SHA256 72242d0eac60bbd6d109c77bb08cb5241ec0452b33cbba18f81591b3ea28b821
 MD5 1e73d40d888212699794efd23c42a5a5 moinmoin-1.2.3.ebuild 1323
 RMD160 73ef8b16c58499a693b092dcc762b159c97d4d7a moinmoin-1.2.3.ebuild 1323
 SHA256 72242d0eac60bbd6d109c77bb08cb5241ec0452b33cbba18f81591b3ea28b821 moinmoin-1.2.3.ebuild 1323
-EBUILD moinmoin-1.3.5-r1.ebuild 1773 RMD160 7087777fcc11dc3e14728226f7299c41bebcc179 SHA1 8877109f35d2cb832e3d8ee8254e973bf6f5c7ba SHA256 ebc4b39cadcf1c55e64eff06ffe0d41ba320569a062f0e47e737b70451bacdd5 size 1773
+EBUILD moinmoin-1.3.5-r1.ebuild 1773 RMD160 7087777fcc11dc3e14728226f7299c41bebcc179 SHA1 8877109f35d2cb832e3d8ee8254e973bf6f5c7ba SHA256 ebc4b39cadcf1c55e64eff06ffe0d41ba320569a062f0e47e737b70451bacdd5
 MD5 433cde73049ddc005366d7dc79ebc4bc moinmoin-1.3.5-r1.ebuild 1773
 RMD160 7087777fcc11dc3e14728226f7299c41bebcc179 moinmoin-1.3.5-r1.ebuild 1773
 SHA256 ebc4b39cadcf1c55e64eff06ffe0d41ba320569a062f0e47e737b70451bacdd5 moinmoin-1.3.5-r1.ebuild 1773
-EBUILD moinmoin-1.5.3.ebuild 1809 RMD160 55d31d089f42d523d8e61f6d5d712e2d74a018d4 SHA1 3034d5640fa7d71ca82a3fd009a7429a444f4ecd SHA256 27df60ac811bb6c3f189f6ed8b12ade4fc1c1550dccbddbc4fb2f766b217c7a3 size 1809
-MD5 d52fd5344e80e2f0922217ac3fb03ce6 moinmoin-1.5.3.ebuild 1809
-RMD160 55d31d089f42d523d8e61f6d5d712e2d74a018d4 moinmoin-1.5.3.ebuild 1809
-SHA256 27df60ac811bb6c3f189f6ed8b12ade4fc1c1550dccbddbc4fb2f766b217c7a3 moinmoin-1.5.3.ebuild 1809
-MISC ChangeLog 4125 RMD160 cbc31fd33de6b3366de6dd85428e48bccfcbd19e SHA1 8f3ba6f9d8d6b79867e5ad01a61cffc62f500c95 SHA256 a21b7eec9f4a8bc0cbcad459b08ff9a735740900595cbfb2381bddf3e844901c size 4125
-MD5 b869002762b708e037e1d49abc144da2 ChangeLog 4125
-RMD160 cbc31fd33de6b3366de6dd85428e48bccfcbd19e ChangeLog 4125
-SHA256 a21b7eec9f4a8bc0cbcad459b08ff9a735740900595cbfb2381bddf3e844901c ChangeLog 4125
-MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 size 225
+EBUILD moinmoin-1.5.4.ebuild 1809 RMD160 bf1a6927224459637d950e4a7fd61a1e855c4453 SHA1 89ece4338164574d50b497cdfcba8b1c123411be SHA256 d2878818a80b6013eec5d442093ea690710accfece40f52945cddc52dfe48c06
+MD5 3b92700d79d4070cbbad0fc4b3e16c4a moinmoin-1.5.4.ebuild 1809
+RMD160 bf1a6927224459637d950e4a7fd61a1e855c4453 moinmoin-1.5.4.ebuild 1809
+SHA256 d2878818a80b6013eec5d442093ea690710accfece40f52945cddc52dfe48c06 moinmoin-1.5.4.ebuild 1809
+MISC ChangeLog 4268 RMD160 13d6e12e4e61908f3390e181287cf8acc0fd3690 SHA1 2048ced886c2962574ad241b53380f7eb0e79cde SHA256 d34b88ec1bc189f77d7284fe61773beab3a5786991c6a0ad4fe98566580c0893
+MD5 e95a1ee94335938493706b412b46d645 ChangeLog 4268
+RMD160 13d6e12e4e61908f3390e181287cf8acc0fd3690 ChangeLog 4268
+SHA256 d34b88ec1bc189f77d7284fe61773beab3a5786991c6a0ad4fe98566580c0893 ChangeLog 4268
+MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 metadata.xml 225
 SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 metadata.xml 225
 MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3 63
 RMD160 9c3cd962c2c92a524eadb40ef53b9836f6cc9299 files/digest-moinmoin-1.2.3 63
 SHA256 d13974b744f57d849afaac21d478450ffda8508929e749bb1c0a22fa58a5bc72 files/digest-moinmoin-1.2.3 63
-size 63 files/digest-moinmoin-1.2.3 63
 MD5 4b756ef0b0c4eb10b5b2646ce792c0dc files/digest-moinmoin-1.3.5-r1 63
 RMD160 b04ee8356eb3dab88b5f03707091883afe2c7845 files/digest-moinmoin-1.3.5-r1 63
 SHA256 25d51c005f62beadae9a59de8e0349d9ea0cca9cdd2702a6b5b0081c03e958d2 files/digest-moinmoin-1.3.5-r1 63
-size 63 files/digest-moinmoin-1.3.5-r1 63
-MD5 801045fc41187d16ee41277227893ff3 files/digest-moinmoin-1.5.3 235
-RMD160 892b57d9f047bc47b997a632f3e699ceba4aa393 files/digest-moinmoin-1.5.3 235
-SHA256 56c5cd75e2260974d4117bdeaba8257ac28953f36927c2eacc5b04e5890d1a48 files/digest-moinmoin-1.5.3 235
-size 235 files/digest-moinmoin-1.5.3 235
+MD5 0f263a60bb5d69223c7d0cdb8783a9c6 files/digest-moinmoin-1.5.4 235
+RMD160 3db9ae9118aa6b95322a79a58d1199b8e35b8bf8 files/digest-moinmoin-1.5.4 235
+SHA256 ba0a93e738626e57972b2a4f8f3ced45a3f4f833550cd2997fb04baadb9dd1cd files/digest-moinmoin-1.5.4 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFES/FFEzitwsaoONoRAqWPAJ4scMO+2VP/R9Y4LjFN50560rRCawCfToDY
-LeI3n7DiWmGVHqZB90dyEvk=
-=8VTd
+iD8DBQFEpxpkEzitwsaoONoRAvNfAKDJGqCYbf7zyIG49YmpTQ29Foqy+QCfWtXr
+Q7Q0H1RV7yWxqczt4fbpLoQ=
+=Dt1W
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/files/digest-moinmoin-1.5.3 b/www-apps/moinmoin/files/digest-moinmoin-1.5.3
deleted file mode 100644
index c23e3a0a6d91..000000000000
--- a/www-apps/moinmoin/files/digest-moinmoin-1.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e95ec46ee8de9527a39793108de22f7d moin-1.5.3.tar.gz 4187091
-RMD160 208d2409893532bae447e59b3f654befd4f95ade moin-1.5.3.tar.gz 4187091
-SHA256 57a2b779ac53f42d77ab5788d1274a8122a12763fe479fb1aa97de5861094e57 moin-1.5.3.tar.gz 4187091
diff --git a/www-apps/moinmoin/moinmoin-1.5.3.ebuild b/www-apps/moinmoin/moinmoin-1.5.3.ebuild
deleted file mode 100644
index 7a20e2924aa0..000000000000
--- a/www-apps/moinmoin/moinmoin-1.5.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.5.3.ebuild,v 1.1 2006/04/23 21:27:24 rl03 Exp $
-
-inherit webapp
-
-MY_PN="moin"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Python WikiClone"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-HOMEPAGE="http://moin.sourceforge.net"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-LICENSE="GPL-2"
-IUSE="rss"
-
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-DEPEND=">=dev-lang/python-2.3"
-RDEPEND="${DEPEND}
-	>=dev-python/docutils-0.4
-	rss? ( >=dev-python/pyxml-0.8.4 )"
-
-src_compile() {
-	python setup.py build || die "python build failed"
-}
-
-src_install () {
-	webapp_src_preinst
-
-	python setup.py install --root=${D} --prefix=/usr install || die "python install failed"
-
-	dodoc ChangeLog README docs/CHANGES* docs/HACKS docs/README.migration
-	dohtml docs/INSTALL.html
-	dodir ${MY_HOSTROOTDIR}/${PF}
-
-	cd ${D}/usr/share/moin
-	cp -r htdocs/* server/moin.cgi ${D}/${MY_HTDOCSDIR}
-	chmod +x ${D}/${MY_HTDOCSDIR}/moin.cgi
-	cp -r data underlay config/wikiconfig.py ${D}/${MY_HOSTROOTDIR}/${PF}
-	cp -r config ${D}/${MY_HOSTROOTDIR}/${PF}/altconfigs
-	cp -r server ${D}/${MY_HOSTROOTDIR}/${PF}/altserver
-
-	# data needs to be serverowned 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-2
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from 1.3.x, please read"
-	ewarn "/usr/share/doc/${PF}/README.migration.gz"
-	ewarn "and http://moinmoin.wikiwikiweb.de/HelpOnUpdating"
-	webapp_pkg_postinst
-}