From 7d6e2c812ae35664d3f748d64c35b777fb2c7052 Mon Sep 17 00:00:00 2001
From: Renat Lumpau <rl03@gentoo.org>
Date: Fri, 16 Sep 2005 22:56:53 +0000
Subject: Revbump Package-Manager: portage-2.0.51.22-r2

---
 www-apps/twiki/ChangeLog                      |  8 +++-
 www-apps/twiki/Manifest                       | 12 +++---
 www-apps/twiki/files/digest-twiki-20041030    |  2 -
 www-apps/twiki/files/digest-twiki-20041030-r1 |  2 +
 www-apps/twiki/twiki-20041030-r1.ebuild       | 62 +++++++++++++++++++++++++++
 www-apps/twiki/twiki-20041030.ebuild          | 62 ---------------------------
 6 files changed, 77 insertions(+), 71 deletions(-)
 delete mode 100644 www-apps/twiki/files/digest-twiki-20041030
 create mode 100644 www-apps/twiki/files/digest-twiki-20041030-r1
 create mode 100644 www-apps/twiki/twiki-20041030-r1.ebuild
 delete mode 100644 www-apps/twiki/twiki-20041030.ebuild

(limited to 'www-apps/twiki')

diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index 520a3aace037..6ee95926fc1b 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/twiki
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.16 2005/09/16 11:38:20 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.17 2005/09/16 22:56:53 rl03 Exp $
+
+*twiki-20041030-r1 (16 Sep 2005)
+
+  16 Sep 2005; Renat Lumpau <rl03@gentoo.org> -twiki-20041030.ebuild,
+  +twiki-20041030-r1.ebuild:
+  Revbump
 
   16 Sep 2005; Renat Lumpau <rl03@gentoo.org> +files/exec_command.patch,
   files/postinstall-en.txt, twiki-20041030.ebuild:
diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index 79d2010d7917..660dc7b6da27 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f9c4e052fb172a7f5f942de00c156dca twiki-20041030.ebuild 1562
-MD5 bfe9fdf35b29999b6c383080b9f9ae22 ChangeLog 3533
+MD5 5717c261eb6d7bc7bf098cf1e9ddc7bd twiki-20041030-r1.ebuild 1565
+MD5 93506110c34d279c9e0d43ef8f45c746 ChangeLog 3677
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 e2754c98027bd6468cfe636616377892 files/exec_command.patch 2445
 MD5 d6ef3da92ece6d68c83fa4be8f6f97be files/twiki.conf 508
 MD5 fab10473182738fadb4188bf90af8162 files/execwithsearch.patch 653
 MD5 81a10e4ed2ea4d51fd1001d051951a61 files/postinstall-en.txt 795
-MD5 4369d80c9ef3589ccebce4a23095082b files/digest-twiki-20041030 138
+MD5 4369d80c9ef3589ccebce4a23095082b files/digest-twiki-20041030-r1 138
 MD5 f4898afe44208d27fee4ab3910b8cc88 files/reconfig 588
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDKq7CEzitwsaoONoRAtPeAJ4nDgJPgjbNX6XHPkIdrZKWpeOhagCfVsfB
-F37DCLiHIhiKcH+wSg7Mjkg=
-=bEck
+iD8DBQFDK03AEzitwsaoONoRApiDAKCU43+EMasmsweYbJeuLFYCResJhgCgiI8s
+X6T36gy3LrbU8pcjEkwNcfs=
+=PfYD
 -----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/digest-twiki-20041030 b/www-apps/twiki/files/digest-twiki-20041030
deleted file mode 100644
index 215f002bbb13..000000000000
--- a/www-apps/twiki/files/digest-twiki-20041030
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b4acc3ba9e09524d344db4bc76d2faaa TWiki20041030beta.zip 2606614
-MD5 c8e3010b59013dbb7814b26cc609825e twiki-robustness-r3342.diff 36473
diff --git a/www-apps/twiki/files/digest-twiki-20041030-r1 b/www-apps/twiki/files/digest-twiki-20041030-r1
new file mode 100644
index 000000000000..215f002bbb13
--- /dev/null
+++ b/www-apps/twiki/files/digest-twiki-20041030-r1
@@ -0,0 +1,2 @@
+MD5 b4acc3ba9e09524d344db4bc76d2faaa TWiki20041030beta.zip 2606614
+MD5 c8e3010b59013dbb7814b26cc609825e twiki-robustness-r3342.diff 36473
diff --git a/www-apps/twiki/twiki-20041030-r1.ebuild b/www-apps/twiki/twiki-20041030-r1.ebuild
new file mode 100644
index 000000000000..9c6018505486
--- /dev/null
+++ b/www-apps/twiki/twiki-20041030-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-20041030-r1.ebuild,v 1.1 2005/09/16 22:56:53 rl03 Exp $
+
+inherit webapp eutils depend.apache
+
+DESCRIPTION="A Web Based Collaboration Platform"
+HOMEPAGE="http://twiki.org/"
+SRC_URI="http://ftp.ale.org/pub/mirrors/openpkg/sources/DST/${PN}//TWiki${PV}beta.zip
+	http://static.enyo.de/fw/patches/twiki/twiki-robustness-r3342.diff"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+RDEPEND=">=dev-lang/perl-5.8
+		perl-core/CGI
+		dev-perl/libnet
+		>=app-text/rcs-5.7
+		sys-apps/diffutils
+		virtual/cron
+		=net-www/apache-1*"
+# apache2 is not supported, see twiki documentation
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib/TWiki
+	epatch ${FILESDIR}/execwithsearch.patch
+
+	# bug #106149
+	cd ${S}
+	epatch ${FILESDIR}/exec_command.patch
+	epatch ${DISTDIR}/twiki-robustness-r3342.diff
+
+	# change web user to apache
+	find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';'
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -r . ${D}/${MY_HTDOCSDIR}
+
+	dodoc readme.txt README.robustness
+
+	insinto ${APACHE1_VHOSTDIR}
+	doins ${FILESDIR}/twiki.conf
+
+	chmod 0755 ${D}/${MY_HTDOCSDIR}/bin/*
+	for file in `find data pub`; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	done
+
+	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_configfile ${MY_HTDOCSDIR}/bin/setlib.cfg
+	webapp_configfile ${MY_HTDOCSDIR}/lib/TWiki.cfg
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/twiki/twiki-20041030.ebuild b/www-apps/twiki/twiki-20041030.ebuild
deleted file mode 100644
index 5700dfa21f73..000000000000
--- a/www-apps/twiki/twiki-20041030.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-20041030.ebuild,v 1.4 2005/09/16 11:38:20 rl03 Exp $
-
-inherit webapp eutils depend.apache
-
-DESCRIPTION="A Web Based Collaboration Platform"
-HOMEPAGE="http://twiki.org/"
-SRC_URI="http://ftp.ale.org/pub/mirrors/openpkg/sources/DST/${PN}//TWiki${PV}beta.zip
-	http://static.enyo.de/fw/patches/twiki/twiki-robustness-r3342.diff"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}
-
-RDEPEND=">=dev-lang/perl-5.8
-		perl-core/CGI
-		dev-perl/libnet
-		>=app-text/rcs-5.7
-		sys-apps/diffutils
-		virtual/cron
-		=net-www/apache-1*"
-# apache2 is not supported, see twiki documentation
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib/TWiki
-	epatch ${FILESDIR}/execwithsearch.patch
-
-	# bug #106149
-	cd ${S}
-	epatch ${FILESDIR}/exec_command.patch
-	epatch ${DISTDIR}/twiki-robustness-r3342.diff
-
-	# change web user to apache
-	find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';'
-}
-
-src_install() {
-	webapp_src_preinst
-
-	cp -r . ${D}/${MY_HTDOCSDIR}
-
-	dodoc readme.txt README.robustness
-
-	insinto ${APACHE1_VHOSTDIR}
-	doins ${FILESDIR}/twiki.conf
-
-	chmod 0755 ${D}/${MY_HTDOCSDIR}/bin/*
-	for file in `find data pub`; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-	done
-
-	webapp_hook_script ${FILESDIR}/reconfig
-	webapp_configfile ${MY_HTDOCSDIR}/bin/setlib.cfg
-	webapp_configfile ${MY_HTDOCSDIR}/lib/TWiki.cfg
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
-- 
cgit v1.2.3-65-gdbad