Version bumped

8 files changed, 236 insertions, 7 deletions

diff --git a/net-www/tikiwiki/ChangeLog b/net-www/tikiwiki/ChangeLog
index fc65ab9c1a40..e53a94beda65 100644
--- a/net-www/tikiwiki/ChangeLog
+++ b/net-www/tikiwiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/tikiwiki
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/ChangeLog,v 1.9 2004/06/25 01:13:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/ChangeLog,v 1.10 2004/08/04 20:15:52 mholzer Exp $
+
+*tikiwiki-1.8.3 (05 Aug 2004)
+
+  05 Aug 2004; Martin Holzer <mholzer@gentoo.org> +tikiwiki-1.8.3.ebuild:
+  Version bumped and using webapp.eclass based ebuilds submitted by
+  gentoo@psychogeeks.com in 52143
 
   17 Apr 2004; Jason Wever <weeve@gentoo.org> tikiwiki-1.8.2.ebuild:
   Added ~sparc keyword.
diff --git a/net-www/tikiwiki/Manifest b/net-www/tikiwiki/Manifest
index 95e6152fb3c8..d9b1c5113ef5 100644
--- a/net-www/tikiwiki/Manifest
+++ b/net-www/tikiwiki/Manifest
@@ -1,4 +1,9 @@
-MD5 6241d123959c4849112bdf72938def47 tikiwiki-1.8.2.ebuild 1671
-MD5 c2e2d22b918991ed7c4d3d8ce3756e0e ChangeLog 1259
+MD5 10e700f5e72d5bd98db8aed8aa037f99 tikiwiki-1.8.2.ebuild 1635
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
+MD5 0bbd5547d7480794de55335296ba3768 ChangeLog 1467
+MD5 174c8047d1c98e618d1bd182d33b1bbf tikiwiki-1.8.2-r1.ebuild 1987
+MD5 e23bbe14dca0734a9b5f4f0ad9c25800 tikiwiki-1.8.3.ebuild 1959
 MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2 68
+MD5 bd86652016f6c4480eda7199fa25ebd9 files/postinstall-en.txt 1407
+MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2-r1 68
+MD5 a0ee80f78f566fc992524890c3222b78 files/digest-tikiwiki-1.8.3 68
diff --git a/net-www/tikiwiki/files/digest-tikiwiki-1.8.2-r1 b/net-www/tikiwiki/files/digest-tikiwiki-1.8.2-r1
new file mode 100644
index 000000000000..acfd5c768999
--- /dev/null
+++ b/net-www/tikiwiki/files/digest-tikiwiki-1.8.2-r1
@@ -0,0 +1 @@
+MD5 8be27c5de293d005ae8fba00b4a25b70 tikiwiki-1.8.2.tar.bz2 5382427
diff --git a/net-www/tikiwiki/files/digest-tikiwiki-1.8.3 b/net-www/tikiwiki/files/digest-tikiwiki-1.8.3
new file mode 100644
index 000000000000..069daf18fdb7
--- /dev/null
+++ b/net-www/tikiwiki/files/digest-tikiwiki-1.8.3
@@ -0,0 +1 @@
+MD5 e6bece62491af58453648ed53c7edbd3 tikiwiki-1.8.3.tar.bz2 5388215
diff --git a/net-www/tikiwiki/files/postinstall-en.txt b/net-www/tikiwiki/files/postinstall-en.txt
new file mode 100644
index 000000000000..fab991414186
--- /dev/null
+++ b/net-www/tikiwiki/files/postinstall-en.txt
@@ -0,0 +1,54 @@
+Setup Completion
+---
+
+If there is no existing TikiWiki install and database you will need to
+create an empty database for TikiWiki before starting setup.  For
+example (MySQL):
+
+mysql -p -u root mysql <<__EOSQL
+  CREATE DATABASE tiki;
+  GRANT CREATE, DROP, INDEX, ALTER, SELECT, INSERT, UPDATE, DELETE
+    ON tiki.*
+    TO tikiuser@localhost
+    IDENTIFIED BY 'a_good_password';
+  FLUSH PRIVILEGES;
+__EOSQL
+
+
+TikiWiki likes to have a generous PHP environment.  Please edit
+/etc/php4/php.ini or arrange the settings through another mechanism such as
+Apache .htaccess files.
+
+Tiki requires PHP to have :
+    ==> 'memory_limit = 16M'
+    ==> 'max_execution_time = 60'
+Tiki likes PHP to have :
+    ==> 'default_charset = utf-8'
+    ==> 'file_uploads = On'
+
+
+Please read the files in:
+${G_HTDOCSDIR}${G_INSTALLDIR}doc 
+especially if you want clean URLS under Apache.
+
+You may find further information on the Tiki website
+    ==> http://tikiwiki.org/InstallGettingStarted
+
+Note: The equivalent of running setup.sh has already been completed.
+
+
+Now, point your browser to the location of tiki-install.php to complete the
+setup/upgrade.  For example:
+
+http://${G_HOSTNAME}/${G_INSTALLDIR}/tiki-install.php
+
+
+You may need to manually rename tiki-install.php to tiki-install.done to
+secure your system.  For example:
+
+cd ${G_HTDOCSDIR}${G_INSTALLDIR}
+mv tiki-install.php tiki-install.done
+
+
+Enjoy your TikiWiki site.
+
diff --git a/net-www/tikiwiki/tikiwiki-1.8.2-r1.ebuild b/net-www/tikiwiki/tikiwiki-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..ae2f4b96b0b5
--- /dev/null
+++ b/net-www/tikiwiki/tikiwiki-1.8.2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/tikiwiki-1.8.2-r1.ebuild,v 1.1 2004/08/04 20:15:52 mholzer Exp $
+
+inherit webapp
+
+DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates"
+HOMEPAGE="http://tikiwiki.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86 ~ppc ~sparc"
+
+RDEPEND="virtual/php
+	media-gfx/graphviz"
+
+src_install() {
+	webapp_src_preinst
+
+	local DIR
+	local DIRENTRY
+	local DIRS="backups db dump img/wiki
+		img/wiki_up modules/cache temp temp/cache
+		templates_c var var/log var/log/irc templates
+		styles lib/Galaxia/processes"
+
+
+	# Ensure that directories exist, some don't.
+	# (part of setup.sh)
+	#
+	for DIR in ${DIRS}; do
+		mkdir -p ${DIR}
+	done
+
+	# Remove the execute permission from the setup.sh script
+	# and rename it.  Its actions have been incorporated here.
+	#
+	chmod a-x setup.sh
+	mv setup.sh setup.sh.done
+
+	# Install the minimal doc (points to web page)
+	#
+	dodoc doc/readme.txt
+	dodoc doc/htaccess
+	dodoc doc/htaccess.readme
+	dodoc INSTALL
+	dodoc README
+	rm INSTALL README
+
+	# The bulk goes into htdocs
+	#
+	cp -a . ${D}/${MY_HTDOCSDIR}
+
+	# Recursively set server ownership to allow server to write
+	# This is the rough equivalent of the setup.sh script
+	# provided in the distribution.
+	# Note: Cannot use xargs or find -exec here because 
+	# 		these don't	work with shell functions.
+	#
+	webapp_serverowned ${MY_HTDOCSDIR}
+	for DIR in ${DIRS}; do
+		find ${DIR} | while read DIRENTRY; do
+			webapp_serverowned ${MY_HTDOCSDIR}/${DIRENTRY}
+		done
+	done
+
+	# Flag files for scripting engine
+	#
+	find . -name '*.php' -a ! -name '*.inc.php' | while read DIRENTRY; do
+		webapp_runbycgibin php ${MY_HTDOCSDIR}/${DIRENTRY}
+	done
+
+	# Setup some post-install notes for webapp-config
+	#
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
+
diff --git a/net-www/tikiwiki/tikiwiki-1.8.2.ebuild b/net-www/tikiwiki/tikiwiki-1.8.2.ebuild
index 04afda84c9c6..329925260c27 100644
--- a/net-www/tikiwiki/tikiwiki-1.8.2.ebuild
+++ b/net-www/tikiwiki/tikiwiki-1.8.2.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/tikiwiki-1.8.2.ebuild,v 1.3 2004/06/25 01:13:54 agriffis Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/tikiwiki-1.8.2.ebuild,v 1.4 2004/08/04 20:15:52 mholzer Exp $
 
 inherit webapp-apache
 
 DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates"
 HOMEPAGE="http://tikiwiki.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-RESTRICT="nomirror"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND="virtual/php
-	media-gfx/graphviz
-	dev-db/mysql"
+	media-gfx/graphviz"
 
 pkg_setup() {
 	webapp-detect || NO_WEBSERVER=1
diff --git a/net-www/tikiwiki/tikiwiki-1.8.3.ebuild b/net-www/tikiwiki/tikiwiki-1.8.3.ebuild
new file mode 100644
index 000000000000..d396d47efcda
--- /dev/null
+++ b/net-www/tikiwiki/tikiwiki-1.8.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/tikiwiki-1.8.3.ebuild,v 1.1 2004/08/04 20:15:52 mholzer Exp $
+
+inherit webapp
+
+DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates"
+HOMEPAGE="http://tikiwiki.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86 ~ppc ~sparc"
+
+RDEPEND="virtual/php
+	media-gfx/graphviz"
+
+
+src_install() {
+	webapp_src_preinst
+
+	local DIR
+	local DIRENTRY
+	local DIRS="backups db dump img/wiki
+		img/wiki_up modules/cache temp temp/cache
+		templates_c templates styles lib/Galaxia/processes"
+
+
+	# Ensure that directories exist, some don't.
+	# (part of setup.sh)
+	#
+	for DIR in ${DIRS}; do
+		mkdir -p ${DIR}
+	done
+
+	# Remove the execute permission from the setup.sh script
+	# and rename it.  Its actions have been incorporated here.
+	#
+	chmod a-x setup.sh
+	mv setup.sh setup.sh.done
+
+	# Install the minimal doc (points to web page)
+	#
+	dodoc doc/readme.txt
+	dodoc doc/htaccess
+	dodoc doc/htaccess.readme
+	dodoc INSTALL
+	dodoc README
+	rm INSTALL README
+
+	# The bulk goes into htdocs
+	#
+	cp -a . ${D}/${MY_HTDOCSDIR}
+
+	# Recursively set server ownership to allow server to write
+	# This is the rough equivalent of the setup.sh script
+	# provided in the distribution.
+	# Note: Cannot use xargs or find -exec here because 
+	# 		these don't	work with shell functions.
+	#
+	webapp_serverowned ${MY_HTDOCSDIR}
+	for DIR in ${DIRS}; do
+		find ${DIR} | while read DIRENTRY; do
+			webapp_serverowned ${MY_HTDOCSDIR}/${DIRENTRY}
+		done
+	done
+
+	# Flag files for scripting engine
+	#
+	find . -name '*.php' -a ! -name '*.inc.php' | while read DIRENTRY; do
+		webapp_runbycgibin php ${MY_HTDOCSDIR}/${DIRENTRY}
+	done
+
+	# Setup some post-install notes for webapp-config
+	#
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
+