Fixes for #116346, removed old version.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 36 insertions, 98 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index 1a8e5017cd81..3562d567afd7 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,10 @@
 # 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.24 2005/11/07 17:26:00 rl03 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.25 2006/02/07 14:16:48 rl03 Exp $
+
+  07 Feb 2006; Renat Lumpau <rl03@gentoo.org> -tikiwiki-1.8.6.ebuild,
+  tikiwiki-1.9.1.1.ebuild, tikiwiki-1.9.2.ebuild:
+  Fixes for #116346, removed old version.
 
 *tikiwiki-1.9.2 (07 Nov 2005)
 
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 0eb5d57dc380..48e56d35375b 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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 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 67ee76a3fd5a0b2c72b433bb8772a545 ChangeLog 5944
+RMD160 825290c08edecc5ccf185fd723933f8465f59335 ChangeLog 5944
+SHA256 18db001b3da63b3128b671b87656d784464f4e7cea734cb774cfc2a521620462 ChangeLog 5944
 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 eaed663821be60f11ff2e161e56b7a45 files/digest-tikiwiki-1.9.2 68
+RMD160 d4c08e5365d2cdf2a1b6e3b441a8f6a35e78754a files/digest-tikiwiki-1.9.2 68
+SHA256 6d3fe878baf31f98e6e5729f223aeaf19a2a8056b8b5d415e9d58d5b379ff073 files/digest-tikiwiki-1.9.2 68
+MD5 250716051f339a0b1315218e13485039 files/postinstall-en.txt 1396
+RMD160 151da6a1f93f1df11d8d0ebac08bf22ec258612e files/postinstall-en.txt 1396
+SHA256 2b6d9b93ab840a7368810b76486050b54b260d40671b36b22a85c2cc6540f8ea files/postinstall-en.txt 1396
+MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
+RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
+SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a metadata.xml 280
+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
+MD5 b7dc96ca0f642c01f7714040ef23c149 tikiwiki-1.9.2.ebuild 2414
+RMD160 a5c60cbe1cfb82085df48555b7633359a589be43 tikiwiki-1.9.2.ebuild 2414
+SHA256 63d8e247acb076e8b572f7a3f11c75d6d7f99e9c39d84504c3230ebb74bdb230 tikiwiki-1.9.2.ebuild 2414
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDb449EzitwsaoONoRAs+3AKDDsbCZBWiA6tM3+mTqthkvvyw+/wCgv0vs
-g3BfFT0NqOwrWo+7aa+9esk=
-=jaKk
+iD8DBQFD6KveEzitwsaoONoRAhzQAJsGNKLbFjr6nI2GqoiJ2Y2Ml5+JPwCeO7Za
+6ygZ0aND+MuGGhwcze9KrnE=
+=kYAU
 -----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
deleted file mode 100644
index b179914e0c16..000000000000
--- a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ecb6fa251513bc55fac55f42c205e6ca tikiwiki-1.8.6.tar.bz2 5749474
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild
deleted file mode 100644
index c1e0b6e2a0b3..000000000000
--- a/www-apps/tikiwiki/tikiwiki-1.8.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.1.1.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild
index b9663c7fac9f..91918289d7c0 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
+# 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.1.1.ebuild,v 1.3 2005/11/07 17:26:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.1.1.ebuild,v 1.4 2006/02/07 14:16:48 rl03 Exp $
 
 inherit webapp
 
@@ -20,7 +20,7 @@ RDEPEND="virtual/php
 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"
+	einfo "If you need PDF generation, make sure your PHP is emerged with xml"
 }
 
 src_install() {
diff --git a/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild
index e0cd2a54d716..374deb9c84e9 100644
--- a/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild
+++ b/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.2.ebuild,v 1.1 2005/11/07 17:26:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.2.ebuild,v 1.2 2006/02/07 14:16:48 rl03 Exp $
 
 inherit webapp
 
@@ -20,7 +20,7 @@ RDEPEND="virtual/php
 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"
+	einfo "If you need PDF generation, make sure your PHP is emerged with xml"
 }
 
 src_install() {