Version bump; Fix homepage (bug #153106).

(Portage version: 2.1.2_pre1)
 (Signed Manifest commit)

5 files changed, 15 insertions, 155 deletions

diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index e4094f2217a8..3708e815002a 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -10,24 +10,19 @@ MD5 929e3e71ef7af009d9f289c33c382026 files/reconfig-2 421
 RMD160 5589dd4a8a87158bf88a99eda91695c7f938599c files/reconfig-2 421
 SHA256 e885eb6c78df793fe2954a35631f3b611429412e78761bde00587cc14df26657 files/reconfig-2 421
 DIST moin-1.3.5.tar.gz 3456657 RMD160 abe7d920c0414723440d3c2037f67a81aee52e85 SHA1 bf04d4abb1fe787ee4d443cd4ac1441662193b67 SHA256 97cbc329eb25ba5b52abd1e1037c23c44baaaec48bca0f01545b4a25c4d26bb4
-DIST moin-1.5.4.tar.gz 4329975 RMD160 18655332b6f19e8e28645fe5bb1c05cdcbdac728 SHA1 37a7b98d5565a3b65570870fcbe2b97a575a41a7 SHA256 f102ef0542e33c03b0837fc38fcd50392d5840d74a83fe6845fc0ea4a0362460
-DIST moin-1.5.5a.tar.gz 4404165 RMD160 0568cfc05c37c7778aba7b969f5e336a3b72f191 SHA1 258abfc6bbe45df4abab5b3b4254b2539d9aa7b2 SHA256 d9e9d1fdd0761d3e113fb5d21aebf5aeff86a5915771f901516ebe992134857e
+DIST moin-1.5.6.tar.gz 4407789 RMD160 bebf3b43f6e0864652ec58b2e196bd15b2cd518d SHA1 b51485a469ff0d50003eebe6fdbe61b2b9500fed SHA256 64b9885e1143d269855b8f65cb197fd6fc344bc972c1fe541de15d485c27d927
 EBUILD moinmoin-1.3.5-r1.ebuild 1772 RMD160 43d127ef48a21744b9c4e375adcff2fcdd2cf3e8 SHA1 a7b9458ae4dbf3cf27e8b4638582dfa79de7eede SHA256 1b6bce6361f5f075c249b0cb88b6ad56fd882240fe3ca5dac7e9ac76722e97ee
 MD5 bfd5f19427f3e4d02fedba9189068edb moinmoin-1.3.5-r1.ebuild 1772
 RMD160 43d127ef48a21744b9c4e375adcff2fcdd2cf3e8 moinmoin-1.3.5-r1.ebuild 1772
 SHA256 1b6bce6361f5f075c249b0cb88b6ad56fd882240fe3ca5dac7e9ac76722e97ee moinmoin-1.3.5-r1.ebuild 1772
-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
-EBUILD moinmoin-1.5.5a.ebuild 1810 RMD160 aea1a6ca6067c590aeb77f39a69cfe0730723d83 SHA1 d728392b536753d637b555656561a6397565603b SHA256 173ef635083ab13ab0cbbdc0123fe42e6f742df42bcccd3055d1dbea4c66fd0c
-MD5 fdfff0afac7e72d8b6a7d8b0b8bd058a moinmoin-1.5.5a.ebuild 1810
-RMD160 aea1a6ca6067c590aeb77f39a69cfe0730723d83 moinmoin-1.5.5a.ebuild 1810
-SHA256 173ef635083ab13ab0cbbdc0123fe42e6f742df42bcccd3055d1dbea4c66fd0c moinmoin-1.5.5a.ebuild 1810
-MISC ChangeLog 4788 RMD160 5397d837072b78fceaee644c3da0ab1d7114d0fe SHA1 1782311acbc106525666515c35558d1775f46ad6 SHA256 4863381d22164d746fde3bd9e62974c39481ba43b047c0d53c461c1feb747b5a
-MD5 78c894e56a936ad29a52dfab67a32b99 ChangeLog 4788
-RMD160 5397d837072b78fceaee644c3da0ab1d7114d0fe ChangeLog 4788
-SHA256 4863381d22164d746fde3bd9e62974c39481ba43b047c0d53c461c1feb747b5a ChangeLog 4788
+EBUILD moinmoin-1.5.6.ebuild 1812 RMD160 15ec548d45bc005187746a0fe260a70518b927ec SHA1 5a406fede2ad15d29e69801610837e8b112b3208 SHA256 33aa8ec2c0be9505984feb2a231f261cadeae971f503633b424ad363bfe12320
+MD5 0ca201d62910e178fe674b99176a3918 moinmoin-1.5.6.ebuild 1812
+RMD160 15ec548d45bc005187746a0fe260a70518b927ec moinmoin-1.5.6.ebuild 1812
+SHA256 33aa8ec2c0be9505984feb2a231f261cadeae971f503633b424ad363bfe12320 moinmoin-1.5.6.ebuild 1812
+MISC ChangeLog 4985 RMD160 14d0dd00d538df7c3e7007f152b82fd27d029bd6 SHA1 3feec21062c171e38f7a7a7031a6ea2e9ff2eba4 SHA256 4a64092c481e3def84e75d34664bb37e64bb615676f3ca8baabd33ed27813621
+MD5 6ccbc6934c7724634df08e47a43993b3 ChangeLog 4985
+RMD160 14d0dd00d538df7c3e7007f152b82fd27d029bd6 ChangeLog 4985
+SHA256 4a64092c481e3def84e75d34664bb37e64bb615676f3ca8baabd33ed27813621 ChangeLog 4985
 MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 metadata.xml 225
@@ -35,16 +30,13 @@ SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 metadata
 MD5 28e9b58ef60141bb29d95ccfd0ca9bf2 files/digest-moinmoin-1.3.5-r1 235
 RMD160 b87346bd6e5789412b40b573972f320139d53f15 files/digest-moinmoin-1.3.5-r1 235
 SHA256 b83a10f6ffbafc2fa162157960722e7d9d7e49066e3ca6d1fe460f0db8111f92 files/digest-moinmoin-1.3.5-r1 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
-MD5 ee88d2dfada9c97e58b469b5dbf2f16a files/digest-moinmoin-1.5.5a 238
-RMD160 a35a8b284d65d2a81b20d23b99201ee270cba3f5 files/digest-moinmoin-1.5.5a 238
-SHA256 1e14fcd1fdc4214639201fdaf9accfa4a1f42eab8e485fdcfe0bb13bb4fa8bb6 files/digest-moinmoin-1.5.5a 238
+MD5 6401ad3efd0180dff4c39f75a159a516 files/digest-moinmoin-1.5.6 235
+RMD160 4dc3e89946c1b0d7e3757207e5288197b055d9a3 files/digest-moinmoin-1.5.6 235
+SHA256 2f9dd52a5f136c7c8bf419e369cfef3fa08ede2c5f09a341a916d9d06873bfb6 files/digest-moinmoin-1.5.6 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD4DBQFFEyk3EzitwsaoONoRAqy8AJdZPHgAzTxBh9Tmdg4LqW+md+EoAJ4mnwJ7
-lFagiCz9zM2gNPS6CBlt6Q==
-=XrJy
+iD8DBQFFRJgaEzitwsaoONoRAoAmAJ0Raw1eEunERTrUDXYSXFfJYd8sTACggRrO
+ZqN3fv+CkQOLI6Id9K8t92Y=
+=VL3i
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/files/digest-moinmoin-1.5.4 b/www-apps/moinmoin/files/digest-moinmoin-1.5.4
deleted file mode 100644
index 5d5004fe13e8..000000000000
--- a/www-apps/moinmoin/files/digest-moinmoin-1.5.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dcb85c72126c2fe39de66ef781a7dd39 moin-1.5.4.tar.gz 4329975
-RMD160 18655332b6f19e8e28645fe5bb1c05cdcbdac728 moin-1.5.4.tar.gz 4329975
-SHA256 f102ef0542e33c03b0837fc38fcd50392d5840d74a83fe6845fc0ea4a0362460 moin-1.5.4.tar.gz 4329975
diff --git a/www-apps/moinmoin/files/digest-moinmoin-1.5.5a b/www-apps/moinmoin/files/digest-moinmoin-1.5.5a
deleted file mode 100644
index a6a25d5b0b01..000000000000
--- a/www-apps/moinmoin/files/digest-moinmoin-1.5.5a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 90d4ae4df700dd1dfb4afbcaae9c9e52 moin-1.5.5a.tar.gz 4404165
-RMD160 0568cfc05c37c7778aba7b969f5e336a3b72f191 moin-1.5.5a.tar.gz 4404165
-SHA256 d9e9d1fdd0761d3e113fb5d21aebf5aeff86a5915771f901516ebe992134857e moin-1.5.5a.tar.gz 4404165
diff --git a/www-apps/moinmoin/moinmoin-1.5.4.ebuild b/www-apps/moinmoin/moinmoin-1.5.4.ebuild
deleted file mode 100644
index 7b48753b18eb..000000000000
--- a/www-apps/moinmoin/moinmoin-1.5.4.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.4.ebuild,v 1.1 2006/07/02 00:59:07 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
-}
diff --git a/www-apps/moinmoin/moinmoin-1.5.5a.ebuild b/www-apps/moinmoin/moinmoin-1.5.5a.ebuild
deleted file mode 100644
index 9a068c3ca8c6..000000000000
--- a/www-apps/moinmoin/moinmoin-1.5.5a.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.5a.ebuild,v 1.1 2006/09/22 00:07:09 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
-}