Drop depend.php from inherit - fixes bug 552858.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)

3 files changed, 78 insertions, 4 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index f8110858b064..25a794508db3 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.80 2015/04/10 10:53:32 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.81 2015/07/01 17:18:34 jmbsvicetto Exp $
+
+*dokuwiki-20140929d-r1 (01 Jul 2015)
+
+  01 Jul 2015; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +dokuwiki-20140929d-r1.ebuild, dokuwiki-20140505e.ebuild:
+  Drop depend.php from inherit - fixes bug 552858.
 
   10 Apr 2015; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -dokuwiki-20140929b.ebuild:
diff --git a/www-apps/dokuwiki/dokuwiki-20140505e.ebuild b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
index 19650acfdb81..ce3cbffba50c 100644
--- a/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505e.ebuild,v 1.1 2015/04/09 17:42:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505e.ebuild,v 1.2 2015/07/01 17:18:34 jmbsvicetto Exp $
 
 EAPI=5
 
-inherit webapp depend.php
+inherit webapp
 
 # upstream uses dashes in the datestamp
 MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
@@ -21,6 +21,7 @@ IUSE="gd"
 DEPEND=""
 RDEPEND="
 	>=dev-lang/php-5.3[xml]
+	virtual/httpd-php:*
 	gd? ( ||
 		(
 			dev-lang/php[gd]
@@ -30,7 +31,6 @@ RDEPEND="
 "
 
 need_httpd_cgi
-need_php_httpd
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
new file mode 100644
index 000000000000..fadcb5a67dc0
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild,v 1.1 2015/07/01 17:18:34 jmbsvicetto Exp $
+
+EAPI=5
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PV="${MY_BASE_PV}${PV:8:1}"
+
+DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
+SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gd"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.3[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# create initial changes file
+	touch data/changes.log
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README
+	rm -f README COPYING
+
+	docinto scripts
+	dodoc bin/*
+	rm -rf bin
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	for x in $(find data/ -not -name '.htaccess'); do
+		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
+	done
+
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
+	webapp_configfile "${MY_HTDOCSDIR}"/conf
+
+	for x in $(find conf/ -not -name 'msg'); do
+		webapp_configfile "${MY_HTDOCSDIR}"/${x}
+	done
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}