Version bump, bug #141889.

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

3 files changed, 15 insertions, 99 deletions

diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index d66b783564c3..a57272717c5b 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -14,25 +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
-EBUILD twiki-4.0.4.ebuild 2148 RMD160 86590f2a0497a098c7e9354f23b813b570404ac8 SHA1 9de61f97a290c652ec2dac34246aa86967ae186c SHA256 638917d2da1ffdedffd8346a090c9c3fa497a8fa0b67c7b1cae55cb1096db3c0
-MD5 76cf3b0f706d61934ec51f3ea6ee3437 twiki-4.0.4.ebuild 2148
-RMD160 86590f2a0497a098c7e9354f23b813b570404ac8 twiki-4.0.4.ebuild 2148
-SHA256 638917d2da1ffdedffd8346a090c9c3fa497a8fa0b67c7b1cae55cb1096db3c0 twiki-4.0.4.ebuild 2148
-MISC ChangeLog 6183 RMD160 fd7f1cfeb6294d86c8b8fdf3d0a4856fcf6492ad SHA1 928dda62b72402be6aaf6c5f041833ee24da3c9b SHA256 a0be1266662eef076fef5793fd7bde8eaf59c2d080792e0a8d914c913c4c6a1b
-MD5 101997497237cc20166b4ad46f437e5c ChangeLog 6183
-RMD160 fd7f1cfeb6294d86c8b8fdf3d0a4856fcf6492ad ChangeLog 6183
-SHA256 a0be1266662eef076fef5793fd7bde8eaf59c2d080792e0a8d914c913c4c6a1b ChangeLog 6183
+DIST hotfix-4.0.4-2.tgz 162030 RMD160 e809464e90474be49d776dadc9d76ea7c2e06cff SHA1 0597702196607837246138600f929897fdc576ae SHA256 b577b6f79af0d61532ebfaf0d40093b8875910740c22d186b3fc85bc84a15f19
+EBUILD twiki-4.0.4-r1.ebuild 2254 RMD160 6bbc5a1c9cdea0e2b83fffd14b4d9599d4589902 SHA1 fe9c14fcd298650b8d672df55b025e3742795e6d SHA256 5f2f1ea1deac29d0445b440e7d69e0bd98e78b5ea4fc385bbf205c8d3e494f12
+MD5 5f2258293545a16c2eaa64b17d20b40c twiki-4.0.4-r1.ebuild 2254
+RMD160 6bbc5a1c9cdea0e2b83fffd14b4d9599d4589902 twiki-4.0.4-r1.ebuild 2254
+SHA256 5f2f1ea1deac29d0445b440e7d69e0bd98e78b5ea4fc385bbf205c8d3e494f12 twiki-4.0.4-r1.ebuild 2254
+MISC ChangeLog 6337 RMD160 5447f01706586c3261601745c8083d98a01fccd8 SHA1 dc3c044ba2aa5775c29340e19e00a5ae135e6b02 SHA256 8c081ee0170f64613a5c632a9d8a3c76525ef020bb3219ac39a82f03156be2be
+MD5 01b71b4e3079af54fc841e5ae2810063 ChangeLog 6337
+RMD160 5447f01706586c3261601745c8083d98a01fccd8 ChangeLog 6337
+SHA256 8c081ee0170f64613a5c632a9d8a3c76525ef020bb3219ac39a82f03156be2be ChangeLog 6337
 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 729274bd228d212d61c9794406017e35 files/digest-twiki-4.0.4 229
-RMD160 46ca6917ca66a3cc88ee11d62374ca0147de42bd files/digest-twiki-4.0.4 229
-SHA256 3218cb90674e189e4f894d9991eab70af4bf992846b5a31bb0bb2bd11fbefc2f files/digest-twiki-4.0.4 229
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEtZeTEzitwsaoONoRAmYXAKDJxaxCJubXZhLrsMCfkfbunVK4ggCeIidE
-eFB+0cXpdBH5jzVEfiv15x8=
-=u4LZ
+iD8DBQFEz8MNEzitwsaoONoRAsSDAKCnUTtWtMPFyR/+YwYwpoINhMDq+QCg1/Bu
+Jb77/wDeQlSlFOhKz0Hj43s=
+=D3mu
 -----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/digest-twiki-4.0.4 b/www-apps/twiki/files/digest-twiki-4.0.4
deleted file mode 100644
index c178ddaaace6..000000000000
--- a/www-apps/twiki/files/digest-twiki-4.0.4
+++ /dev/null
@@ -1,3 +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
diff --git a/www-apps/twiki/twiki-4.0.4.ebuild b/www-apps/twiki/twiki-4.0.4.ebuild
deleted file mode 100644
index f205c48a3c27..000000000000
--- a/www-apps/twiki/twiki-4.0.4.ebuild
+++ /dev/null
@@ -1,82 +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.ebuild,v 1.3 2006/07/13 00:44:46 rl03 Exp $
-
-inherit webapp eutils
-
-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"
-
-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
-		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
-}