Version bump

(Portage version: 2.0.51.22-r2)

9 files changed, 97 insertions, 99 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index a387bd23cdf2..2d585dfbff33 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,14 @@
 # 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.18 2005/08/23 19:32:54 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.19 2005/08/24 22:40:37 rl03 Exp $
+
+*tikiwiki-1.9.1 (24 Aug 2005)
+*tikiwiki-1.8.6 (24 Aug 2005)
+
+  24 Aug 2005; Renat Lumpau <rl03@gentoo.org> -files/xmlrpc2-1.9.0.patch,
+  tikiwiki-1.8.5-r2.ebuild, +tikiwiki-1.8.6.ebuild,
+  -tikiwiki-1.9.0-r1.ebuild, +tikiwiki-1.9.1.ebuild:
+  Version bump
 
   23 Aug 2005; Renat Lumpau <rl03@gentoo.org> tikiwiki-1.9.0-r1.ebuild:
   Fixing cp -a wrt bug #103487
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 5f069af6c3c6..a97383cf1f51 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3b16cbdf59ebda0b13fdb6066503ae0c tikiwiki-1.9.0-r1.ebuild 2581
-MD5 9e6f558c7e3fe223eb0f506f6e62b429 tikiwiki-1.8.5-r2.ebuild 2329
+MD5 77a395b9e252a913516a95f5c6a4a2b0 tikiwiki-1.8.6.ebuild 2074
+MD5 7909a5cfddfbeffca6976cba3803d257 tikiwiki-1.8.5-r2.ebuild 2160
 MD5 60e8fc972b683dda9043a3eb64d84524 ChangeLog 4879
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
+MD5 0e91b59a120ed910fe5888d9a951c20b tikiwiki-1.9.1.ebuild 2507
 MD5 a43526d55fa814d5e9af0042767a6600 files/postinstall-en.txt 1407
 MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r2 68
-MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0-r1 68
-MD5 f9b53d80344d059dda253d001af38c8c files/xmlrpc2-1.9.0.patch 2587
+MD5 179db1005cef09973bc3ffda69a7bb11 files/digest-tikiwiki-1.8.6 68
+MD5 2aca7d1af17e4d10481d0f62be41ffa8 files/digest-tikiwiki-1.9.1 68
 MD5 b0640c9b04a5e76a0a888afbe7860c41 files/xmlrpc2-1.8.5.patch 2587
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDC3n/EzitwsaoONoRAvzcAKC9B4phyWsEqJvwsredYeSFHB4LnQCfY21g
-4UJApjQRDBuOVxgc+2pxWPE=
-=kYuF
------END PGP SIGNATURE-----
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.6 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.6
new file mode 100644
index 000000000000..b179914e0c16
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.6
@@ -0,0 +1 @@
+MD5 ecb6fa251513bc55fac55f42c205e6ca tikiwiki-1.8.6.tar.bz2 5749474
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0-r1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0-r1
deleted file mode 100644
index baa90951f379..000000000000
--- a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 524deba410cc17048781b3a999d7b509 tikiwiki-1.9.0.tar.bz2 6007822
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.1
new file mode 100644
index 000000000000..8d479581c85c
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.1
@@ -0,0 +1 @@
+MD5 7f90436540d06efc323fb8300d41f62c tikiwiki-1.9.1.tar.bz2 6151786
diff --git a/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch b/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch
deleted file mode 100644
index 9b0e2302e152..000000000000
--- a/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- commxmlrpc.php.old	2005-08-21 15:01:21.000000000 -0400
-+++ commxmlrpc.php	2005-08-21 15:01:57.000000000 -0400
-@@ -10,8 +10,7 @@
- 
- include_once ('lib/tikilib.php');
- include_once ('lib/userslib.php');
--include_once ("lib/xmlrpc.inc");
--include_once ("lib/xmlrpcs.inc");
-+include_once ("XML/Server.php");
- include_once ('lib/commcenter/commlib.php');
- 
- $tikilib = new Tikilib($dbTiki);
-@@ -26,7 +25,7 @@
- 	"sendArticle" => array("function" => "sendArticle")
- );
- 
--$s = new xmlrpc_server($map);
-+$s = new XML_RPC_Server($map);
- 
- /* Validates the user and returns user information */
- function sendPage($params) {
-@@ -49,18 +48,18 @@
- 	$description = $pp->scalarval();
- 	// 
- 	if (!$userlib->validate_user($username, $password, '', '')) {
--		return new xmlrpcresp(0, 101, "Invalid username or password");
-+		return new XML_RPC_Response(0, 101, "Invalid username or password");
- 	}
- 
- 	// Verify if the user has tiki_p_sendme_pages
- 	if (!$userlib->user_has_permission($username, 'tiki_p_sendme_pages')) {
--		return new xmlrpcresp(0, 101, "Permissions denied user $username cannot send pages to this site");
-+		return new XML_RPC_Response(0, 101, "Permissions denied user $username cannot send pages to this site");
- 	}
- 
- 	// Store the page in the tiki_received_pages_table
- 	$data = base64_decode($data);
- 	$commlib->receive_page($pageName, $data, $comment, $site, $username, $description);
--	return new xmlrpcresp(new xmlrpcval(1, "boolean"));
-+	return new XML_RPC_Response(new XML_RPC_Value(1, "boolean"));
- }
- 
- function sendArticle($params) {
-@@ -114,12 +113,12 @@
- 
- 	// 
- 	if (!$userlib->validate_user($username, $password, '', '')) {
--		return new xmlrpcresp(0, 101, "Invalid username or password");
-+		return new XML_RPC_Response(0, 101, "Invalid username or password");
- 	}
- 
- 	// Verify if the user has tiki_p_sendme_pages
- 	if (!$userlib->user_has_permission($username, 'tiki_p_sendme_articles')) {
--		return new xmlrpcresp(0, 101, "Permissions denied user $username cannot send articles to this site");
-+		return new XML_RPC_Response(0, 101, "Permissions denied user $username cannot send articles to this site");
- 	}
- 
- 	// Store the page in the tiki_received_pages_table
-@@ -132,7 +131,7 @@
- 	$commlib->receive_article($site, $username, $title, $authorName, $size, $use_image, $image_name, $image_type, $image_size,
- 		$image_x, $image_y, $image_data, $publishDate, $expireDate, $created, $heading, $body, $hash, $author, $type, $rating);
- 
--	return new xmlrpcresp(new xmlrpcval(1, "boolean"));
-+	return new XML_RPC_Response(new XML_RPC_Value(1, "boolean"));
- }
- 
- ?>
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.5-r2.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.5-r2.ebuild
index c897ba3a5123..d00ebfc9b41d 100644
--- a/www-apps/tikiwiki/tikiwiki-1.8.5-r2.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.8.5-r2.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.8.5-r2.ebuild,v 1.2 2005/08/22 20:18:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.5-r2.ebuild,v 1.3 2005/08/24 22:40:37 rl03 Exp $
 
 inherit eutils webapp
 
@@ -65,12 +65,6 @@ src_install() {
 		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
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild
new file mode 100644
index 000000000000..c1e0b6e2a0b3
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild
@@ -0,0 +1,77 @@
+# 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.8.6.ebuild,v 1.1 2005/08/24 22:40:37 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=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+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 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
+
+	# 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
+	einfo
+	einfo
+	einfo "Now, point your browser to the location of tiki-install.php"
+	einfo "    ==> e.g. http://localhost/tikiwiki/tiki-install.php"
+	einfo
+}
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.0-r1.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.1.ebuild
index 5d186eba6c96..7d04fdb4ddd1 100644
--- a/www-apps/tikiwiki/tikiwiki-1.9.0-r1.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.9.1.ebuild
@@ -1,8 +1,8 @@
 # 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-r1.ebuild,v 1.3 2005/08/23 19:32:54 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.1.ebuild,v 1.1 2005/08/24 22:40:37 rl03 Exp $
 
-inherit webapp eutils
+inherit webapp
 
 DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates"
 HOMEPAGE="http://tikiwiki.org/"
@@ -17,12 +17,6 @@ RDEPEND="virtual/php
 	postgres? ( dev-db/postgresql )
 	graphviz? ( media-gfx/graphviz )
 "
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/xmlrpc2-${PV}.patch
-}
-
 pkg_setup () {
 	webapp_pkg_setup
 	einfo "Make sure your PHP is compiled with mysql or postgres support"
@@ -34,7 +28,7 @@ src_install() {
 
 	local DIR
 	local DIRENTRY
-	local DIRS="backups db dump files img/wiki
+	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"