From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JRRjB-0000cA-8v for garchives@archives.gentoo.org; Tue, 19 Feb 2008 12:37:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8BDDE0A76; Tue, 19 Feb 2008 12:37:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 71572E0A76 for ; Tue, 19 Feb 2008 12:37:40 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id F2574652C7 for ; Tue, 19 Feb 2008 12:37:39 +0000 (UTC) Received: from hollow by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JRRj7-0002D5-Qt for gentoo-commits@lists.gentoo.org; Tue, 19 Feb 2008 12:37:37 +0000 From: "Benedikt Boehm (hollow)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hollow@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-apps/dokuwiki: dokuwiki-20070626b.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: dokuwiki-20070626b.ebuild ChangeLog X-VCS-Directories: www-apps/dokuwiki X-VCS-Committer: hollow X-VCS-Committer-Name: Benedikt Boehm Content-Type: text/plain; charset=utf8 Message-Id: Sender: Benedikt Boehm Date: Tue, 19 Feb 2008 12:37:37 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 690df16d-780b-4358-9e8f-b6147879df8e X-Archives-Hash: a083bfac6a3ba492f02b1623e1e0c514 hollow 08/02/19 12:37:37 Modified: dokuwiki-20070626b.ebuild ChangeLog Log: ebuild cleanup wrt #208584 (Portage version: 2.1.4.4) Revision Changes Path 1.4 www-apps/dokuwiki/dokuwiki-20070626b.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dokuwiki/= dokuwiki-20070626b.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dokuwiki/= dokuwiki-20070626b.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dokuwiki/= dokuwiki-20070626b.ebuild?r1=3D1.3&r2=3D1.4 Index: dokuwiki-20070626b.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20070626b.eb= uild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dokuwiki-20070626b.ebuild 22 Oct 2007 20:47:35 -0000 1.3 +++ dokuwiki-20070626b.ebuild 19 Feb 2008 12:37:37 -0000 1.4 @@ -1,14 +1,13 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20070626b.= ebuild,v 1.3 2007/10/22 20:47:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20070626b.= ebuild,v 1.4 2008/02/19 12:37:37 hollow Exp $ =20 inherit webapp depend.php =20 -# Upstream uses dashes in the datestamp +# upstream uses dashes in the datestamp MY_PV=3D"${PV:0:4}-${PV:4:2}-${PV:6:2}${PV:8:1}" =20 -DESCRIPTION=3D"DokuWiki is a simple to use Wiki aimed at a small compani= es -documentation needs." +DESCRIPTION=3D"DokuWiki is a simple to use Wiki aimed at a small compani= es documentation needs." HOMEPAGE=3D"http://wiki.splitbrain.org/wiki:dokuwiki" SRC_URI=3D"http://www.splitbrain.org/_media/projects/${PN}/${PN}-${MY_PV= }.tgz" =20 @@ -16,75 +15,54 @@ KEYWORDS=3D"~amd64 ~ppc ~sparc x86" IUSE=3D"" =20 -DEPEND=3D"virtual/php" -RDEPEND=3D"${DEPEND}" +DEPEND=3D"" +RDEPEND=3D"" =20 -pkg_setup() { - # let the eclass pick right php version... - require_php_cli +need_php_httpd =20 - # ...and we check if correct USE flag for XML support is enabled +pkg_setup() { + webapp_pkg_setup + has_php if [[ ${PHP_VERSION} =3D=3D "4" ]] ; then - require_php_with_use expat + require_php_with_use cli expat else - require_php_with_use xml + require_php_with_use cli xml fi - - webapp_pkg_setup } =20 src_unpack() { - cd ${WORKDIR} - unpack ${PN}-${MY_PV}.tgz + unpack ${A} mv ${PN}-${MY_PV} ${P} -} + cd "${S}" =20 -src_compile() { - # Default compile hangs - echo "Nothing to compile" + # create initial changes file + touch data/changes.log } =20 src_install() { - local docs=3D"README" webapp_src_preinst =20 - # NOTE: doc files should go into /usr/share/doc, and NOT installed in t= he vhost - einfo "Installing docs" - dodoc ${docs} - for doc in ${docs} COPYING; do - rm -f ${doc} - done + dodoc README + rm -f README COPYING VERSION =20 - # Move bin directory to safe location (outside of docroot) - # To resolve security bug #146800 docinto scripts dodoc bin/* rm -rf bin =20 - einfo "Copying main files" - cp -r . ${D}/${MY_HTDOCSDIR} - - # Install the htaccess file for pretty urls - cp .htaccess ${D}/${MY_HTDOCSDIR} + insinto "${MY_HTDOCSDIR}" + doins -r . =20 - # 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 + for x in $(find data/ -not -name '.htaccess'); do + webapp_serverowned "${MY_HTDOCSDIR}"/${x} done =20 - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - webapp_configfile ${MY_HTDOCSDIR}/.htaccess - - webapp_configfile ${MY_HTDOCSDIR}/conf + webapp_configfile "${MY_HTDOCSDIR}"/.htaccess + webapp_configfile "${MY_HTDOCSDIR}"/conf =20 - # Mark all conf/* files as config files, except msg, which should be - # updated unconditionally. - for x in $( ls -1 ${D}/${MY_HTDOCSDIR}/conf | grep -v ^msg$ ) ; do - webapp_configfile ${MY_HTDOCSDIR}/conf/$x + for x in $(find conf/ -not -name 'msg'); do + webapp_configfile "${MY_HTDOCSDIR}"/${x} done =20 + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt webapp_src_install } 1.29 www-apps/dokuwiki/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dokuwiki/= ChangeLog?rev=3D1.29&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dokuwiki/= ChangeLog?rev=3D1.29&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/dokuwiki/= ChangeLog?r1=3D1.28&r2=3D1.29 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ChangeLog 22 Oct 2007 20:47:35 -0000 1.28 +++ ChangeLog 19 Feb 2008 12:37:37 -0000 1.29 @@ -1,6 +1,12 @@ # ChangeLog for www-apps/dokuwiki -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.28 20= 07/10/22 20:47:35 armin76 Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.29 20= 08/02/19 12:37:37 hollow Exp $ + + 19 Feb 2008; Benedikt B=C3=B6hm dokuwiki-20070626b= .ebuild: + ebuild cleanup wrt #208584 + + 05 Feb 2008; Jakub Moc dokuwiki-20070626b.ebuild: + Check for all PHP features at once. Quoting, cleanup. =20 22 Oct 2007; Ra=C3=BAl Porcel dokuwiki-20070626b.= ebuild: Add ~sparc wrt #195404 --=20 gentoo-commits@lists.gentoo.org mailing list