1 |
commit: 117f9c9c8e20aa7f63b49e4e4b25ebaf857feede |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 11 18:54:47 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 11 18:56:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117f9c9c |
7 |
|
8 |
dev-php/PEAR-HTML_TreeMenu: Remove last-rited pkg |
9 |
|
10 |
dev-php/PEAR-HTML_TreeMenu/Manifest | 1 - |
11 |
.../PEAR-HTML_TreeMenu-1.2.2-r1.ebuild | 26 ---- |
12 |
.../PEAR-HTML_TreeMenu/files/modern-syntax.patch | 144 --------------------- |
13 |
dev-php/PEAR-HTML_TreeMenu/metadata.xml | 8 -- |
14 |
profiles/package.mask | 1 - |
15 |
5 files changed, 180 deletions(-) |
16 |
|
17 |
diff --git a/dev-php/PEAR-HTML_TreeMenu/Manifest b/dev-php/PEAR-HTML_TreeMenu/Manifest |
18 |
deleted file mode 100644 |
19 |
index 4519b477dba..00000000000 |
20 |
--- a/dev-php/PEAR-HTML_TreeMenu/Manifest |
21 |
+++ /dev/null |
22 |
@@ -1 +0,0 @@ |
23 |
-DIST HTML_TreeMenu-1.2.2.tgz 55925 SHA256 bd57e97b9e1e84c97faec057f842452a5a1240798756d17ee959b1971def3d12 SHA512 653b9e82133a447f65feaf1e95f1948d889d5c97198b5bcc6fd2bf5f9eda89c087d77e863c8fbbd5da8083926716f63820cd8504751c29fbf45695a6b83b01b4 WHIRLPOOL def5ae0f77bfe773698cccecdaba1326c6cc3fdbd872dc1fc6175a7dd7a511a26e567fdb4f29269660560cc17283df7fc396673e96eda9f9dd92060bd00ccf20 |
24 |
|
25 |
diff --git a/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2-r1.ebuild b/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2-r1.ebuild |
26 |
deleted file mode 100644 |
27 |
index a08179fc41a..00000000000 |
28 |
--- a/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2-r1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,26 +0,0 @@ |
31 |
-# Copyright 1999-2017 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=6 |
35 |
- |
36 |
-inherit php-pear-r2 |
37 |
- |
38 |
-DESCRIPTION="Provides an API to create a HTML tree" |
39 |
-LICENSE="BSD" |
40 |
-SLOT="0" |
41 |
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" |
42 |
-IUSE="" |
43 |
- |
44 |
-PATCHES=( "${FILESDIR}/modern-syntax.patch" ) |
45 |
- |
46 |
-src_install() { |
47 |
- php-pear-r2_src_install |
48 |
- docinto html |
49 |
- dodoc -r TreeMenu.js images imagesAlt imagesAlt2 imagesAlt3 docs/example.php |
50 |
-} |
51 |
- |
52 |
-pkg_postinst() { |
53 |
- elog "Please copy the TreeMenu.js and the contents of one of the images" |
54 |
- elog "directory from ${EROOT}usr/share/doc/${PF}/html to the same location" |
55 |
- elog "in your website for this script to work properly" |
56 |
-} |
57 |
|
58 |
diff --git a/dev-php/PEAR-HTML_TreeMenu/files/modern-syntax.patch b/dev-php/PEAR-HTML_TreeMenu/files/modern-syntax.patch |
59 |
deleted file mode 100644 |
60 |
index 8b9773d1235..00000000000 |
61 |
--- a/dev-php/PEAR-HTML_TreeMenu/files/modern-syntax.patch |
62 |
+++ /dev/null |
63 |
@@ -1,144 +0,0 @@ |
64 |
-diff -aurN a/HTML/TreeMenu.php b/HTML/TreeMenu.php |
65 |
---- a/HTML/TreeMenu.php 2010-10-25 05:10:46.000000000 -0400 |
66 |
-+++ b/HTML/TreeMenu.php 2017-08-04 15:25:16.730007135 -0400 |
67 |
-@@ -83,6 +83,9 @@ |
68 |
- * |
69 |
- * @access public |
70 |
- */ |
71 |
-+ function __construct() |
72 |
-+ { |
73 |
-+ } |
74 |
- function HTML_TreeMenu() |
75 |
- { |
76 |
- // Not much to do here :( |
77 |
-@@ -206,7 +209,7 @@ |
78 |
- case 'heyes_array': |
79 |
- // Need to create a HTML_TreeMenu object ? |
80 |
- if (!isset($params['treeMenu'])) { |
81 |
-- $treeMenu = &new HTML_TreeMenu(); |
82 |
-+ $treeMenu = new HTML_TreeMenu(); |
83 |
- $parentID = 0; |
84 |
- } else { |
85 |
- $treeMenu = &$params['treeMenu']; |
86 |
-@@ -240,7 +243,7 @@ |
87 |
- default: |
88 |
- // Need to create a HTML_TreeMenu object ? |
89 |
- if (!isset($params['treeMenu'])) { |
90 |
-- $treeMenu = &new HTML_TreeMenu(); |
91 |
-+ $treeMenu = new HTML_TreeMenu(); |
92 |
- } else { |
93 |
- $treeMenu = &$params['treeMenu']; |
94 |
- } |
95 |
-@@ -312,7 +315,7 @@ |
96 |
- if (is_string($xml)) { |
97 |
- // Supplied $xml is a string |
98 |
- include_once 'XML/Tree.php'; |
99 |
-- $xmlTree = &new XML_Tree(); |
100 |
-+ $xmlTree = new XML_Tree(); |
101 |
- $xmlTree->getTreeFromString($xml); |
102 |
- } else { |
103 |
- // Supplied $xml is an XML_Tree object |
104 |
-@@ -469,7 +472,7 @@ |
105 |
- * |
106 |
- * @access public |
107 |
- */ |
108 |
-- function HTML_TreeNode($options = array(), $events = array()) |
109 |
-+ function __construct($options = array(), $events = array()) |
110 |
- { |
111 |
- $this->text = ''; |
112 |
- $this->link = ''; |
113 |
-@@ -488,7 +491,10 @@ |
114 |
- $this->$option = $value; |
115 |
- } |
116 |
- } |
117 |
-- |
118 |
-+ function HTML_TreeNode($options = array(), $events = array()) |
119 |
-+ { |
120 |
-+ self::__construct($options, $events); |
121 |
-+ } |
122 |
- /** |
123 |
- * Allows setting of various parameters after the initial constructor call |
124 |
- * |
125 |
-@@ -585,11 +591,14 @@ |
126 |
- * |
127 |
- * @param HTML_TreeMenu &$structure The menu structure |
128 |
- */ |
129 |
-- function HTML_TreeMenu_Presentation(&$structure) |
130 |
-+ function __construct(&$structure) |
131 |
- { |
132 |
- $this->menu = &$structure; |
133 |
- } |
134 |
-- |
135 |
-+ function HTML_TreeMenu_Presentation(&$structure) |
136 |
-+ { |
137 |
-+ self::__construct($structure); |
138 |
-+ } |
139 |
- /** |
140 |
- * Prints the HTML generated by the toHTML() method. |
141 |
- * toHTML() must therefore be defined by the derived |
142 |
-@@ -715,7 +724,7 @@ |
143 |
- * |
144 |
- * @access public |
145 |
- */ |
146 |
-- function HTML_TreeMenu_DHTML(&$structure, $options = array(), $isDynamic = true) |
147 |
-+ function __construct(&$structure, $options = array(), $isDynamic = true) |
148 |
- { |
149 |
- $this->HTML_TreeMenu_Presentation($structure); |
150 |
- $this->isDynamic = $isDynamic; |
151 |
-@@ -733,7 +742,10 @@ |
152 |
- $this->$option = $value; |
153 |
- } |
154 |
- } |
155 |
-- |
156 |
-+ function HTML_TreeMenu_DHTML(&$structure, $options = array(), $isDynamic = true) |
157 |
-+ { |
158 |
-+ self::__construct($structure, $options, $isDynamic); |
159 |
-+ } |
160 |
- /** |
161 |
- * Returns the HTML for the menu. |
162 |
- * |
163 |
-@@ -920,7 +932,7 @@ |
164 |
- * |
165 |
- * @access public |
166 |
- */ |
167 |
-- function HTML_TreeMenu_Listbox($structure, $options = array()) |
168 |
-+ function __construct($structure, $options = array()) |
169 |
- { |
170 |
- $this->HTML_TreeMenu_Presentation($structure); |
171 |
- |
172 |
-@@ -934,7 +946,10 @@ |
173 |
- $this->$option = $value; |
174 |
- } |
175 |
- } |
176 |
-- |
177 |
-+ function HTML_TreeMenu_Listbox($structure, $options = array()) |
178 |
-+ { |
179 |
-+ self::__construct($structure, $options); |
180 |
-+ } |
181 |
- /** |
182 |
- * Returns the HTML generated |
183 |
- * |
184 |
-diff -aurN a/tests/testBug_9750.phpt b/tests/testBug_9750.phpt |
185 |
---- a/tests/testBug_9750.phpt 2010-10-25 05:10:46.000000000 -0400 |
186 |
-+++ b/tests/testBug_9750.phpt 2017-08-04 15:27:53.691108758 -0400 |
187 |
-@@ -44,17 +44,17 @@ |
188 |
- 'nodeOptions' => $nodeOptions |
189 |
- ); |
190 |
- |
191 |
--$menu = &HTML_TreeMenu::createFromStructure($options); |
192 |
-+$menu = HTML_TreeMenu::createFromStructure($options); |
193 |
- |
194 |
- // Chose a generator. You can generate DHTML or a Listbox |
195 |
--$dhtml = &new HTML_TreeMenu_DHTML( |
196 |
-+$dhtml = new HTML_TreeMenu_DHTML( |
197 |
- $menu, |
198 |
- array( |
199 |
- 'images' => 'images', |
200 |
- 'defaultClass' => 'treeMenuDefault' |
201 |
- ) |
202 |
- ); |
203 |
--$listbox = &new HTML_TreeMenu_ListBox( |
204 |
-+$listbox = new HTML_TreeMenu_ListBox( |
205 |
- $menu, |
206 |
- array( |
207 |
- 'images' => 'images', |
208 |
|
209 |
diff --git a/dev-php/PEAR-HTML_TreeMenu/metadata.xml b/dev-php/PEAR-HTML_TreeMenu/metadata.xml |
210 |
deleted file mode 100644 |
211 |
index aca42932b83..00000000000 |
212 |
--- a/dev-php/PEAR-HTML_TreeMenu/metadata.xml |
213 |
+++ /dev/null |
214 |
@@ -1,8 +0,0 @@ |
215 |
-<?xml version="1.0" encoding="UTF-8"?> |
216 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
217 |
-<pkgmetadata> |
218 |
-<maintainer type="project"> |
219 |
- <email>php-bugs@g.o</email> |
220 |
- <name>PHP</name> |
221 |
-</maintainer> |
222 |
-</pkgmetadata> |
223 |
|
224 |
diff --git a/profiles/package.mask b/profiles/package.mask |
225 |
index c8a24ba1e55..f04ae2a48ef 100644 |
226 |
--- a/profiles/package.mask |
227 |
+++ b/profiles/package.mask |
228 |
@@ -356,7 +356,6 @@ kde-apps/kommander |
229 |
dev-php/PEAR-Auth |
230 |
dev-php/PEAR-Auth_HTTP |
231 |
dev-php/PEAR-HTML_Template_IT |
232 |
-dev-php/PEAR-HTML_TreeMenu |
233 |
|
234 |
# Lars Wendler <polynomial-c@g.o> (06 Aug 2017) |
235 |
# Masked for security reasons: |