1 |
hollow 08/02/23 21:06:25 |
2 |
|
3 |
Modified: egroupware-1.4.002.ebuild metadata.xml ChangeLog |
4 |
Log: |
5 |
merge from webapp overlay wrt #208584 |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.7 www-apps/egroupware/egroupware-1.4.002.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/egroupware-1.4.002.ebuild?rev=1.7&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/egroupware-1.4.002.ebuild?rev=1.7&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/egroupware-1.4.002.ebuild?r1=1.6&r2=1.7 |
14 |
|
15 |
Index: egroupware-1.4.002.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.4.002.ebuild,v |
18 |
retrieving revision 1.6 |
19 |
retrieving revision 1.7 |
20 |
diff -u -r1.6 -r1.7 |
21 |
--- egroupware-1.4.002.ebuild 11 Oct 2007 07:20:11 -0000 1.6 |
22 |
+++ egroupware-1.4.002.ebuild 23 Feb 2008 21:06:25 -0000 1.7 |
23 |
@@ -1,11 +1,10 @@ |
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/egroupware/egroupware-1.4.002.ebuild,v 1.6 2007/10/11 07:20:11 kingtaco Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.4.002.ebuild,v 1.7 2008/02/23 21:06:25 hollow Exp $ |
29 |
|
30 |
-inherit webapp depend.php |
31 |
+inherit eutils webapp depend.php |
32 |
|
33 |
MY_PN=eGroupWare |
34 |
-S=${WORKDIR}/${PN} |
35 |
|
36 |
DESCRIPTION="Web-based GroupWare suite" |
37 |
HOMEPAGE="http://www.egroupware.org/" |
38 |
@@ -14,56 +13,64 @@ |
39 |
|
40 |
LICENSE="GPL-2" |
41 |
KEYWORDS="alpha amd64 hppa ppc ~sparc x86" |
42 |
-IUSE="gd jpgraph ldap mysql postgres" |
43 |
+IUSE="jpgraph ldap mssql mysql postgres" |
44 |
|
45 |
-RDEPEND=" |
46 |
- ldap? ( net-nds/openldap ) |
47 |
- gd? ( media-libs/gd ) |
48 |
- jpgraph? ( || ( dev-php5/jpgraph dev-php4/jpgraph ) ) |
49 |
-" |
50 |
+RDEPEND="jpgraph? ( || ( dev-php5/jpgraph dev-php4/jpgraph ) ) |
51 |
+ dev-php/PEAR-PEAR |
52 |
+ virtual/cron" |
53 |
+ |
54 |
+need_httpd_cgi |
55 |
+need_php_httpd |
56 |
+ |
57 |
+S="${WORKDIR}"/${PN} |
58 |
|
59 |
pkg_setup () { |
60 |
- has_php |
61 |
webapp_pkg_setup |
62 |
+ has_php |
63 |
|
64 |
- local php_flags="imap session" |
65 |
+ local php_flags="imap session unicode" |
66 |
|
67 |
- use ldap && php_flags="${php_flags} ldap" |
68 |
- use mysql && php_flags="${php_flags} mysql" |
69 |
- use postgres && php_flags="${php_flags} postgres" |
70 |
- require_php_with_use ${php_flags} |
71 |
+ for f in ldap mssql mysql postgres; do |
72 |
+ use ${f} && php_flags="${php_flags} ${f}" |
73 |
+ done |
74 |
+ |
75 |
+ if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags} || \ |
76 |
+ ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then |
77 |
+ die "Re-install ${PHP_PKG} with ${php_flags} and either gd or gd-external." |
78 |
+ fi |
79 |
} |
80 |
|
81 |
src_unpack() { |
82 |
- has_php |
83 |
- |
84 |
unpack ${A} |
85 |
- cd ${S} |
86 |
- # remove SVN directories |
87 |
- find . -type d -name '.svn' -print | xargs rm -rf |
88 |
+ cd "${S}" |
89 |
+ esvn_clean |
90 |
|
91 |
if use jpgraph; then |
92 |
einfo "Fixing jpgraph location" |
93 |
- sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph.php'|" projectmanager/inc/class.ganttchart.inc.php || die |
94 |
- sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph_gantt.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph_gantt.php'|" projectmanager/inc/class.ganttchart.inc.php || die |
95 |
+ sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph.php'|" \ |
96 |
+ projectmanager/inc/class.ganttchart.inc.php || die |
97 |
+ sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph_gantt.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph_gantt.php'|" \ |
98 |
+ projectmanager/inc/class.ganttchart.inc.php || die |
99 |
fi |
100 |
} |
101 |
|
102 |
src_install() { |
103 |
webapp_src_preinst |
104 |
- cp -r . ${D}/${MY_HTDOCSDIR} |
105 |
|
106 |
- webapp_serverowned ${MY_HTDOCSDIR}/phpgwapi/images |
107 |
+ insinto "${MY_HTDOCSDIR}" |
108 |
+ doins -r . |
109 |
+ |
110 |
+ webapp_serverowned "${MY_HTDOCSDIR}"/phpgwapi/images |
111 |
|
112 |
- webapp_postinst_txt en ${FILESDIR}/postinstall-en-1.2.txt |
113 |
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-en-1.2.txt |
114 |
webapp_src_install |
115 |
} |
116 |
|
117 |
pkg_postinst() { |
118 |
if use ldap; then |
119 |
- einfo "If you are using LDAP contacts/addressbook, please read the upgrade instructions at" |
120 |
- einfo "http://www.egroupware.org/index.php?page_name=wiki&wikipage=ManualSetupUpdate" |
121 |
- einfo "before running the egroupware setup" |
122 |
+ elog "If you are using LDAP contacts/addressbook, please read the upgrade instructions at" |
123 |
+ elog "http://www.egroupware.org/index.php?page_name=wiki&wikipage=ManualSetupUpdate" |
124 |
+ elog "before running the egroupware setup" |
125 |
fi |
126 |
webapp_pkg_postinst |
127 |
} |
128 |
|
129 |
|
130 |
|
131 |
1.3 www-apps/egroupware/metadata.xml |
132 |
|
133 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/metadata.xml?rev=1.3&view=markup |
134 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/metadata.xml?rev=1.3&content-type=text/plain |
135 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/metadata.xml?r1=1.2&r2=1.3 |
136 |
|
137 |
Index: metadata.xml |
138 |
=================================================================== |
139 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/egroupware/metadata.xml,v |
140 |
retrieving revision 1.2 |
141 |
retrieving revision 1.3 |
142 |
diff -u -r1.2 -r1.3 |
143 |
--- metadata.xml 19 Aug 2004 13:13:24 -0000 1.2 |
144 |
+++ metadata.xml 23 Feb 2008 21:06:25 -0000 1.3 |
145 |
@@ -1,5 +1,5 @@ |
146 |
<?xml version="1.0" encoding="UTF-8"?> |
147 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
148 |
<pkgmetadata> |
149 |
-<herd>web-apps</herd> |
150 |
+ <herd>web-apps</herd> |
151 |
</pkgmetadata> |
152 |
|
153 |
|
154 |
|
155 |
1.86 www-apps/egroupware/ChangeLog |
156 |
|
157 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/ChangeLog?rev=1.86&view=markup |
158 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/ChangeLog?rev=1.86&content-type=text/plain |
159 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/egroupware/ChangeLog?r1=1.85&r2=1.86 |
160 |
|
161 |
Index: ChangeLog |
162 |
=================================================================== |
163 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v |
164 |
retrieving revision 1.85 |
165 |
retrieving revision 1.86 |
166 |
diff -u -r1.85 -r1.86 |
167 |
--- ChangeLog 11 Oct 2007 08:58:28 -0000 1.85 |
168 |
+++ ChangeLog 23 Feb 2008 21:06:25 -0000 1.86 |
169 |
@@ -1,6 +1,15 @@ |
170 |
# ChangeLog for www-apps/egroupware |
171 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
172 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.85 2007/10/11 08:58:28 wrobel Exp $ |
173 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
174 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.86 2008/02/23 21:06:25 hollow Exp $ |
175 |
+ |
176 |
+ 23 Feb 2008; Benedikt Böhm <hollow@g.o> metadata.xml, |
177 |
+ egroupware-1.4.002.ebuild: |
178 |
+ merge from webapp overlay wrt #208584 |
179 |
+ |
180 |
+ 05 Feb 2008; Jakub Moc <jakub@g.o> egroupware-1.4.002.ebuild: |
181 |
+ Add missing dev-php/PEAR-PEAR and virtual/cron dependencies. Remove bogus gd |
182 |
+ USE flag and dependency on media-libs/gd, add mssql USE flag. Fix PHP checks. |
183 |
+ Fix quoting, ebuild clean-up. |
184 |
|
185 |
11 Oct 2007; <wrobel@g.o> -egroupware-1.4.001.ebuild: |
186 |
Removed insecure package from the tree (sec issue #193960). |
187 |
|
188 |
|
189 |
|
190 |
-- |
191 |
gentoo-commits@l.g.o mailing list |