| 1 |
hollow 08/02/04 08:30:59 |
| 2 |
|
| 3 |
Modified: phpwiki-1.3.14.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
merge from webapps overlay wrt #208584 |
| 6 |
(Portage version: 2.1.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 www-apps/phpwiki/phpwiki-1.3.14.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.14.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.14.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.14.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: phpwiki-1.3.14.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.14.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- phpwiki-1.3.14.ebuild 14 Aug 2007 18:13:04 -0000 1.2 |
| 22 |
+++ phpwiki-1.3.14.ebuild 4 Feb 2008 08:30:59 -0000 1.3 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.14.ebuild,v 1.2 2007/08/14 18:13:04 dertobi123 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.3.14.ebuild,v 1.3 2008/02/04 08:30:59 hollow Exp $ |
| 29 |
|
| 30 |
inherit webapp depend.php |
| 31 |
|
| 32 |
@@ -10,33 +10,44 @@ |
| 33 |
|
| 34 |
LICENSE="GPL-2" |
| 35 |
KEYWORDS="~amd64 ppc ~sparc ~x86" |
| 36 |
-IUSE="" |
| 37 |
+IUSE="msql mysql postgres" |
| 38 |
|
| 39 |
-RDEPEND="virtual/php |
| 40 |
- www-servers/apache" |
| 41 |
+RDEPEND="virtual/httpd-cgi" |
| 42 |
+need_php |
| 43 |
|
| 44 |
-src_unpack() { |
| 45 |
- require_php_with_use pcre |
| 46 |
+pkg_setup() { |
| 47 |
+ local flags="pcre" |
| 48 |
+ for f in msql mysql postgres ; do |
| 49 |
+ use ${f} && flags="${flags} ${f}" |
| 50 |
+ done |
| 51 |
+ if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \ |
| 52 |
+ ! PHPCHECKNODIE="yes" require_php_with_any_use apache2 cgi ; then |
| 53 |
+ die "Re-install ${PHP_PKG} with ${flags} and at least one of apache2 or cgi." |
| 54 |
+ fi |
| 55 |
+ webapp_pkg_setup |
| 56 |
+} |
| 57 |
|
| 58 |
+src_unpack() { |
| 59 |
unpack ${A} |
| 60 |
- cd ${S} |
| 61 |
+ cd "${S}" |
| 62 |
rm -f Makefile LICENSE |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
webapp_src_preinst |
| 67 |
|
| 68 |
- cp -pPR * ${D}/${MY_HTDOCSDIR} |
| 69 |
- rm -rf ${D}/${MY_HTDOCSDIR}/{doc,schemas,README,INSTALL,TODO,UPGRADING} |
| 70 |
+ cp -pPR * "${D}/${MY_HTDOCSDIR}" |
| 71 |
+ rm -rf "${D}/${MY_HTDOCSDIR}"/{doc,schemas,README,INSTALL,TODO,UPGRADING} |
| 72 |
|
| 73 |
dodoc README INSTALL TODO UPGRADING doc/* schemas/* |
| 74 |
|
| 75 |
# Create config file from distribution default, and fix up invalid defaults |
| 76 |
- cd ${D}/${MY_HTDOCSDIR}/config |
| 77 |
- sed "s:;DEBUG = 1:DEBUG = 0:" config-dist.ini > config.ini |
| 78 |
+ dosed "s:;DEBUG = 1:DEBUG = 0:" "${MY_HTDOCSDIR}"/config/config-dist.ini |
| 79 |
+ cd "${D}"/${MY_HTDOCSDIR}/config |
| 80 |
+ cp config-dist.ini config.ini |
| 81 |
|
| 82 |
- webapp_postinst_txt en ${FILESDIR}/postinstall-1.3-en.txt |
| 83 |
- webapp_configfile ${MY_HTDOCSDIR}/config/config.ini |
| 84 |
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-1.3-en.txt |
| 85 |
+ webapp_configfile "${MY_HTDOCSDIR}"/config/config.ini |
| 86 |
|
| 87 |
webapp_src_install |
| 88 |
} |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.24 www-apps/phpwiki/ChangeLog |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/phpwiki/ChangeLog?rev=1.24&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/phpwiki/ChangeLog?rev=1.24&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/phpwiki/ChangeLog?r1=1.23&r2=1.24 |
| 97 |
|
| 98 |
Index: ChangeLog |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v |
| 101 |
retrieving revision 1.23 |
| 102 |
retrieving revision 1.24 |
| 103 |
diff -u -r1.23 -r1.24 |
| 104 |
--- ChangeLog 30 Aug 2007 14:25:50 -0000 1.23 |
| 105 |
+++ ChangeLog 4 Feb 2008 08:30:59 -0000 1.24 |
| 106 |
@@ -1,6 +1,14 @@ |
| 107 |
# ChangeLog for www-apps/phpwiki |
| 108 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.23 2007/08/30 14:25:50 wrobel Exp $ |
| 110 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.24 2008/02/04 08:30:59 hollow Exp $ |
| 112 |
+ |
| 113 |
+ 04 Feb 2008; Benedikt Böhm <hollow@g.o> phpwiki-1.3.14.ebuild: |
| 114 |
+ merge from webapps overlay wrt #208584 |
| 115 |
+ |
| 116 |
+ 02 Feb 2008; Jakub Moc <jakub@g.o> phpwiki-1.3.14.ebuild: |
| 117 |
+ Remove apache dependency wrt Bug 208584. Move php checks to pkg_setup where |
| 118 |
+ they belong, and fix them up. Add use flags for databases. Fix quoting, |
| 119 |
+ clean up the ebuild. |
| 120 |
|
| 121 |
30 Aug 2007; <wrobel@g.o> -files/phpwiki-1.3.10-xmlrpc.patch, |
| 122 |
metadata.xml, -phpwiki-1.3.10-r3.ebuild, -phpwiki-1.3.13_rc1.ebuild: |
| 123 |
|
| 124 |
|
| 125 |
|
| 126 |
-- |
| 127 |
gentoo-commits@l.g.o mailing list |
Archives