Version bump

(Portage version: 2.1.1_pre2-r6)
 (Signed Manifest commit)

3 files changed, 15 insertions, 108 deletions

diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index bb8013be5615..5a262dd0f261 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -14,26 +14,26 @@ MD5 b54ed2926e5754a14d265cfa477ebb8a files/reconfig 553
 RMD160 e80469e5b4b0e2538c597b96b0d905fce4aa6193 files/reconfig 553
 SHA256 9bff3cbfb8ecbfe396e6e61ddf189c24f4500c469e9c0e0a5961a4b5b3fce851 files/reconfig 553
 DIST TWiki-4.0.4.tgz 4251364 RMD160 6d920a781aec1826d51421514c34d97142a987ea SHA1 4064a0e237fe40f3863b9401162b92cac05cf0bf SHA256 ef4d436b769e4ef19a0433d187b5a4c328f62d1983fedb4a3530bd6dd1ee6eda
-DIST hotfix-4.0.4-2.tgz 162030 RMD160 e809464e90474be49d776dadc9d76ea7c2e06cff SHA1 0597702196607837246138600f929897fdc576ae SHA256 b577b6f79af0d61532ebfaf0d40093b8875910740c22d186b3fc85bc84a15f19
-EBUILD twiki-4.0.4-r1.ebuild 2277 RMD160 4e1f88355890564e01c60132ee6de389c88ca364 SHA1 eebd6d244bb2cc2710251ee93973cfce2555bc86 SHA256 fb6dd06053fe8aa511a691735453631dce12b1f49fe0d995c4b5a1777eb20a07
-MD5 d65d4bea227fb23a6e34f26a740221dd twiki-4.0.4-r1.ebuild 2277
-RMD160 4e1f88355890564e01c60132ee6de389c88ca364 twiki-4.0.4-r1.ebuild 2277
-SHA256 fb6dd06053fe8aa511a691735453631dce12b1f49fe0d995c4b5a1777eb20a07 twiki-4.0.4-r1.ebuild 2277
-MISC ChangeLog 6441 RMD160 5a148b88facc2f97f92cca90088691b9fe31db9e SHA1 6ab3e5854e67bc384612a0572f0e39a44079d79c SHA256 037437dab6ea61d60b4fd35748ba678dc8a171366020bc7e4a9af4a0c12f0699
-MD5 bf2c6387fb64137328f1b59f75aa8713 ChangeLog 6441
-RMD160 5a148b88facc2f97f92cca90088691b9fe31db9e ChangeLog 6441
-SHA256 037437dab6ea61d60b4fd35748ba678dc8a171366020bc7e4a9af4a0c12f0699 ChangeLog 6441
+DIST hotfix-4.0.4-3.tgz 256024 RMD160 72411c20c3829c8dea842e7c3f000df8197db91e SHA1 a6f4ac1a071161c4e992ab9c872b2cd8992f9d7e SHA256 5e5f49cffaa94693022031567723d94d5b7f3202037e0bace4182af85034f098
+EBUILD twiki-4.0.4-r2.ebuild 2277 RMD160 0debd1062d9e605fc1f43405f5ef2d51a4a207e9 SHA1 4328c9eb00f9c34ae08e6bacba28fa7223f0d3fa SHA256 7f8c277271f558823b2947ab88cb724ba94db5e3eba9d421bd7e87af633c78c8
+MD5 f98df23a8c5dcc75fc456816c8a0fce8 twiki-4.0.4-r2.ebuild 2277
+RMD160 0debd1062d9e605fc1f43405f5ef2d51a4a207e9 twiki-4.0.4-r2.ebuild 2277
+SHA256 7f8c277271f558823b2947ab88cb724ba94db5e3eba9d421bd7e87af633c78c8 twiki-4.0.4-r2.ebuild 2277
+MISC ChangeLog 6584 RMD160 0f09f424614c8910a2e64ec50631e1ee1c39a2fe SHA1 497d8e4f3c51f1a8ae5de2db5a84c624190a7b79 SHA256 a6d321700f9704e6a0d5be136a74d533d722fc544e9a5dd42e0bb6826d3e7f22
+MD5 428fc33889ad3ff65fe7b07fcf57f297 ChangeLog 6584
+RMD160 0f09f424614c8910a2e64ec50631e1ee1c39a2fe ChangeLog 6584
+SHA256 a6d321700f9704e6a0d5be136a74d533d722fc544e9a5dd42e0bb6826d3e7f22 ChangeLog 6584
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a metadata.xml 280
-MD5 4b0329c4c2737e9f8e667aa4b1ea7bf3 files/digest-twiki-4.0.4-r1 464
-RMD160 e65b688876c77137967ed3c85f1df7d7762ab027 files/digest-twiki-4.0.4-r1 464
-SHA256 b210fc8d1b964001786687abc94897aa4bb41282676bca434f26d33f4f0783c1 files/digest-twiki-4.0.4-r1 464
+MD5 a21f65abb6414db4325bb410d9a85fe8 files/digest-twiki-4.0.4-r2 464
+RMD160 7f1e03fb7c99440f895219b6329b30c89d872fbe files/digest-twiki-4.0.4-r2 464
+SHA256 36e9770d8981b9e1abd8bda9cd5e2fd4917dca39f9fa285bfaf143a91f80d149 files/digest-twiki-4.0.4-r2 464
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFE+XKNEzitwsaoONoRAlBwAKClPA4rvfhqwcdfHCIwXk3ncTnmsQCgsJej
-qI3nVWKxbW2MKfuQZ08imp8=
-=xMul
+iD8DBQFFBix2EzitwsaoONoRAgG1AKDXgPSn500hougxg+UUbWCeqXMC/ACZATvw
+zP8+9Snf0AvTPajf+C1nUi0=
+=U1R3
 -----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/digest-twiki-4.0.4-r1 b/www-apps/twiki/files/digest-twiki-4.0.4-r1
deleted file mode 100644
index 14478e52aecd..000000000000
--- a/www-apps/twiki/files/digest-twiki-4.0.4-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9be884c84c8d300ae2767e668ade6d35 TWiki-4.0.4.tgz 4251364
-RMD160 6d920a781aec1826d51421514c34d97142a987ea TWiki-4.0.4.tgz 4251364
-SHA256 ef4d436b769e4ef19a0433d187b5a4c328f62d1983fedb4a3530bd6dd1ee6eda TWiki-4.0.4.tgz 4251364
-MD5 33920374685311b4b0f3ae915dfd11ef hotfix-4.0.4-2.tgz 162030
-RMD160 e809464e90474be49d776dadc9d76ea7c2e06cff hotfix-4.0.4-2.tgz 162030
-SHA256 b577b6f79af0d61532ebfaf0d40093b8875910740c22d186b3fc85bc84a15f19 hotfix-4.0.4-2.tgz 162030
diff --git a/www-apps/twiki/twiki-4.0.4-r1.ebuild b/www-apps/twiki/twiki-4.0.4-r1.ebuild
deleted file mode 100644
index 071641ab96ca..000000000000
--- a/www-apps/twiki/twiki-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,87 +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/twiki/twiki-4.0.4-r1.ebuild,v 1.2 2006/09/02 12:01:36 rl03 Exp $
-
-inherit webapp eutils
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT=4.0.4
-
-MY_PN="TWiki"
-
-DESCRIPTION="A Web Based Collaboration Platform"
-HOMEPAGE="http://twiki.org/"
-SRC_URI="http://twiki.org/p/pub/Codev/Release/${MY_PN}-${PV}.tgz
-http://twiki.org/p/pub/Codev/HotFix04x00x04x02/hotfix-4.0.4-2.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="apache2"
-
-S=${WORKDIR}
-
-RDEPEND=">=dev-lang/perl-5.8
-		>=app-text/rcs-5.7
-		sys-apps/diffutils
-		dev-perl/Algorithm-Diff
-		>=virtual/perl-CGI-3.20
-		perl-core/File-Spec
-		dev-perl/Text-Diff
-		perl-core/Time-Local
-		dev-perl/CGI-Session
-		perl-core/digest-base
-		dev-perl/Digest-SHA1
-		dev-perl/locale-maketext-lexicon
-		virtual/perl-libnet
-		dev-perl/URI
-		virtual/cron
-		dev-perl/HTML-Parser
-		apache2? ( >=net-www/apache-2.0.54 )
-		!apache2? ( =net-www/apache-1* )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	mv ${S}/bin/LocalLib.cfg.txt ${S}/bin/LocalLib.cfg
-	mv ${S}/lib/LocalSite.cfg.txt ${S}/lib/LocalSite.cfg
-	# change web user to apache
-	cd ${S}/lib/TWiki
-	find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';'
-}
-
-src_install() {
-	webapp_src_preinst
-
-	cp -r . ${D}/${MY_HTDOCSDIR}
-
-	dodoc readme.txt
-	dohtml T*.html
-
-	for file in $(find data pub) lib/LocalSite.cfg; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-	done
-
-	for a in bin/setlib.cfg bin/LocalLib.cfg lib/TWiki.cfg lib/LocalSite.cfg; do
-		webapp_configfile ${MY_HTDOCSDIR}/${a}
-	done
-	webapp_hook_script ${FILESDIR}/reconfig
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_postupgrade_txt en ${FILESDIR}/postupgrade-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from an older version of TWiki, back up your"
-	ewarn "data/ and pub/ directories and any local changes before upgrading!"
-	ewarn
-	ewarn "You are _strongly_ encouraged to to read the upgrade guide:"
-	ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation"
-	ewarn
-	elog "webapp-config will not be run automatically"
-	elog "Run webapp-config -I -h <host> -d ${PN} ${PN} ${PVR} to install"
-	elog
-	# webapp_pkg_postinst
-}