5 files changed, 103 insertions, 8 deletions
diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index c16fcad268ef..1a8e5017cd81 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2005/10/26 12:17:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.24 2005/11/07 17:26:00 rl03 Exp $
+
+*tikiwiki-1.9.2 (07 Nov 2005)
+
+  07 Nov 2005; Renat Lumpau <rl03@gentoo.org> tikiwiki-1.9.1.1.ebuild,
+  +tikiwiki-1.9.2.ebuild:
+  Version bump
 
   26 Oct 2005; Renat Lumpau <rl03@gentoo.org> -files/xmlrpc2-1.8.5.patch,
   -tikiwiki-1.8.5-r2.ebuild:
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index eb4edd96d8dd..0eb5d57dc380 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4d3d0bdfdb54dbb031b5fe2a4aea02b7 tikiwiki-1.9.1.1.ebuild 2449
+MD5 0634ebc8d268c8fa6cbe516573e12b3d tikiwiki-1.9.1.1.ebuild 2416
+MD5 5a784470ea77c05d6eaeae69d28eeffe tikiwiki-1.9.2.ebuild 2415
 MD5 a1719a8cde06741a7a437cafe9e090a8 tikiwiki-1.8.6.ebuild 2069
-MD5 e615e4ddd333331254eaa39b81ef17f0 ChangeLog 5637
+MD5 b60adbf9d43c16b975be552a859e0a70 ChangeLog 5781
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 250716051f339a0b1315218e13485039 files/postinstall-en.txt 1396
 MD5 179db1005cef09973bc3ffda69a7bb11 files/digest-tikiwiki-1.8.6 68
+MD5 eaed663821be60f11ff2e161e56b7a45 files/digest-tikiwiki-1.9.2 68
 MD5 7d874ec5f99ae67c3ae819a0d6aec572 files/digest-tikiwiki-1.9.1.1 70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDX3PIEzitwsaoONoRAoY+AJ0QUsx9OxF6LDEdgorRe8s06R46rgCeLZHk
-lQfnQMYigNMD2oX/saV1uV4=
-=8lVE
+iD8DBQFDb449EzitwsaoONoRAs+3AKDDsbCZBWiA6tM3+mTqthkvvyw+/wCgv0vs
+g3BfFT0NqOwrWo+7aa+9esk=
+=jaKk
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.2 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.2
new file mode 100644
index 000000000000..294f1e9351de
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.2
@@ -0,0 +1 @@
+MD5 e901e99135de34ee7d1e9e150fd02e5c tikiwiki-1.9.2.tar.bz2 6323845
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild
index 6ff8d43c2bdf..b9663c7fac9f 100644
--- a/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.1.ebuild,v 1.2 2005/10/24 19:53:22 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild,v 1.3 2005/11/07 17:26:00 rl03 Exp $
 
 inherit webapp
 
@@ -80,7 +80,7 @@ pkg_config() {
 
 pkg_postinst() {
 	einfo "To setup a MySQL database, run:"
-	einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\""
+	einfo "\"emerge --config =${PF}\""
 	einfo "If you are using PostgreSQL, consult your documentation"
 	webapp_pkg_postinst
 }
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild
new file mode 100644
index 000000000000..e0cd2a54d716
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild
@@ -0,0 +1,86 @@
+# 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.2.ebuild,v 1.1 2005/11/07 17:26:00 rl03 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"
+IUSE="mysql postgres graphviz"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="virtual/php
+	mysql? ( >=dev-db/mysql-4 )
+	postgres? ( dev-db/postgresql )
+	graphviz? ( media-gfx/graphviz )
+"
+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/trackers 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 -pPR [[: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
+
+	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 "\"emerge --config =${PF}\""
+	einfo "If you are using PostgreSQL, consult your documentation"
+	webapp_pkg_postinst
+}