Version bump, bug #141889.

(Portage version: 2.1.1_pre2-r6)

3 files changed, 99 insertions, 1 deletions

diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index dfd7359d969f..c796503fb9ef 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/twiki
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.34 2006/07/13 00:44:46 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.35 2006/08/01 21:09:25 rl03 Exp $
+
+*twiki-4.0.4-r1 (01 Aug 2006)
+
+  01 Aug 2006; Renat Lumpau <rl03@gentoo.org> -twiki-4.0.4.ebuild,
+  +twiki-4.0.4-r1.ebuild:
+  Version bump, bug #141889.
 
   13 Jul 2006; Renat Lumpau <rl03@gentoo.org> twiki-4.0.4.ebuild:
   Clarified postinstall instructions per bug #140131.
diff --git a/www-apps/twiki/files/digest-twiki-4.0.4-r1 b/www-apps/twiki/files/digest-twiki-4.0.4-r1
new file mode 100644
index 000000000000..14478e52aecd
--- /dev/null
+++ b/www-apps/twiki/files/digest-twiki-4.0.4-r1
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000000..7219c5ba964d
--- /dev/null
+++ b/www-apps/twiki/twiki-4.0.4-r1.ebuild
@@ -0,0 +1,86 @@
+# 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.1 2006/08/01 21:09:25 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
+		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
+}