version bump, stable on x86

Package-Manager: portage-2.0.51.22-r3

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index c8f1c01206e816cbbd32cabffbaadd4cc51d007e..7fcd4b1b567f1e3beb56c0ef79b71139c62d04a2 100644 (file)
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.2 2005/07/25 08:01:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.3 2005/11/20 05:11:07 ramereth Exp $
+
+*dokuwiki-20050922 (20 Nov 2005)
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  dokuwiki-20050713.ebuild, +dokuwiki-20050922.ebuild:
+  * Version bump
+  * Stable on x86
 
   25 Jul 2005; David Holm <dholm@gentoo.org> dokuwiki-20050713.ebuild:
   Added to ~ppc.

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 8419571616f45a088b103801a295a4d685f0061c..dd169f80571da43e18ce2a6b0a5e75a4209e4516 100644 (file)
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1a0bac4701d06df397b392098fcf9e7b ChangeLog 485
-MD5 bf031b62f7b4ac78e0ed331b8825674e dokuwiki-20050713.ebuild 1487
+MD5 81e31544f5fdc97318231fa56e0ecded dokuwiki-20050713.ebuild 1498
+MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704
+MD5 a5c075b4e6fcbe66980fdb13de69a846 ChangeLog 666
+MD5 da4a0bb22291929771c528fcc26566ad dokuwiki-20050922.ebuild 1499
 MD5 a65ef20ee770f09cfcd76f346f3da136 files/digest-dokuwiki-20050713 68
 MD5 1b5b86b6942f3451fc286451dbaf7c4a files/postinstall-en.txt 1590
-MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC1GyI1lqEGTUzyQRAiDOAKCeAeIOGW/TVaRjzbMyr+6ZcHKQmwCfQY6j
-HFYW7CfgPEIl/tSmwM1rDCc=
-=htgb
------END PGP SIGNATURE-----
+MD5 a8cdb48781eb1d76bdd22351814a2b9a files/digest-dokuwiki-20050922 68

diff --git a/www-apps/dokuwiki/dokuwiki-20050713.ebuild b/www-apps/dokuwiki/dokuwiki-20050713.ebuild
index 6d5117ce481bea70c62b0ed2b3e3918e50e4cae7..3f5a844fff6bef52fb99f15195fe6c0c3d8eed94 100644 (file)
--- a/www-apps/dokuwiki/dokuwiki-20050713.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20050713.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/dokuwiki/dokuwiki-20050713.ebuild,v 1.2 2005/07/25 08:01:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20050713.ebuild,v 1.3 2005/11/20 05:11:07 ramereth Exp $
 
 inherit webapp
 
@@ -13,11 +13,11 @@ HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
 SRC_URI="http://www.splitbrain.org/Programming/PHP/DokuWiki/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 DEPEND="virtual/php"
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
 src_unpack() {
        cd ${WORKDIR}

diff --git a/www-apps/dokuwiki/dokuwiki-20050922.ebuild b/www-apps/dokuwiki/dokuwiki-20050922.ebuild
new file mode 100644 (file)
index 0000000..abd0299
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20050922.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20050922.ebuild,v 1.1 2005/11/20 05:11:07 ramereth Exp $
+
+inherit webapp
+
+# Upstream uses dashes in the datestamp
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small companies
+documentation needs."
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
+SRC_URI="http://www.splitbrain.org/Programming/PHP/DokuWiki/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/php"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+       cd ${WORKDIR}
+       unpack ${PN}-${MY_PV}.tgz
+       mv ${PN}-${MY_PV} ${P}
+}
+
+src_compile() {
+       # Default compile hangs
+       echo "Nothing to compile"
+}
+
+src_install() {
+       local docs="README"
+       webapp_src_preinst
+
+       # NOTE: doc files should go into /usr/share/doc, and NOT installed in the vhost
+       einfo "Installing docs"
+       dodoc ${docs}
+       for doc in ${docs} COPYING; do
+               rm -f ${doc}
+       done
+
+       einfo "Copying main files"
+       cp -r . ${D}/${MY_HTDOCSDIR}
+
+       # Install the htaccess file for pretty urls
+       cp .htaccess ${D}/${MY_HTDOCSDIR}
+
+       # Create initial changes file
+       touch ${D}/${MY_HTDOCSDIR}/data/changes.log data/changes.log
+
+       # The data dir needs to be owned by the server
+       for x in `find . -print | grep "data/*" | grep -v .htaccess` ; do
+               webapp_serverowned ${MY_HTDOCSDIR}/$x
+       done
+
+       webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+       webapp_src_install
+}

diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20050922 b/www-apps/dokuwiki/files/digest-dokuwiki-20050922
new file mode 100644 (file)
index 0000000..54de429
--- /dev/null
+++ b/www-apps/dokuwiki/files/digest-dokuwiki-20050922
@@ -0,0 +1 @@
+MD5 43a09760f69bbb4ace26b413ee3263a9 dokuwiki-2005-09-22.tgz 643401