Relaese candidate version of knowledge tree. Will be moved to portage once the final version is out

svn path=/experimental/; revision=153

8 files changed, 69 insertions, 110 deletions

diff --git a/www-apps/knowledgetree/Manifest b/www-apps/knowledgetree/Manifest
index 3c5ffa2..1c69ebc 100644
--- a/www-apps/knowledgetree/Manifest
+++ b/www-apps/knowledgetree/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6bd6ef4ff11bf403c2b526fbda762a76 knowledgetree-2.0.7.ebuild 2089
 MD5 6825d224fe9c17120e3156bb88d4ae54 ChangeLog 555
+MD5 5f236977b17d994ff00a738f48495fcc files/digest-knowledgetree-3.0_rc1 70
+MD5 b0daa00c89fbf134b303433e064933ea files/postinstall-en-3.0.0.txt 1514
+MD5 3c8cbcab8cca3d5f9c18657b5a0f7ba8 files/postupgrade-en-3.0.0.txt 251
+MD5 6dffd653a47972fd2fd5cba53f983250 knowledgetree-3.0_rc1.ebuild 1867
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 cdffaf0b390060eab7ac6e2146e91123 files/postinstall-en-2.0.7.txt 1848
-MD5 74f02fdd8e803af4673121fe6df90ae4 files/digest-knowledgetree-2.0.7 68
-MD5 3b1ebecb999e40f5b64494b9b9e34096 files/config-hook-2.0.0.sh 251
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDClgUEzitwsaoONoRAqZSAKDey7LS6xkf4TujYXoSXFHkiztc5ACgn0SB
-KDB3Cmj8seY4CRLXkrjVF5Y=
-=11tp
------END PGP SIGNATURE-----
diff --git a/www-apps/knowledgetree/files/config-hook-2.0.0.sh b/www-apps/knowledgetree/files/config-hook-2.0.0.sh
deleted file mode 100644
index cd86b6a..0000000
--- a/www-apps/knowledgetree/files/config-hook-2.0.0.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Sets installation directory and hostname when installing knowledgeTree
-
-if [ "x$1"=="xinstall" ]; then
-    cd ${MY_INSTALLDIR}/config
-    sed -i -e "s#default->rootUrl  = \"\"#default->rootUrl  = \"${VHOST_APPDIR}\"#" environment.php
-fi
diff --git a/www-apps/knowledgetree/files/digest-knowledgetree-2.0.7 b/www-apps/knowledgetree/files/digest-knowledgetree-2.0.7
deleted file mode 100644
index 352d94b..0000000
--- a/www-apps/knowledgetree/files/digest-knowledgetree-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f17896400535a4ad2159e3ff05a0f1e0 knowledgeTree-2.0.7.tgz 806523
diff --git a/www-apps/knowledgetree/files/digest-knowledgetree-3.0_rc1 b/www-apps/knowledgetree/files/digest-knowledgetree-3.0_rc1
new file mode 100644
index 0000000..285265d
--- /dev/null
+++ b/www-apps/knowledgetree/files/digest-knowledgetree-3.0_rc1
@@ -0,0 +1 @@
+MD5 f9788e33321e6fb7dbeb8f25dd057c24 knowledgeTree-3.0rc1.tgz 2161934
diff --git a/www-apps/knowledgetree/files/postinstall-en-2.0.7.txt b/www-apps/knowledgetree/files/postinstall-en-2.0.7.txt
deleted file mode 100644
index f62b4f2..0000000
--- a/www-apps/knowledgetree/files/postinstall-en-2.0.7.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-------------------------------------------------------------------------
-INSTALLATION
-
-The ebuild installs most parts of knowledgeTree automatically, but 
-you will have to create a database for the document management system.
-
-You can do this using the following commands as the mysql root user:
-
-> mysql -u root -p -e "CREATE DATABASE dms;
-                       GRANT SELECT, INSERT, UPDATE, DELETE ON dms.* TO 'dms'@'localhost' 
-		       IDENTIFIED BY 'pass';
-                       FLUSH PRIVILEGES;"
-
-> mysql -u root -p -e "GRANT ALL PRIVILEGES ON dms.* TO 'dmsadmin'@'localhost' 
-		       IDENTIFIED BY 'pass';
-                       FLUSH PRIVILEGES;"
-
-Please do not forget to choose a password that is more sensible than 
-'pass' ;)
-
-Now as user "dmsadmin":
-
-> mysql -u dmsadmin -ppass dms < ${MY_HTDOCSDIR}/sql/mysql/install/structure.sql
-> mysql -u dmsadmin -ppass dms < ${MY_HTDOCSDIR}/sql/mysql/install/data.sql
-
-You also need to set the MySQL passwords for the dms and dmsadmin user in 
-the ${MY_INSTALLDIR}/config/environment.php file so that knowledgeTree can
-access the database.
-
-Now you can go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR} and log in
-as user "admin" with the password "admin".
-
-------------------------------------------------------------------------
-UPGRADE
-
-To upgrade from version prior to 2.0.2 please run the necessary sql
-upgrade scripts. All upgrades after 2.0.2 can be done automatically
-from within the web frontend.
-
-> mysql -u dms -ppass dms < ${MY_HTDOCSDIR}/sql/mysql/upgrade/1.2.4-to-2.0.0.sql
-> mysql -u dms -ppass dms < ${MY_HTDOCSDIR}/sql/mysql/upgrade/2.0.0-to-2.0.1.sql
-> mysql -u dms -ppass dms < ${MY_HTDOCSDIR}/sql/mysql/upgrade/2.0.1-to-2.0.2.sql
-
-Please also refer to /usr/share/doc/knowledgetree-2.0.7/UPGRADE.txt.gz
-
-------------------------------------------------------------------------
diff --git a/www-apps/knowledgetree/files/postinstall-en-3.0.0.txt b/www-apps/knowledgetree/files/postinstall-en-3.0.0.txt
new file mode 100644
index 0000000..d631fb2
--- /dev/null
+++ b/www-apps/knowledgetree/files/postinstall-en-3.0.0.txt
@@ -0,0 +1,41 @@
+------------------------------------------------------------------------
+INSTALLATION
+
+The ebuild installs most parts of knowledgeTree automatically, but 
+you will have to create a database for the document management system.
+
+You can do this using the following commands as the mysql root user:
+
+> mysql -u root -p <<EOF
+  CREATE DATABASE dms;
+  GRANT SELECT, INSERT, UPDATE, DELETE ON dms.* TO 'dms'@'localhost' IDENTIFIED BY 'djw9281js';
+  FLUSH PRIVILEGES;
+EOF
+
+> mysql -u root -p <<EOF 
+  GRANT ALL PRIVILEGES ON dms.* TO 'dmsadmin'@'localhost' IDENTIFIED BY 'js9281djw';
+  FLUSH PRIVILEGES;
+EOF
+
+Please do not forget to choose a different password than
+'js9281djw'. This is just the standard password stored as a default in
+${MY_INSTALLDIR}/config/config.ini.
+
+Now as user "dmsadmin":
+
+> mysql -u dmsadmin -pjs9281djw dms < ${MY_HTDOCSDIR}/sql/mysql/install/structure.sql
+> mysql -u dmsadmin -pjs9281djw dms < ${MY_HTDOCSDIR}/sql/mysql/install/data.sql
+
+Now you need to set the MySQL passwords for the dms and dmsadmin user
+in the ${MY_INSTALLDIR}/config/config.ini file so that knowledgeTree
+can access the database.
+
+Now you can go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR} and log in
+as user "admin" with the password "admin".
+
+------------------------------------------------------------------------
+POSTGRES
+
+You can also use knowledgtree with postgres. This ebuild currently
+does not provide support for it but if there is a need for it, please
+submit a feature request to the gentoo buzilla system.
diff --git a/www-apps/knowledgetree/files/postupgrade-en-3.0.0.txt b/www-apps/knowledgetree/files/postupgrade-en-3.0.0.txt
new file mode 100644
index 0000000..3291d20
--- /dev/null
+++ b/www-apps/knowledgetree/files/postupgrade-en-3.0.0.txt
@@ -0,0 +1,7 @@
+------------------------------------------------------------------------
+UPGRADE
+
+Go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup/upgrade.php and 
+follow the instructions.
+
+------------------------------------------------------------------------
diff --git a/www-apps/knowledgetree/knowledgetree-3.0_rc1.ebuild b/www-apps/knowledgetree/knowledgetree-3.0_rc1.ebuild
index ab37a91..39d88fe 100644
--- a/www-apps/knowledgetree/knowledgetree-3.0_rc1.ebuild
+++ b/www-apps/knowledgetree/knowledgetree-3.0_rc1.ebuild
@@ -19,77 +19,51 @@ IUSE=""
 DEPEND="
 		virtual/httpd-php
 		dev-db/mysql
-        dev-php/smarty
-		dev-php/PEAR-Config
-		dev-php/PEAR-DB
-		dev-php/PEAR-Log
-		dev-php/PEAR-Net_URL
-		dev-php/PEAR-Net_LDAP
 		"
 
 S=${WORKDIR}/${MY_PN}
 
-src_unpack() {
-
-	unpack ${A} && cd "${S}"
-
-	## The ebuild depends on PEAR-DB and PEAR-Log.
-	## No need for additional PEAR library files
-	rm -rf thirdparty
-
-	## not running any tests
-	rm -rf tests
-
-	## Example apache, php and mysql config files
-	cd etc
-	for FL in *
-	  do
-	  mv ${FL} example-${FL}
-	done
-}
-
 src_install() {
 	webapp_src_preinst
 
 	local docs="docs/CREDITS.txt
-				docs/ChangeLog.txt
 				docs/INSTALL.txt
 				docs/README.txt
 				docs/TODO.txt
 				docs/UPGRADE.txt
-				docs/faq.txt
-				docs/i18n.txt
-				docs/SearchPermissions.txt
-				sql/mysql/install/user.sql
+				docs/FAQ.txt
 				"
 
-	dodoc ${docs} etc/*
+	dodoc ${docs}
 
 	## Main application
 	cp -r . ${D}${MY_HTDOCSDIR}
 
 	## Docs installed, remove unnecessary files
-	rm -rf ${D}${MY_HTDOCSDIR}/etc
 	for doc in ${docs}
 	do
 	  rm ${D}${MY_HTDOCSDIR}/${doc}
 	done
 
-	for CFG in ${MY_HTDOCSDIR}/config/{browsers.inc,dmsDefaults.php,environment.php,siteMap.inc,tableMappings.inc}
+	for CFG in ${MY_HTDOCSDIR}/config/{config.ini,dmsDefaults.php,siteMap.inc,tableMappings.inc}
 	do
 	  webapp_configfile ${CFG}
 	done
 
 	## Documents will be saved here
-	webapp_serverowned ${MY_HTDOCSDIR}/log
-	webapp_serverowned ${MY_HTDOCSDIR}/Documents
-	webapp_serverowned ${MY_HTDOCSDIR}/Documents/Root\ Folder
-	webapp_serverowned ${MY_HTDOCSDIR}/Documents/Root\ Folder/Default\ Unit
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-2.0.7.txt
-
-	## Fix for the root folder
-	webapp_hook_script ${FILESDIR}/config-hook-2.0.0.sh
+	webapp_serverowned ${MY_HTDOCSDIR}/var/log
+	webapp_serverowned ${MY_HTDOCSDIR}/var/tmp
+	webapp_serverowned ${MY_HTDOCSDIR}/var/Documents
+	webapp_serverowned ${MY_HTDOCSDIR}/var/Documents/Root\ Folder
+	webapp_serverowned ${MY_HTDOCSDIR}/var/Documents/Root\ Folder/Default\ Unit
+
+	webapp_sqlscript mysql    sql/mysql/install/structure.sql
+	webapp_sqlscript mysql    sql/mysql/install/data.sql
+	webapp_sqlscript postgres sql/pgsql/install/tables.sql
+	webapp_sqlscript postgres sql/pgsql/install/functions.sql
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-3.0.0.txt
+	webapp_postupgrade_txt en ${FILESDIR}/postupgrade-en-3.0.0.txt
 
 	webapp_src_install
 }