Version bump

(Portage version: 2.1)
 (Signed Manifest commit)

3 files changed, 15 insertions, 99 deletions

diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index ca7da639d4fe..feb6a3dc4121 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -13,26 +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.3.tgz 4150679 RMD160 0ddb1eba747d5d88be8c2f78c121763782106c98 SHA1 e5dc4d809d658cafd6d86901b156f30faaf342d3 SHA256 3b5ae29bf4f864a19e7a9cdce5033b92ab9faf70e14acc16f02e9296817dea24
-EBUILD twiki-4.0.3.ebuild 2078 RMD160 adeceec95ce54f256cf76ba95d89dc454fa0c1e0 SHA1 2bbaaf39fa9b502579b02e126cfc8e6fb62f352b SHA256 1e8a1826f8a2efd861abfc282d3e19cc3a608c3000e0528401c3854ee4bc4f75
-MD5 b4f3f64b2d36fdca09b2cfd36a7f25ad twiki-4.0.3.ebuild 2078
-RMD160 adeceec95ce54f256cf76ba95d89dc454fa0c1e0 twiki-4.0.3.ebuild 2078
-SHA256 1e8a1826f8a2efd861abfc282d3e19cc3a608c3000e0528401c3854ee4bc4f75 twiki-4.0.3.ebuild 2078
-MISC ChangeLog 5735 RMD160 c350b718357bdde50a3f25bbe89b7da83b73c3ae SHA1 fc5831814cef9b75bf6605612d987b5e938b19a6 SHA256 5b4c9b12e5bdcbe776e00cbc1851543b17dae725a99effe4b6ed97104593e89f
-MD5 06c734ddb35f3f3177174a3961130fb4 ChangeLog 5735
-RMD160 c350b718357bdde50a3f25bbe89b7da83b73c3ae ChangeLog 5735
-SHA256 5b4c9b12e5bdcbe776e00cbc1851543b17dae725a99effe4b6ed97104593e89f ChangeLog 5735
+DIST TWiki-4.0.4.tgz 4251364 RMD160 6d920a781aec1826d51421514c34d97142a987ea SHA1 4064a0e237fe40f3863b9401162b92cac05cf0bf SHA256 ef4d436b769e4ef19a0433d187b5a4c328f62d1983fedb4a3530bd6dd1ee6eda
+EBUILD twiki-4.0.4.ebuild 2078 RMD160 ea52fd4255c4fc30e2cfd2e7b928c2f09d2a7c6d SHA1 f9aa07dd84648c3227148f90aa2dbbb15d85d69a SHA256 40455a0ea45e6d7ffa38e5778cb5164c84941d91e0e141586c03fd142ac89fd1
+MD5 ed1214deeae7882db01c3794c46738bb twiki-4.0.4.ebuild 2078
+RMD160 ea52fd4255c4fc30e2cfd2e7b928c2f09d2a7c6d twiki-4.0.4.ebuild 2078
+SHA256 40455a0ea45e6d7ffa38e5778cb5164c84941d91e0e141586c03fd142ac89fd1 twiki-4.0.4.ebuild 2078
+MISC ChangeLog 5869 RMD160 3ed3ecb3262d2cf69808dc3f279e3877f27117e1 SHA1 1dabff5d92b51fbc88b54b204df46681cbffbcc5 SHA256 e7659195c741524b96805ffacf1bb4a366139a0985b77cc906fd52eb111ad977
+MD5 831e9573768dca5dced38dcbf07c1f63 ChangeLog 5869
+RMD160 3ed3ecb3262d2cf69808dc3f279e3877f27117e1 ChangeLog 5869
+SHA256 e7659195c741524b96805ffacf1bb4a366139a0985b77cc906fd52eb111ad977 ChangeLog 5869
 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 055aed57b541eed3b09d5c691039edf1 files/digest-twiki-4.0.3 229
-RMD160 54bd4a6770f27cf719f2fc04058d62a36046fa70 files/digest-twiki-4.0.3 229
-SHA256 be34ff00413b7ece4f48e94773596383537d279d68e804e2ab6069fb2b5cf1e8 files/digest-twiki-4.0.3 229
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEnvPxEzitwsaoONoRAi1HAJ9EghR4QHJTq0Xa0/qDNzkIqY4wlwCg2s1+
-JKxRhyiCCSvSclhKNSa+K8w=
-=JMaf
+iD8DBQFErZubEzitwsaoONoRApTqAJ9DN+a7jr+VqAtl6UyW9STUOWXIlgCgutg+
+TClQ4Bfnl32Q3XpDx2rg4GE=
+=xl7e
 -----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/digest-twiki-4.0.3 b/www-apps/twiki/files/digest-twiki-4.0.3
deleted file mode 100644
index 42a449454a81..000000000000
--- a/www-apps/twiki/files/digest-twiki-4.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 82941e39bf226cd8059c213846cc785f TWiki-4.0.3.tgz 4150679
-RMD160 0ddb1eba747d5d88be8c2f78c121763782106c98 TWiki-4.0.3.tgz 4150679
-SHA256 3b5ae29bf4f864a19e7a9cdce5033b92ab9faf70e14acc16f02e9296817dea24 TWiki-4.0.3.tgz 4150679
diff --git a/www-apps/twiki/twiki-4.0.3.ebuild b/www-apps/twiki/twiki-4.0.3.ebuild
deleted file mode 100644
index 2775250ffb83..000000000000
--- a/www-apps/twiki/twiki-4.0.3.ebuild
+++ /dev/null
@@ -1,81 +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.3.ebuild,v 1.1 2006/06/25 20:37:06 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
-	einfo "webapp-config will not be run automatically"
-	einfo
-	# webapp_pkg_postinst
-}