Version bump

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

3 files changed, 15 insertions, 109 deletions

diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index 5a262dd0f261..70cbbd14498a 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -13,27 +13,26 @@ AUX reconfig 553 RMD160 e80469e5b4b0e2538c597b96b0d905fce4aa6193 SHA1 8d7f6dc57b
 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-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
+DIST TWiki-4.0.5.tgz 4264148 RMD160 c1c81b6489bb88a1dfff3fb6bfe6d1838f132172 SHA1 3b1fd4212feeb2bcf192aa537c5e16166000be86 SHA256 cbe97bd965e13940a6f9aa496c0c2657d42bf900dd8d0bdcf8b4e866d090dc8f
+EBUILD twiki-4.0.5.ebuild 2171 RMD160 276da64330b807071f6da124426714e6a5500473 SHA1 ad927f864ba96fb8142a81b4a595b4ca1b3efd0e SHA256 3a8651ecae3bf17068253a939c27d4d39736054f40928f7c000bda400e18f712
+MD5 f38474af98ee21f54de97dd8600c016a twiki-4.0.5.ebuild 2171
+RMD160 276da64330b807071f6da124426714e6a5500473 twiki-4.0.5.ebuild 2171
+SHA256 3a8651ecae3bf17068253a939c27d4d39736054f40928f7c000bda400e18f712 twiki-4.0.5.ebuild 2171
+MISC ChangeLog 6721 RMD160 9cc0a508a8d11b9427b345f650e9c46569f04607 SHA1 25ca55c2258cb9fbc577570ac991db81a7a254c5 SHA256 3a81e5ac2860ba2f1cb4ba7a5269e908508c3e73549dc5eaa5ca07ded0fa3ce3
+MD5 c12396b2997eba2d089ed26377beb73e ChangeLog 6721
+RMD160 9cc0a508a8d11b9427b345f650e9c46569f04607 ChangeLog 6721
+SHA256 3a81e5ac2860ba2f1cb4ba7a5269e908508c3e73549dc5eaa5ca07ded0fa3ce3 ChangeLog 6721
 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 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
+MD5 2acb7c6a3fa6a438411664e12ed3f716 files/digest-twiki-4.0.5 229
+RMD160 3c6e81a8c498b4f2cfd232c8559ce895eb38aa74 files/digest-twiki-4.0.5 229
+SHA256 236f0bfeca3b9ae5e4b5b7d2ca48e20cf889edad0aa53859b913cbeb23f6b7ea files/digest-twiki-4.0.5 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFFBix2EzitwsaoONoRAgG1AKDXgPSn500hougxg+UUbWCeqXMC/ACZATvw
-zP8+9Snf0AvTPajf+C1nUi0=
-=U1R3
+iD8DBQFFQiNhEzitwsaoONoRAgD9AJ95LcnuZ50FFYtmBnb0C+6jASAVHgCeISF+
+RApsdazXrPgzZ5Og5fLwgqM=
+=jU5S
 -----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/digest-twiki-4.0.4-r2 b/www-apps/twiki/files/digest-twiki-4.0.4-r2
deleted file mode 100644
index 3b930156f9c0..000000000000
--- a/www-apps/twiki/files/digest-twiki-4.0.4-r2
+++ /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 cd1fa64ccf3001307234a41836113665 hotfix-4.0.4-3.tgz 256024
-RMD160 72411c20c3829c8dea842e7c3f000df8197db91e hotfix-4.0.4-3.tgz 256024
-SHA256 5e5f49cffaa94693022031567723d94d5b7f3202037e0bace4182af85034f098 hotfix-4.0.4-3.tgz 256024
diff --git a/www-apps/twiki/twiki-4.0.4-r2.ebuild b/www-apps/twiki/twiki-4.0.4-r2.ebuild
deleted file mode 100644
index 9a78825d857c..000000000000
--- a/www-apps/twiki/twiki-4.0.4-r2.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-r2.ebuild,v 1.1 2006/09/12 03:41:29 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/HotFix04x00x04x03/hotfix-4.0.4-3.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
-}