Version bump

(Portage version: 2.1_pre9-r5)
 (Signed Manifest commit)

3 files changed, 15 insertions, 101 deletions

diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 2d8c4ad14c06..a4449fe6868a 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -6,19 +6,19 @@ MD5 250716051f339a0b1315218e13485039 files/postinstall-en.txt 1396
 RMD160 151da6a1f93f1df11d8d0ebac08bf22ec258612e files/postinstall-en.txt 1396
 SHA256 2b6d9b93ab840a7368810b76486050b54b260d40671b36b22a85c2cc6540f8ea files/postinstall-en.txt 1396
 DIST tikiwiki-1.9.1.1.tar.bz2 6109980 size 6109980
-DIST tikiwiki-1.9.3.tar.bz2 6534047 RMD160 ae328188074ee98dc4fbd3aff665f2f4095dbe29 SHA256 aabd3e4d056de62981be8fc8ec494818332c55dc8311a1ef97d02dc5a7defe33 size 6534047
+DIST tikiwiki-1.9.3.1.tar.bz2 6522147 RMD160 a4eddb549dc41ade0465f664120538877ba0c475 SHA256 0e7c8c56424017609064dc5a45ca573cf47e773bdb6b5d3e457f89cd690ea7a4 size 6522147
 EBUILD tikiwiki-1.9.1.1.ebuild 2415 RMD160 c7c3acfeb6f53c77854674887da0ff6816bfeda2 SHA1 0db245906cbde11c5c9760d50b074e52b35c4d96 SHA256 836a703941ef5c0af13b0a34b2b55212da1889b67258c6818996c6730d262044 size 2415
 MD5 5e3717b01d0ff45124adb5b1d2f04afe tikiwiki-1.9.1.1.ebuild 2415
 RMD160 c7c3acfeb6f53c77854674887da0ff6816bfeda2 tikiwiki-1.9.1.1.ebuild 2415
 SHA256 836a703941ef5c0af13b0a34b2b55212da1889b67258c6818996c6730d262044 tikiwiki-1.9.1.1.ebuild 2415
-EBUILD tikiwiki-1.9.3.ebuild 2348 RMD160 21dcad434f7fb2f7b278c45f20e5b5aa5ffe992e SHA1 a47f918d030a6d2dc3ae3c7681b894ab1de20ced SHA256 8aeea6cae64485a08678c1f2fe500bd7b51c2d717f8b06cda6326f849c7aa641 size 2348
-MD5 4be5a42a6e782b44b9402d7ec64214f6 tikiwiki-1.9.3.ebuild 2348
-RMD160 21dcad434f7fb2f7b278c45f20e5b5aa5ffe992e tikiwiki-1.9.3.ebuild 2348
-SHA256 8aeea6cae64485a08678c1f2fe500bd7b51c2d717f8b06cda6326f849c7aa641 tikiwiki-1.9.3.ebuild 2348
-MISC ChangeLog 6087 RMD160 a84e36df1ec068efbb53a8c5aa9b4254cf3bcbd8 SHA1 13f88ed79d132e9e8e5fcfda883c2e271e148115 SHA256 e706b88a1862c256e45917b4578513f09ac877bdc70efcc6f7c7b5f7cff28057 size 6087
-MD5 4a1e87d011013b9c71e253d42d7c941b ChangeLog 6087
-RMD160 a84e36df1ec068efbb53a8c5aa9b4254cf3bcbd8 ChangeLog 6087
-SHA256 e706b88a1862c256e45917b4578513f09ac877bdc70efcc6f7c7b5f7cff28057 ChangeLog 6087
+EBUILD tikiwiki-1.9.3.1.ebuild 2350 RMD160 dfa7164757c1c568e89c1d9753d37737c6c2bc3c SHA1 0c949b934251cc9046336ca249c9faeb6fa67841 SHA256 67d8aff606c1ffde30145ee40d1924a6d5076ac8f050939596e9ce7a22df0b68 size 2350
+MD5 ba8dfbf32fe3e6432b518ea2a89c57ce tikiwiki-1.9.3.1.ebuild 2350
+RMD160 dfa7164757c1c568e89c1d9753d37737c6c2bc3c tikiwiki-1.9.3.1.ebuild 2350
+SHA256 67d8aff606c1ffde30145ee40d1924a6d5076ac8f050939596e9ce7a22df0b68 tikiwiki-1.9.3.1.ebuild 2350
+MISC ChangeLog 6234 RMD160 3e2b628d5a03f39761062c8ea09d259c85b0633c SHA1 ee2629083111348f90c2443d53382327c9b20faf SHA256 96f052ead1223c0d14df9694653b8ea9a0cfbc2d27fdf8cb8cce148198a6cef4 size 6234
+MD5 152feb1c92696ad91f09541a3635bb2a ChangeLog 6234
+RMD160 3e2b628d5a03f39761062c8ea09d259c85b0633c ChangeLog 6234
+SHA256 96f052ead1223c0d14df9694653b8ea9a0cfbc2d27fdf8cb8cce148198a6cef4 ChangeLog 6234
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a size 280
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
@@ -26,13 +26,13 @@ SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a metadata
 MD5 7d874ec5f99ae67c3ae819a0d6aec572 files/digest-tikiwiki-1.9.1.1 70
 RMD160 dafaea9e819dbe75887fd717e3be8e587d70a6ff files/digest-tikiwiki-1.9.1.1 70
 SHA256 a09cff701c0b6a0f59aee1f75608823f4e088aebeeca10a08f5a463c10c4a528 files/digest-tikiwiki-1.9.1.1 70
-MD5 843dfa7837045dd6bc0d47ff414e95c3 files/digest-tikiwiki-1.9.3 250
-RMD160 78e22c65ea78780b6b0e2455442cfe5dd0b89219 files/digest-tikiwiki-1.9.3 250
-SHA256 79e01fecdff1bca83e909a0ccbc5582390ed0cb970b88fe25b73950bcea74a2b files/digest-tikiwiki-1.9.3 250
+MD5 d3843b103b10981ae8397e05f88035df files/digest-tikiwiki-1.9.3.1 256
+RMD160 5e21055f9130c705cdb5e9cccef9fe82ed971685 files/digest-tikiwiki-1.9.3.1 256
+SHA256 cd2055090c46dac6ac4df148ceebd17e9f6fb13f15aaef6d8ceb5ebcc3346f4a files/digest-tikiwiki-1.9.3.1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEVM5YEzitwsaoONoRAjnqAJ4hBZHctJIhnZJ71QsqfFMyyBa+2wCgju1Q
-/HzZJiwN7zNH4hWejVjJgDg=
-=mkPR
+iD8DBQFEWgnqEzitwsaoONoRApwxAJ9YeGi+Gicvfk4cOq8PXs0IeDZTUACfV5cO
+zZRNuhuFvQH6/TgBJbttWrM=
+=+yia
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.3 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.3
deleted file mode 100644
index 8ca2145a2c6c..000000000000
--- a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5aed26961df2ef07eba3b98ec6467853 tikiwiki-1.9.3.tar.bz2 6534047
-RMD160 ae328188074ee98dc4fbd3aff665f2f4095dbe29 tikiwiki-1.9.3.tar.bz2 6534047
-SHA256 aabd3e4d056de62981be8fc8ec494818332c55dc8311a1ef97d02dc5a7defe33 tikiwiki-1.9.3.tar.bz2 6534047
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.3.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.3.ebuild
deleted file mode 100644
index 671381181978..000000000000
--- a/www-apps/tikiwiki/tikiwiki-1.9.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.3.ebuild,v 1.1 2006/04/30 14:48:46 rl03 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="virtual/php
-	mysql? ( >=dev-db/mysql-4 )
-	postgres? ( dev-db/postgresql )
-	graphviz? ( media-gfx/graphviz )
-"
-pkg_setup () {
-	webapp_pkg_setup
-	use mysql && require_php_with_use mysql
-	use postgres && require_php_with_use postgres
-}
-
-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
-		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
-}