Rev bump. Update to use the new apache paths.

Package-Manager: portage-2.0.51.18

7 files changed, 98 insertions, 13 deletions

diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index eed3434dfe0d..22cf8c6b6b9d 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/twiki
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.7 2004/11/24 08:20:30 josejx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.8 2005/03/01 15:14:41 beu Exp $
+
+*twiki-20040902-r1 (01 Mar 2005)
+
+  01 Mar 2005; Elfyn McBratney <beu@gentoo.org> +twiki-20040902-r1.ebuild:
+  Rev bump.  Update to use the new apache paths.
 
   06 Nov 2004; Joseph Jezak <josejx@gentoo.org> twiki-20040902.ebuild:
   Marked stable on ppc for bug #71305
diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index 3f6c833805bf..e7353dff288e 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,9 +1,21 @@
-MD5 7279686a4f8c0231e5fd9a263a0a3d4c ChangeLog 1832
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2b23efb853c25ef203b7c184cba0b4e6 twiki-20040902-r1.ebuild 1656
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 4812f8fc82e4722aed4eccaa5bf6b3ad twiki-20030201.ebuild 1740
-MD5 53e0491856995463dba2b18ce54381ed twiki-20040901.ebuild 1755
-MD5 8f84f2b278460438fc0f4bf36122ef45 twiki-20040902.ebuild 1754
+MD5 347289eda702d46242b18307d8886d37 twiki-20040901.ebuild 1752
+MD5 52e220d251b9a2623c571cea03a51440 twiki-20040902.ebuild 1751
+MD5 5c79c2a8e58f8dcf043c6cd1d3c95db7 ChangeLog 1988
+MD5 f38fbee38a9e72bbf149dad58aa6288c twiki-20030201.ebuild 1735
 MD5 03289224ed6b4fd47078e353bc05c650 files/digest-twiki-20030201 65
+MD5 482053b76eef263c5377921e1dedcf08 files/digest-twiki-20040902 66
 MD5 6c6c056f184e8d333ae577837290e282 files/twiki.conf 538
+MD5 482053b76eef263c5377921e1dedcf08 files/digest-twiki-20040902-r1 66
 MD5 171d54d5e23801d47b006999d95f0c75 files/digest-twiki-20040901 66
-MD5 482053b76eef263c5377921e1dedcf08 files/digest-twiki-20040902 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCJIb4jUHll2nfF60RAqyTAJ4qdubBLvARZrKmiaVraVod9z03+wCfZHuj
+jgVQJt4QrPjiCc7nkDwdf08=
+=Uy+5
+-----END PGP SIGNATURE-----
diff --git a/www-apps/twiki/files/digest-twiki-20040902-r1 b/www-apps/twiki/files/digest-twiki-20040902-r1
new file mode 100644
index 000000000000..3745c525d900
--- /dev/null
+++ b/www-apps/twiki/files/digest-twiki-20040902-r1
@@ -0,0 +1 @@
+MD5 d04b2041d83dc6c97905faa1c6b9116d TWiki20040902.tar.gz 1833008
diff --git a/www-apps/twiki/twiki-20030201.ebuild b/www-apps/twiki/twiki-20030201.ebuild
index 2609eddb35ef..9458b845adca 100644
--- a/www-apps/twiki/twiki-20030201.ebuild
+++ b/www-apps/twiki/twiki-20030201.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20030201.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-20030201.ebuild,v 1.3 2005/03/01 15:14:41 beu Exp $
 
 inherit webapp-apache
 
diff --git a/www-apps/twiki/twiki-20040901.ebuild b/www-apps/twiki/twiki-20040901.ebuild
index 0c650daeb6bb..ccdbd84b1d3e 100644
--- a/www-apps/twiki/twiki-20040901.ebuild
+++ b/www-apps/twiki/twiki-20040901.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20040901.ebuild,v 1.1 2004/11/21 23:07:49 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-20040901.ebuild,v 1.2 2005/03/01 15:14:41 beu Exp $
 
 inherit webapp-apache
 
diff --git a/www-apps/twiki/twiki-20040902-r1.ebuild b/www-apps/twiki/twiki-20040902-r1.ebuild
new file mode 100644
index 000000000000..c6340de28340
--- /dev/null
+++ b/www-apps/twiki/twiki-20040902-r1.ebuild
@@ -0,0 +1,67 @@
+# 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-20040902-r1.ebuild,v 1.1 2005/03/01 15:14:41 beu Exp $
+
+inherit depend.apache webapp-apache
+
+DESCRIPTION="A Web Based Collaboration Platform"
+HOMEPAGE="http://twiki.org/"
+SRC_URI="http://twiki.org/swd/TWiki${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+S=${WORKDIR}/${PN}
+
+RDEPEND="virtual/php
+	media-gfx/graphviz
+	dev-db/mysql"
+
+IUSE="apache2"
+
+pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing for ${WEBAPP_SERVER}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	sed -i -e 's:\/home\/httpd:\/var\/www:g' lib/TWiki.cfg
+#	sed -i -e 's:urlpath\/to:var\/www\/localhost\/htdocs:g' \
+#		bin/.htaccess.txt
+#	echo "Options ExecCGI" >> bin/.htaccess.txt
+}
+
+
+src_install() {
+	local destdir=/var/www/twiki
+
+	dodir ${destdir}
+	cp -r . ${D}${destdir}
+
+	if use apache2; then
+		insinto ${APACHE2_MODULES_CONFDIR}
+	else
+		insinto ${APACHE1_MODULES_CONFDIR}
+	fi
+	doins ${FILESDIR}/twiki.conf 97_twiki.conf
+
+	dodoc readme.txt license.txt
+	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${D}${destdir}
+	chmod 0775 -R ${D}${destdir}/pub  ${D}${destdir}/data
+	chown nobody -R ${D}${destdir}/pub ${D}${destdir}/data
+	#find ${D}/${HTTPD_ROOT}/${PN}/templates -type d -exec chmod 0440 {} \;
+#	chmod 0444 -R ${PN}/templates
+}
+
+pkg_postinst() {
+	einfo "now go to your ${HTTPD_ROOT}/{PN},"
+	einfo "copy bin/.htaccess.txt to bin/.htaccess"
+	einfo "and be sure to read"
+	einfo "http://localhost/twiki/bin/view/TWiki/TWikiDocumentation#TWiki_Installation_Guide"
+}
diff --git a/www-apps/twiki/twiki-20040902.ebuild b/www-apps/twiki/twiki-20040902.ebuild
index dae886093766..fe1e5a6ab263 100644
--- a/www-apps/twiki/twiki-20040902.ebuild
+++ b/www-apps/twiki/twiki-20040902.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20040902.ebuild,v 1.2 2004/11/24 08:20:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-20040902.ebuild,v 1.3 2005/03/01 15:14:41 beu Exp $
 
 inherit webapp-apache