www-apps/wikini: Remove old. Fix postinstall instructions, configuration. Fix dependencies, do not depend on mysql and just check for needed php features instead. Quoting.

svn path=/experimental/; revision=422

7 files changed, 55 insertions, 66 deletions

diff --git a/www-apps/wikini/ChangeLog b/www-apps/wikini/ChangeLog
index cf17662..e82918a 100644
--- a/www-apps/wikini/ChangeLog
+++ b/www-apps/wikini/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for www-apps/wikini
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Sep 2007; Jakub Moc <jakub@gentoo.org> files/postinstall-en.txt,
+  +metadata.xml, -wikini-0.4.3.ebuild, wikini-0.4.4.ebuild:
+  Remove old. Fix postinstall instructions, configuration. Fix dependencies,
+  do not depend on mysql and just check for needed php features instead.
+  Quoting.
+
   05 Dec 2006; Emanuele Gentili <bathym@0x656d67.org> +wikini-0.4.4.ebuild:
   Version bump
 
diff --git a/www-apps/wikini/Manifest b/www-apps/wikini/Manifest
index 3a459bb..d45bf31 100644
--- a/www-apps/wikini/Manifest
+++ b/www-apps/wikini/Manifest
@@ -1,28 +1,24 @@
-AUX postinstall-en.txt 349 RMD160 ad7d5b544bdcfc29187cd9c32e0a31f78dbf71ea SHA1 d43ba36c355ca6bde82aa37ff5e8cf65811eadf8 SHA256 08cb59cc687e36d44a5e22fa19976c8d4da8f265e993ba55d861a129979be469
-MD5 5a24b3b57cf6595264e47bcae5a8ac8c files/postinstall-en.txt 349
-RMD160 ad7d5b544bdcfc29187cd9c32e0a31f78dbf71ea files/postinstall-en.txt 349
-SHA256 08cb59cc687e36d44a5e22fa19976c8d4da8f265e993ba55d861a129979be469 files/postinstall-en.txt 349
+AUX postinstall-en.txt 341 RMD160 4ba376287382949cf43d0920193f66b1fa0956a6 SHA1 4cfb69c3761568d6e3c4c360cc962d003376cfae SHA256 646647d585201c673c9007b7680a566c5df70b0cbd0fe07da256c69b054e3d3e
+MD5 373ec732b5e469dc4d7cd99e738d7662 files/postinstall-en.txt 341
+RMD160 4ba376287382949cf43d0920193f66b1fa0956a6 files/postinstall-en.txt 341
+SHA256 646647d585201c673c9007b7680a566c5df70b0cbd0fe07da256c69b054e3d3e files/postinstall-en.txt 341
 AUX reconfig 456 RMD160 a92a0a9197a6c63af735f202901e0ebfcf8da432 SHA1 00b2c6dd965d7e77af5aac04d13351d2de93d0c8 SHA256 c4d72d2a6cdfcaecc6620f435afc19c7f93b8edc15bdd2a57857d6e75a23828b
 MD5 fa12ae431502af1e80c97ff1fdc70651 files/reconfig 456
 RMD160 a92a0a9197a6c63af735f202901e0ebfcf8da432 files/reconfig 456
 SHA256 c4d72d2a6cdfcaecc6620f435afc19c7f93b8edc15bdd2a57857d6e75a23828b files/reconfig 456
-DIST wikini-0.4.3.tar.gz 67860 RMD160 620712763e6d7a1880d9a5ef452a09d5b16b68df SHA1 566a94e11f209630ce37b34fa9a7b40347289155 SHA256 15db34372bd7d26d4c0a5929fed5c634f776314f9a5e7711f1cb36c4b86238d5
 DIST wikini-0.4.4.tar.gz 69961 RMD160 88101a1f6073e2f964fb028db57d94f48452dde1 SHA1 48e46568b7c3fd0c47e61810fb69adabb043ba6c SHA256 779e26c69ce26d8620daefa598d13334fdeca08cd740e7e0a2b015664512d0ca
-EBUILD wikini-0.4.3.ebuild 617 RMD160 73bc91315a73951cf6acc16b5030315148337862 SHA1 7a299fa40fa0bbea233c1e905cb9cc5bf06b796a SHA256 ba7c0d597d20ccd85a46bbade00de995df966e5da23264e6926e5b7354863093
-MD5 62770090b3dd3171148a4a5233a92a39 wikini-0.4.3.ebuild 617
-RMD160 73bc91315a73951cf6acc16b5030315148337862 wikini-0.4.3.ebuild 617
-SHA256 ba7c0d597d20ccd85a46bbade00de995df966e5da23264e6926e5b7354863093 wikini-0.4.3.ebuild 617
-EBUILD wikini-0.4.4.ebuild 617 RMD160 25d09c81fbf9c5d0d9fd33bc9e4183ddadc847d3 SHA1 c0928e66c7843845392d9167d2a384884fe4953f SHA256 a122b25a5564a6fc8da9aeebad7077bff5581c99d5d604ed748c06e6933481f3
-MD5 b479795e2950c3bc6d5885e836b1751b wikini-0.4.4.ebuild 617
-RMD160 25d09c81fbf9c5d0d9fd33bc9e4183ddadc847d3 wikini-0.4.4.ebuild 617
-SHA256 a122b25a5564a6fc8da9aeebad7077bff5581c99d5d604ed748c06e6933481f3 wikini-0.4.4.ebuild 617
-MISC ChangeLog 299 RMD160 9f0ab915a872305a18052792cc31aa363e0c78f2 SHA1 71c606288bf5efcdf8a1a66c4b9dbfbd3f97f7e9 SHA256 2a3fdbb445752c06295d40db1de68b1e0f98f46d685eca3ff4a2048b8d0cc1fd
-MD5 4394ee73dd34fac9fa94000b73e66311 ChangeLog 299
-RMD160 9f0ab915a872305a18052792cc31aa363e0c78f2 ChangeLog 299
-SHA256 2a3fdbb445752c06295d40db1de68b1e0f98f46d685eca3ff4a2048b8d0cc1fd ChangeLog 299
-MD5 152d9d1be10968bd9b42b2257583cad7 files/digest-wikini-0.4.3 235
-RMD160 1fd882b1979d2b2c1f17d5c4c574b1668f262d91 files/digest-wikini-0.4.3 235
-SHA256 2bb74446cb23644a9543199d3911162f1be5ed2b2a6cc8490065140034275b76 files/digest-wikini-0.4.3 235
+EBUILD wikini-0.4.4.ebuild 849 RMD160 b0283c7a923341d5631c0412ed3348002f04bcd5 SHA1 d0265c23a2393f9332bb9824355dd849d226f27d SHA256 e5a82ada49b860fa72a24c67e645ea941a5fdd29da2aea0a546d02c0f35533e3
+MD5 82810c250713fd0321e685d45c8e5960 wikini-0.4.4.ebuild 849
+RMD160 b0283c7a923341d5631c0412ed3348002f04bcd5 wikini-0.4.4.ebuild 849
+SHA256 e5a82ada49b860fa72a24c67e645ea941a5fdd29da2aea0a546d02c0f35533e3 wikini-0.4.4.ebuild 849
+MISC ChangeLog 591 RMD160 1d5ce7f609cc039acc91f71c8364f22883a4000c SHA1 275062e2df789cada89564913cb96806f8e9c2c8 SHA256 fa5aa839546d37212a88d5bdf3f15d9fdb0b026a3a66eed01f22aedddbc76ec3
+MD5 275f32439488318e882821c5bc4a2ac2 ChangeLog 591
+RMD160 1d5ce7f609cc039acc91f71c8364f22883a4000c ChangeLog 591
+SHA256 fa5aa839546d37212a88d5bdf3f15d9fdb0b026a3a66eed01f22aedddbc76ec3 ChangeLog 591
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
+SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata.xml 162
 MD5 b3727bf3f4022be19fe59c3041e9e647 files/digest-wikini-0.4.4 235
 RMD160 8938ed2101d44f9cc3e8bc140302200dd4688610 files/digest-wikini-0.4.4 235
 SHA256 dc7ce105f1f98adcd5c0b77fe6756f10ee291536119b194fe583e3e1ca0ca4dc files/digest-wikini-0.4.4 235
diff --git a/www-apps/wikini/files/digest-wikini-0.4.3 b/www-apps/wikini/files/digest-wikini-0.4.3
deleted file mode 100644
index b7269db..0000000
--- a/www-apps/wikini/files/digest-wikini-0.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d80ca5f9623ad8bf1d18a3b86fb3ab05 wikini-0.4.3.tar.gz 67860
-RMD160 620712763e6d7a1880d9a5ef452a09d5b16b68df wikini-0.4.3.tar.gz 67860
-SHA256 15db34372bd7d26d4c0a5929fed5c634f776314f9a5e7711f1cb36c4b86238d5 wikini-0.4.3.tar.gz 67860
diff --git a/www-apps/wikini/files/postinstall-en.txt b/www-apps/wikini/files/postinstall-en.txt
index 4fe2375..e46f9eb 100644
--- a/www-apps/wikini/files/postinstall-en.txt
+++ b/www-apps/wikini/files/postinstall-en.txt
@@ -6,7 +6,7 @@ You are almost done!
   1. Edit ${VHOST_ROOT}/${PN}-${PVR}/config.php and set database settings.
 
   2. Login on
-  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/admin/install/install.php 
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup/install.php 
   and follow the directions.
 
   3. Don't forget to delete the admin/install directory when you're done!
diff --git a/www-apps/wikini/metadata.xml b/www-apps/wikini/metadata.xml
new file mode 100644
index 0000000..6632069
--- /dev/null
+++ b/www-apps/wikini/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>web-apps</herd>
+</pkgmetadata>
diff --git a/www-apps/wikini/wikini-0.4.3.ebuild b/www-apps/wikini/wikini-0.4.3.ebuild
deleted file mode 100644
index 9d65152..0000000
--- a/www-apps/wikini/wikini-0.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Source: http://bugs.gentoo.org/show_bug.cgi?id=88376
-# Submitted-By: didibaba
-# Reviewed-By: rl03 2005-12-16
-
-inherit webapp
-
-DESCRIPTION="Wikini is yet another wiki written in PHP"
-HOMEPAGE="http://www.wikini.net"
-SRC_URI="http://www.wikini.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-S=${WORKDIR}/${PN}
-
-IUSE=""
-
-RDEPEND="dev-db/mysql
-	virtual/php
-	net-www/apache"
-
-src_install () {
-	webapp_src_preinst
-	dodoc INSTALL README
-	cp -R . ${D}/${MY_HTDOCSDIR}
-	webapp_src_install
-}
diff --git a/www-apps/wikini/wikini-0.4.4.ebuild b/www-apps/wikini/wikini-0.4.4.ebuild
index 680cb07..e8ecd7d 100644
--- a/www-apps/wikini/wikini-0.4.4.ebuild
+++ b/www-apps/wikini/wikini-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,25 +6,40 @@
 # Submitted-By: didibaba
 # Reviewed-By: rl03 2005-12-16
 
-inherit webapp
+inherit webapp depend.apache depend.php
 
-DESCRIPTION="Wikini is yet another wiki written in PHP"
+DESCRIPTION="Yet another wiki written in PHP."
 HOMEPAGE="http://www.wikini.net"
 SRC_URI="http://www.wikini.net/download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 BSD"
 KEYWORDS="~x86"
-S=${WORKDIR}/${PN}
-
 IUSE=""
 
-RDEPEND="dev-db/mysql
-	virtual/php
-	net-www/apache"
+DEPEND=""
+RDEPEND=""
+
+need_php_httpd
+want_apache
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	require_php_with_use mysql
+	webapp_pkg_setup
+}
 
 src_install () {
 	webapp_src_preinst
-	dodoc INSTALL README
-	cp -R . ${D}/${MY_HTDOCSDIR}
+
+	local docs="INSTALL README"
+	dodoc ${docs}
+	rm -f ${docs} COPYING LICENSE
+
+	cp -R . "${D}"/${MY_HTDOCSDIR}
+
+	touch ${MY_HTDOCSDIR}/wakka.config.php
+	webapp_serverowned ${MY_HTDOCSDIR}/wakka.config.php
+
 	webapp_src_install
 }