[gentoo-commits] gentoo-x86 commit in www-apps/dokuwiki: dokuwiki-20140929d-r1.ebuild dokuwiki-20140505e.ebuild ChangeLog

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    15/07/01 17:18:34

  Modified:             dokuwiki-20140505e.ebuild ChangeLog
  Added:                dokuwiki-20140929d-r1.ebuild
  Log:
  Drop depend.php from inherit - fixes bug 552858.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)

Revision  Changes    Path
1.2                  www-apps/dokuwiki/dokuwiki-20140505e.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505e.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505e.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505e.ebuild?r1=1.1&r2=1.2

Index: dokuwiki-20140505e.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505e.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dokuwiki-20140505e.ebuild	9 Apr 2015 17:42:18 -0000	1.1
+++ dokuwiki-20140505e.ebuild	1 Jul 2015 17:18:34 -0000	1.2
@@ -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 @@
 DEPEND=""
 RDEPEND="
 	>=dev-lang/php-5.3[xml]
+	virtual/httpd-php:*
 	gd? ( ||
 		(
 			dev-lang/php[gd]
@@ -30,7 +31,6 @@
 "
 
 need_httpd_cgi
-need_php_httpd
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 



1.81                 www-apps/dokuwiki/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/dokuwiki/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/dokuwiki/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/dokuwiki/ChangeLog?r1=1.80&r2=1.81

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog	10 Apr 2015 10:53:32 -0000	1.80
+++ ChangeLog	1 Jul 2015 17:18:34 -0000	1.81
@@ -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@g.o>
+  +dokuwiki-20140929d-r1.ebuild, dokuwiki-20140505e.ebuild:
+  Drop depend.php from inherit - fixes bug 552858.
 
   10 Apr 2015; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
   -dokuwiki-20140929b.ebuild:



1.1                  www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild?rev=1.1&content-type=text/plain

Index: dokuwiki-20140929d-r1.ebuild
===================================================================
# 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
}