Add unstable version (#79078), add postgres USE flag (#85749), warn about php USE flags (#73408).

(Portage version: 2.0.51.22-r1)

5 files changed, 117 insertions, 13 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index fd416591f5e3..a7e66851d067 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/tikiwiki
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.10 2005/07/05 23:10:00 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.11 2005/07/07 21:47:19 rl03 Exp $
+
+*tikiwiki-1.9.0 (07 Jul 2005)
+
+  07 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +tikiwiki-1.9.0.ebuild:
+  Add unstable version (#79078), add postgres USE flag (#85749), warn about
+  php USE flags (#73408).
 
 *tikiwiki-1.8.5-r1 (06 Jul 2005)
 
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 957ed054ed6c..ccfb03327914 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,10 +1,12 @@
-MD5 c24a40f07ce81939160500b36c20f207 ChangeLog 3508
-MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 2a2e1efea955fef2b47ccb598ed75151 tikiwiki-1.8.4.1.ebuild 2244
 MD5 3116fbb5b7a9c85c6e914f603c71b136 tikiwiki-1.8.5.ebuild 2248
 MD5 2ee1930a8509025904b318b35e901d45 tikiwiki-1.8.5-r1.ebuild 2346
-MD5 6f2a8966e380c4abbebb0883290d7a21 files/digest-tikiwiki-1.8.4.1 70
-MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5 68
+MD5 abe425fea77916967cdfb3d5d249532c tikiwiki-1.9.0.ebuild 2491
+MD5 2a2e1efea955fef2b47ccb598ed75151 tikiwiki-1.8.4.1.ebuild 2244
+MD5 1c5d5d336ceef350bba7980a069c5dde ChangeLog 3740
+MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
+MD5 a43526d55fa814d5e9af0042767a6600 files/postinstall-en.txt 1407
 MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r1 68
-MD5 3a48dbc160debfb2d5b4d4ace3c8af78 files/postinstall-en.txt 1382
 MD5 b0e0921fd97e18c1e6746aacc75f87fa files/tikiwiki-1.8.5-xmlrpc.patch 1093
+MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5 68
+MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0 68
+MD5 6f2a8966e380c4abbebb0883290d7a21 files/digest-tikiwiki-1.8.4.1 70
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0
new file mode 100644
index 000000000000..baa90951f379
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0
@@ -0,0 +1 @@
+MD5 524deba410cc17048781b3a999d7b509 tikiwiki-1.9.0.tar.bz2 6007822
diff --git a/www-apps/tikiwiki/files/postinstall-en.txt b/www-apps/tikiwiki/files/postinstall-en.txt
index 330b207c4284..52b7617d4839 100644
--- a/www-apps/tikiwiki/files/postinstall-en.txt
+++ b/www-apps/tikiwiki/files/postinstall-en.txt
@@ -2,8 +2,8 @@ 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):
+create an empty database for TikiWiki before starting setup.
+You can run the pkg_config script in the ebuild, or (MySQL):
 
 mysql -p -u root mysql <<__EOSQL
   CREATE DATABASE tiki;
@@ -14,6 +14,8 @@ mysql -p -u root mysql <<__EOSQL
   FLUSH PRIVILEGES;
 __EOSQL
 
+If you are using PostgreSQL, please consult your documentation.
+
 
 TikiWiki likes to have a generous PHP environment.  Please edit
 your php.ini or arrange the settings through another mechanism such as
@@ -26,8 +28,6 @@ Tiki likes PHP to have :
     ==> 'default_charset = utf-8'
     ==> 'file_uploads = On'
 
-Make certain you have compiled php and mod_php with your database of choice in
-the USE flags.
 
 Please read the files in ${MY_INSTALLDIR}/doc
 especially if you want clean URLs under Apache.
@@ -41,10 +41,9 @@ 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://${VHOST_HOSTNAME}/tiki-install.php
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/tiki-install.php
 
 You may need to manually rename tiki-install.php to tiki-install.done to
 secure your system.
 
 Enjoy your TikiWiki site.
-
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.0.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.0.ebuild
new file mode 100644
index 000000000000..c41988734588
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.9.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.0.ebuild,v 1.1 2005/07/07 21:47:19 rl03 Exp $
+
+inherit webapp eutils
+
+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"
+IUSE="mysql postgres graphviz"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+RDEPEND=">=virtual/php-4.3
+	mysql? ( >=dev-db/mysql-4 )
+	postgres? ( dev-db/postgresql )
+	graphviz? ( media-gfx/graphviz )
+"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/tikiwiki-1.8.5-xmlrpc.patch
+}
+
+pkg_setup () {
+	webapp_pkg_setup
+	einfo "Make sure your PHP is compiled with mysql or postgres support"
+	einfo "If you need PDF generation, make sure your PHP is emerged with xml2"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local DIR
+	local DIRENTRY
+	local DIRS="backups db dump files img/wiki
+		img/wiki_up modules/cache temp temp/cache
+		templates_c templates styles maps whelp mods
+		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 doc/htaccess doc/htaccess.readme INSTALL README
+
+	# The bulk goes into htdocs
+	# but don't copy INSTALL and README
+	cp -a [[:lower:]]* ${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
+	webapp_serverowned  ${MY_HTDOCSDIR}/tiki-install.php
+
+	# Setup some post-install notes for webapp-config
+	#
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_config() {
+	einfo "Type in your MySQL root password to create an empty tiki database:"
+	mysqladmin -u root -p create tikiwiki
+}
+
+pkg_postinst() {
+	einfo "To setup a MySQL database, run:"
+	einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\""
+	einfo "If you are using PostgreSQL, consult your documentation"
+	webapp_pkg_postinst
+}