1 |
hollow 08/02/22 16:34:04 |
2 |
|
3 |
Modified: tikiwiki-1.9.9.ebuild ChangeLog |
4 |
Log: |
5 |
ebuild cleanup wrt #208584 |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 www-apps/tikiwiki/tikiwiki-1.9.9.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: tikiwiki-1.9.9.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- tikiwiki-1.9.9.ebuild 18 Jan 2008 20:25:45 -0000 1.2 |
22 |
+++ tikiwiki-1.9.9.ebuild 22 Feb 2008 16:34:03 -0000 1.3 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild,v 1.2 2008/01/18 20:25:45 dertobi123 Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild,v 1.3 2008/02/22 16:34:03 hollow Exp $ |
28 |
|
29 |
inherit webapp depend.php |
30 |
|
31 |
@@ -12,60 +12,56 @@ |
32 |
IUSE="mysql postgres graphviz" |
33 |
KEYWORDS="~amd64 ppc ~sparc ~x86" |
34 |
|
35 |
-RDEPEND="virtual/httpd-cgi |
36 |
- graphviz? ( media-gfx/graphviz ) |
37 |
-" |
38 |
+RDEPEND="graphviz? ( media-gfx/graphviz )" |
39 |
|
40 |
+need_httpd_cgi |
41 |
need_php_httpd |
42 |
|
43 |
pkg_setup () { |
44 |
webapp_pkg_setup |
45 |
- use mysql && require_php_with_use mysql |
46 |
- use postgres && require_php_with_use postgres |
47 |
+ |
48 |
+ local my_flags= |
49 |
+ use mysql && my_flags="${my_flags} mysql" |
50 |
+ use postgres && my_flags="${my_flags} postgres" |
51 |
+ |
52 |
+ require_php_with_use ${my_flags} |
53 |
} |
54 |
|
55 |
src_install() { |
56 |
webapp_src_preinst |
57 |
|
58 |
- local DIR |
59 |
- local DIRENTRY |
60 |
- local DIRS="backups db dump files img/trackers img/wiki |
61 |
- img/wiki_up modules/cache temp |
62 |
- templates_c templates styles maps whelp mods |
63 |
- lib/Galaxia/processes" |
64 |
- |
65 |
- # Ensure that directories exist, some don't. |
66 |
- # (part of setup.sh) |
67 |
- for DIR in ${DIRS}; do |
68 |
- mkdir -p ${DIR} |
69 |
- done |
70 |
- |
71 |
# Remove the execute permission from the setup.sh script |
72 |
# and rename it. Its actions have been incorporated here. |
73 |
chmod a-x setup.sh |
74 |
mv setup.sh setup.sh.done |
75 |
|
76 |
- # Install the minimal doc (points to web page) |
77 |
- # |
78 |
- dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README |
79 |
- |
80 |
- # The bulk goes into htdocs |
81 |
- # but don't copy INSTALL and README |
82 |
- cp -pPR [[:lower:]]* "${D}"/"${MY_HTDOCSDIR}" |
83 |
+ dodoc changelog.txt copyright.txt doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README |
84 |
+ rm -rf changelog.txt copyright.txt doc/ INSTALL license.txt README |
85 |
+ |
86 |
+ insinto "${MY_HTDOCSDIR}" |
87 |
+ doins -r . |
88 |
+ |
89 |
+ local DIR DIRENTRY |
90 |
+ local DIRS="backups db dump files img/trackers img/wiki |
91 |
+ img/wiki_up modules/cache temp |
92 |
+ templates_c templates styles maps whelp mods |
93 |
+ lib/Galaxia/processes" |
94 |
|
95 |
# Recursively set server ownership to allow server to write |
96 |
# This is the rough equivalent of the setup.sh script |
97 |
# provided in the distribution. |
98 |
# Note: Cannot use xargs or find -exec here because |
99 |
# these don't work with shell functions. |
100 |
- # |
101 |
+ |
102 |
webapp_serverowned "${MY_HTDOCSDIR}" |
103 |
+ webapp_serverowned "${MY_HTDOCSDIR}"/tiki-install.php |
104 |
+ |
105 |
+ # ensure that directories exist, some don't. |
106 |
+ # (part of original setup.sh) |
107 |
for DIR in ${DIRS}; do |
108 |
- find ${DIR} | while read DIRENTRY; do |
109 |
- webapp_serverowned "${MY_HTDOCSDIR}"/${DIRENTRY} |
110 |
- done |
111 |
+ dodir "${MY_HTDOCSDIR}/${DIR}" |
112 |
+ webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}" |
113 |
done |
114 |
- webapp_serverowned "${MY_HTDOCSDIR}"/tiki-install.php |
115 |
|
116 |
webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
117 |
webapp_src_install |
118 |
|
119 |
|
120 |
|
121 |
1.55 www-apps/tikiwiki/ChangeLog |
122 |
|
123 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/tikiwiki/ChangeLog?rev=1.55&view=markup |
124 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/tikiwiki/ChangeLog?rev=1.55&content-type=text/plain |
125 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/tikiwiki/ChangeLog?r1=1.54&r2=1.55 |
126 |
|
127 |
Index: ChangeLog |
128 |
=================================================================== |
129 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v |
130 |
retrieving revision 1.54 |
131 |
retrieving revision 1.55 |
132 |
diff -u -r1.54 -r1.55 |
133 |
--- ChangeLog 23 Jan 2008 08:56:37 -0000 1.54 |
134 |
+++ ChangeLog 22 Feb 2008 16:34:03 -0000 1.55 |
135 |
@@ -1,6 +1,9 @@ |
136 |
# ChangeLog for www-apps/tikiwiki |
137 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
138 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.54 2008/01/23 08:56:37 wrobel Exp $ |
139 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.55 2008/02/22 16:34:03 hollow Exp $ |
140 |
+ |
141 |
+ 22 Feb 2008; Benedikt Böhm <hollow@g.o> tikiwiki-1.9.9.ebuild: |
142 |
+ ebuild cleanup wrt #208584 |
143 |
|
144 |
23 Jan 2008; Gunnar Wrobel <wrobel@g.o> -tikiwiki-1.9.8.3.ebuild: |
145 |
Removed insecure tikiwiki-1.9.8.3 (sec issue #203265). |
146 |
|
147 |
|
148 |
|
149 |
-- |
150 |
gentoo-commits@l.g.o mailing list |