Added www-apps/tikiwiki-2.2 (sec issue #243854).

Package-Manager: portage-2.1.4.5

3 files changed, 81 insertions, 6 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index b9c2b9af671e..6a5f5cce5941 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/tikiwiki
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.61 2008/09/21 13:09:50 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.62 2008/10/30 15:32:02 wrobel Exp $
+
+*tikiwiki-2.2 (30 Oct 2008)
+
+  30 Oct 2008; Gunnar Wrobel <wrobel@gentoo.org> +tikiwiki-2.2.ebuild:
+  Added www-apps/tikiwiki-2.2 (sec issue #243854).
 
   21 Sep 2008; wrobel@gentoo.org -tikiwiki-1.9.10.1.ebuild:
   Removed vulnerable tikiwiki-1.9.10.1 (#213320).
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index b89708bff1e9..1c5fec216f08 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -3,13 +3,15 @@ Hash: SHA1
 
 AUX postinstall-en.txt 1396 RMD160 151da6a1f93f1df11d8d0ebac08bf22ec258612e SHA1 efd2d6aff5b8d57f8350cc4072555fa4f634eef4 SHA256 2b6d9b93ab840a7368810b76486050b54b260d40671b36b22a85c2cc6540f8ea
 DIST tikiwiki-2.0.tar.bz2 11939595 RMD160 50da9c5e4d876928c66fc6f54b018be81f270aa6 SHA1 de50dc04d623570c167b103e02eb5904892d0f20 SHA256 1e21c13a86e7060a3395f5f6913b4cec50d5f6ae6bced9439b3ecd488d01829e
+DIST tikiwiki-2.2.tar.bz2 12154384 RMD160 3d599de6f9d9d509f024768577d4cafdaf3f15df SHA1 6c0e82ac2b4bdb032e56066941521631ec44a16a SHA256 681823fc80fb9af22ca97dbb8804143d0b8afdd2b222d476cbaf88d6587e3c23
 EBUILD tikiwiki-2.0.ebuild 1965 RMD160 81e542a447f7490f1ffd9aae661e9ce6d2d72068 SHA1 96658f142b5f192acae46890c86b133bd7b780c6 SHA256 03e99a05f00deb4a08421c8256bfd74cae9956731d6fa7bca1f2b9f3c59a2cfa
-MISC ChangeLog 10648 RMD160 d8396bbf90687000797b6572484beb48b2e70be8 SHA1 0c239e08b2cf00ee03342d51be4d1a6cdad2dd7a SHA256 63a2eddbcfe3f1c6067c87d10e226433e095c972234ac420c26f0fcb0fa809da
+EBUILD tikiwiki-2.2.ebuild 1962 RMD160 f53df3ebacf4afca3718186791231d51c3c90cad SHA1 ad742238bbfa88fde5770895e1422ab0793031f8 SHA256 19a4e43d65b2b76ccab815e2e655800cb8f36dda052315975f90ac4c6a46333c
+MISC ChangeLog 10800 RMD160 ae276ec00fb04caf81aeda10fa0c5be5f6947f7f SHA1 f8a0568f624b8c0e1bb7d6d0f178dfd1f9b56614 SHA256 4dfc44ca59a67d34feaece2d56764e110aa5e234eb79fa31d8f9fae72cd0c125
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFI1ke2EEcxCpcDQ74RAisqAKCVhvvywbR9ZQnRv+VIlkpD7ZyiyQCglJZy
-HWs6sqQxCGcwysfZDhus+Rw=
-=Dvgu
+iEYEARECAAYFAkkJ04wACgkQEEcxCpcDQ74PKACfeDMGZE3Qn6AFDNQwla5Wszv1
+QD8An3Rhvm+lAnSJPjGxuw+mU36IIGqg
+=NV5p
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tikiwiki/tikiwiki-2.2.ebuild b/www-apps/tikiwiki/tikiwiki-2.2.ebuild
new file mode 100644
index 000000000000..40ce63a332ff
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-2.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-2.2.ebuild,v 1.1 2008/10/30 15:32:02 wrobel Exp $
+
+inherit webapp depend.php
+
+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="graphviz? ( media-gfx/graphviz )"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+
+	local my_flags=
+	use mysql && my_flags="${my_flags} mysql"
+	use postgres && my_flags="${my_flags} postgres"
+
+	require_php_with_use ${my_flags}
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# 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
+
+	dodoc changelog.txt copyright.txt doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README
+	rm -rf changelog.txt copyright.txt doc/ INSTALL license.txt README
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	local DIR DIRENTRY
+	local DIRS="backups db dump files img/trackers img/wiki
+		img/wiki_up modules/cache temp
+		templates_c templates styles maps whelp mods
+		lib/Galaxia/processes"
+
+	# 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}"
+	webapp_serverowned "${MY_HTDOCSDIR}"/tiki-install.php
+
+	# ensure that directories exist, some don't.
+	# (part of original setup.sh)
+	for DIR in ${DIRS}; do
+		dodir "${MY_HTDOCSDIR}/${DIR}"
+		webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}"
+	done
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}