Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-php/PEAR-Translation2/files/, dev-php/PEAR-Translation2/
Date: Mon, 11 Sep 2017 18:57:35
Message-Id: 1505156180.5895ca960bd5ede4022c1e3603c772bf8c93afb5.mgorny@gentoo
1 commit: 5895ca960bd5ede4022c1e3603c772bf8c93afb5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 11 18:52:16 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 11 18:56:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5895ca96
7
8 dev-php/PEAR-Translation2: Remove last-rited pkg
9
10 dev-php/PEAR-Translation2/Manifest | 1 -
11 .../PEAR-Translation2-2.0.4-r1.ebuild | 29 --
12 dev-php/PEAR-Translation2/files/modern-php.patch | 328 ---------------------
13 dev-php/PEAR-Translation2/metadata.xml | 8 -
14 profiles/package.mask | 1 -
15 5 files changed, 367 deletions(-)
16
17 diff --git a/dev-php/PEAR-Translation2/Manifest b/dev-php/PEAR-Translation2/Manifest
18 deleted file mode 100644
19 index b2245057c10..00000000000
20 --- a/dev-php/PEAR-Translation2/Manifest
21 +++ /dev/null
22 @@ -1 +0,0 @@
23 -DIST Translation2-2.0.4.tgz 58272 SHA256 4cce7070e7ef556a8400745597dc8b5c8605848da42167b125ce8f559adddaf7 SHA512 f1c74f9409c15dbb5c955cc5f19b73cf11c424be28a5d6ef4066d8bf9176a26e63bc2e773712c1e1da636386778b467c965ce915f036ad5e91f3695062732f64 WHIRLPOOL 90509fc6efd44327a7bc357ba333f4f79475af8a3163e3136358e9e592bda0a2e04ce76fa7401b3ba3f144cb96dc3176233ea9698977a33a9bacfc2ed8a8afbc
24
25 diff --git a/dev-php/PEAR-Translation2/PEAR-Translation2-2.0.4-r1.ebuild b/dev-php/PEAR-Translation2/PEAR-Translation2-2.0.4-r1.ebuild
26 deleted file mode 100644
27 index e627b59f3ce..00000000000
28 --- a/dev-php/PEAR-Translation2/PEAR-Translation2-2.0.4-r1.ebuild
29 +++ /dev/null
30 @@ -1,29 +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 -inherit php-pear-r2
36 -
37 -DESCRIPTION="Class for multilingual applications management"
38 -LICENSE="BSD"
39 -SLOT="0"
40 -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
41 -IUSE="examples minimal xml"
42 -
43 -RDEPEND="dev-lang/php:*[nls]
44 - !minimal? ( dev-php/PEAR-Cache_Lite
45 - dev-php/PEAR-DB
46 - dev-php/PEAR-DB_DataObject
47 - dev-php/PEAR-MDB
48 - dev-php/PEAR-MDB2
49 - dev-php/PEAR-File_Gettext
50 - >=dev-php/PEAR-I18Nv2-0.9.1 )
51 - xml? ( >=dev-php/PEAR-XML_Serializer-0.13.0 )"
52 -PATCHES=( "${FILESDIR}/modern-php.patch" )
53 -src_install() {
54 - local DOCS=( docs/gettext_readme.txt )
55 - php-pear-r2_src_install
56 - use examples && dodoc -r docs/examples
57 - # Fix this for PHP5
58 - # dobin scripts/t2xmlchk.php
59 -}
60
61 diff --git a/dev-php/PEAR-Translation2/files/modern-php.patch b/dev-php/PEAR-Translation2/files/modern-php.patch
62 deleted file mode 100644
63 index c9b8ccaacf7..00000000000
64 --- a/dev-php/PEAR-Translation2/files/modern-php.patch
65 +++ /dev/null
66 @@ -1,328 +0,0 @@
67 -diff -uarN a/docs/examples/gettext_admin.php b/docs/examples/gettext_admin.php
68 ---- a/docs/examples/gettext_admin.php 2010-12-05 17:56:30.000000000 -0500
69 -+++ b/docs/examples/gettext_admin.php 2017-08-04 09:22:31.277320045 -0400
70 -@@ -17,7 +17,7 @@
71 - $days = array();
72 - $months= array();
73 -
74 --$lc = &new I18Nv2_Locale;
75 -+$lc = new I18Nv2_Locale;
76 -
77 - foreach ($langs as $lang) {
78 - $lc->setLocale($lang);
79 -diff -uarN a/docs/examples/gettext_prepare.php b/docs/examples/gettext_prepare.php
80 ---- a/docs/examples/gettext_prepare.php 2010-12-05 17:56:31.000000000 -0500
81 -+++ b/docs/examples/gettext_prepare.php 2017-08-04 09:22:31.278320085 -0400
82 -@@ -4,7 +4,7 @@
83 - require_once 'File/Gettext.php';
84 - require_once 'I18Nv2/Locale.php';
85 -
86 --$l = &new I18Nv2_Locale('en');
87 -+$l = new I18Nv2_Locale('en');
88 - $g = &File_Gettext::factory('MO');
89 -
90 - $g->meta = array('Content-Type' => 'text/plain; charset=iso-8859-1');
91 -diff -uarN a/scripts/t2xmlchk.php b/scripts/t2xmlchk.php
92 ---- a/scripts/t2xmlchk.php 2010-12-05 17:56:31.000000000 -0500
93 -+++ b/scripts/t2xmlchk.php 2017-08-04 09:22:31.277320045 -0400
94 -@@ -39,7 +39,7 @@
95 - exit("\n");
96 - }
97 -
98 --$validator =& new XML_DTD_XmlValidator();
99 -+$validator =new XML_DTD_XmlValidator();
100 -
101 - $dtd_file = tempnam('/tmp', 't2');
102 - $fp = fopen($dtd_file, 'w');
103 -@@ -63,7 +63,7 @@
104 - 'string' => 'key',
105 - 'tr' => 'lang'
106 - );
107 --$unserializer = &new XML_Unserializer(array('keyAttribute' => $keyAttr));
108 -+$unserializer = new XML_Unserializer(array('keyAttribute' => $keyAttr));
109 - if (PEAR::isError($status = $unserializer->unserialize($xml_file, true))) {
110 - exit("FAILED : " . $status->getMessage() . "\n");
111 - } else {
112 -diff -uarN a/tests/admin_containers_tests.php b/tests/admin_containers_tests.php
113 ---- a/tests/admin_containers_tests.php 2010-12-05 17:56:31.000000000 -0500
114 -+++ b/tests/admin_containers_tests.php 2017-08-04 09:22:31.272319845 -0400
115 -@@ -19,7 +19,7 @@
116 -
117 - if (!defined('TEST_RUNNING')) {
118 - define('TEST_RUNNING', true);
119 -- $test = &new AdminContainersTests();
120 -+ $test = new AdminContainersTests();
121 - $test->run(new HtmlReporter());
122 - }
123 - ?>
124 -\ No newline at end of file
125 -diff -uarN a/tests/admin_db_test.php b/tests/admin_db_test.php
126 ---- a/tests/admin_db_test.php 2010-12-05 17:56:31.000000000 -0500
127 -+++ b/tests/admin_db_test.php 2017-08-04 09:22:31.274319925 -0400
128 -@@ -5,7 +5,7 @@
129 -
130 - if (!defined('TEST_RUNNING')) {
131 - define('TEST_RUNNING', true);
132 -- $test = &new TestOfAdminContainerDB();
133 -+ $test = new TestOfAdminContainerDB();
134 - $test->run(new HtmlReporter());
135 - }
136 - ?>
137 -\ No newline at end of file
138 -diff -uarN a/tests/admin_gettext_mo_test.php b/tests/admin_gettext_mo_test.php
139 ---- a/tests/admin_gettext_mo_test.php 2010-12-05 17:56:31.000000000 -0500
140 -+++ b/tests/admin_gettext_mo_test.php 2017-08-04 09:22:31.274319925 -0400
141 -@@ -23,7 +23,7 @@
142 -
143 - if (!defined('TEST_RUNNING')) {
144 - define('TEST_RUNNING', true);
145 -- $test = &new TestOfAdminContainerGettextMO();
146 -+ $test = new TestOfAdminContainerGettextMO();
147 - $test->run(new HtmlReporter());
148 - }
149 - ?>
150 -\ No newline at end of file
151 -diff -uarN a/tests/admin_gettext_po_test.php b/tests/admin_gettext_po_test.php
152 ---- a/tests/admin_gettext_po_test.php 2010-12-05 17:56:31.000000000 -0500
153 -+++ b/tests/admin_gettext_po_test.php 2017-08-04 09:22:31.273319885 -0400
154 -@@ -5,7 +5,7 @@
155 -
156 - if (!defined('TEST_RUNNING')) {
157 - define('TEST_RUNNING', true);
158 -- $test = &new TestOfAdminContainerGettextPO();
159 -+ $test = new TestOfAdminContainerGettextPO();
160 - $test->run(new HtmlReporter());
161 - }
162 - ?>
163 -\ No newline at end of file
164 -diff -uarN a/tests/admin_mdb2_test.php b/tests/admin_mdb2_test.php
165 ---- a/tests/admin_mdb2_test.php 2010-12-05 17:56:31.000000000 -0500
166 -+++ b/tests/admin_mdb2_test.php 2017-08-04 09:22:31.274319925 -0400
167 -@@ -15,7 +15,7 @@
168 -
169 - if (!defined('TEST_RUNNING')) {
170 - define('TEST_RUNNING', true);
171 -- $test = &new TestOfAdminContainerMDB2();
172 -+ $test = new TestOfAdminContainerMDB2();
173 - $test->run(new HtmlReporter());
174 - }
175 - ?>
176 -\ No newline at end of file
177 -diff -uarN a/tests/admin_mdb_test.php b/tests/admin_mdb_test.php
178 ---- a/tests/admin_mdb_test.php 2010-12-05 17:56:31.000000000 -0500
179 -+++ b/tests/admin_mdb_test.php 2017-08-04 09:22:31.273319885 -0400
180 -@@ -15,7 +15,7 @@
181 -
182 - if (!defined('TEST_RUNNING')) {
183 - define('TEST_RUNNING', true);
184 -- $test = &new TestOfAdminContainerMDB();
185 -+ $test = new TestOfAdminContainerMDB();
186 - $test->run(new HtmlReporter());
187 - }
188 - ?>
189 -\ No newline at end of file
190 -diff -uarN a/tests/all_tests.php b/tests/all_tests.php
191 ---- a/tests/all_tests.php 2010-12-05 17:56:31.000000000 -0500
192 -+++ b/tests/all_tests.php 2017-08-04 09:22:31.275319965 -0400
193 -@@ -18,6 +18,6 @@
194 - }
195 - }
196 -
197 --$test = &new AllTests();
198 -+$test = new AllTests();
199 - $test->run(new HtmlReporter());
200 - ?>
201 -\ No newline at end of file
202 -diff -uarN a/tests/containers_tests.php b/tests/containers_tests.php
203 ---- a/tests/containers_tests.php 2010-12-05 17:56:31.000000000 -0500
204 -+++ b/tests/containers_tests.php 2017-08-04 09:22:31.274319925 -0400
205 -@@ -18,7 +18,7 @@
206 -
207 - if (!defined('TEST_RUNNING')) {
208 - define('TEST_RUNNING', true);
209 -- $test = &new ContainersTests();
210 -+ $test = new ContainersTests();
211 - $test->run(new HtmlReporter());
212 - }
213 - ?>
214 -\ No newline at end of file
215 -diff -uarN a/tests/db_test.php b/tests/db_test.php
216 ---- a/tests/db_test.php 2010-12-05 17:56:31.000000000 -0500
217 -+++ b/tests/db_test.php 2017-08-04 09:22:31.274319925 -0400
218 -@@ -5,7 +5,7 @@
219 -
220 - if (!defined('TEST_RUNNING')) {
221 - define('TEST_RUNNING', true);
222 -- $test = &new TestOfContainerDB();
223 -+ $test = new TestOfContainerDB();
224 - $test->run(new HtmlReporter());
225 - }
226 - ?>
227 -\ No newline at end of file
228 -diff -uarN a/tests/gettext_mo_test.php b/tests/gettext_mo_test.php
229 ---- a/tests/gettext_mo_test.php 2010-12-05 17:56:31.000000000 -0500
230 -+++ b/tests/gettext_mo_test.php 2017-08-04 09:22:31.273319885 -0400
231 -@@ -82,7 +82,7 @@
232 -
233 - if (!defined('TEST_RUNNING')) {
234 - define('TEST_RUNNING', true);
235 -- $test = &new TestOfGettextMO();
236 -+ $test = new TestOfGettextMO();
237 - $test->run(new HtmlReporter());
238 - }
239 - ?>
240 -\ No newline at end of file
241 -diff -uarN a/tests/gettext_po_test.php b/tests/gettext_po_test.php
242 ---- a/tests/gettext_po_test.php 2010-12-05 17:56:31.000000000 -0500
243 -+++ b/tests/gettext_po_test.php 2017-08-04 09:22:31.275319965 -0400
244 -@@ -80,7 +80,7 @@
245 -
246 - if (!defined('TEST_RUNNING')) {
247 - define('TEST_RUNNING', true);
248 -- $test = &new TestOfGettextPO();
249 -+ $test = new TestOfGettextPO();
250 - $test->run(new HtmlReporter());
251 - }
252 - ?>
253 -\ No newline at end of file
254 -diff -uarN a/tests/gettext_prepare.php b/tests/gettext_prepare.php
255 ---- a/tests/gettext_prepare.php 2010-12-05 17:56:31.000000000 -0500
256 -+++ b/tests/gettext_prepare.php 2017-08-04 09:22:31.275319965 -0400
257 -@@ -4,7 +4,7 @@
258 - require_once 'File/Gettext.php';
259 - require_once 'I18Nv2/Locale.php';
260 -
261 --$l = &new I18Nv2_Locale('en');
262 -+$l = new I18Nv2_Locale('en');
263 -
264 - foreach (array('mo', 'po') as $fileType) {
265 -
266 -diff -uarN a/tests/mdb2_test.php b/tests/mdb2_test.php
267 ---- a/tests/mdb2_test.php 2010-12-05 17:56:31.000000000 -0500
268 -+++ b/tests/mdb2_test.php 2017-08-04 09:22:31.273319885 -0400
269 -@@ -15,7 +15,7 @@
270 -
271 - if (!defined('TEST_RUNNING')) {
272 - define('TEST_RUNNING', true);
273 -- $test = &new TestOfContainerMDB2();
274 -+ $test = new TestOfContainerMDB2();
275 - $test->run(new HtmlReporter());
276 - }
277 - ?>
278 -\ No newline at end of file
279 -diff -uarN a/tests/mdb_test.php b/tests/mdb_test.php
280 ---- a/tests/mdb_test.php 2010-12-05 17:56:31.000000000 -0500
281 -+++ b/tests/mdb_test.php 2017-08-04 09:22:31.273319885 -0400
282 -@@ -15,7 +15,7 @@
283 -
284 - if (!defined('TEST_RUNNING')) {
285 - define('TEST_RUNNING', true);
286 -- $test = &new TestOfContainerMDB();
287 -+ $test = new TestOfContainerMDB();
288 - $test->run(new HtmlReporter());
289 - }
290 - ?>
291 -\ No newline at end of file
292 -diff -uarN a/Translation2/Container/xml.php b/Translation2/Container/xml.php
293 ---- a/Translation2/Container/xml.php 2010-12-05 17:56:31.000000000 -0500
294 -+++ b/Translation2/Container/xml.php 2017-08-04 09:22:31.277320045 -0400
295 -@@ -160,7 +160,7 @@
296 - return new PEAR_Error ("Can\'t read from the XML source: {$this->_filename}");
297 - }
298 - @flock($fp, LOCK_SH);
299 -- $unserializer = &new XML_Unserializer (array('keyAttribute' => $keyAttr));
300 -+ $unserializer = new XML_Unserializer (array('keyAttribute' => $keyAttr));
301 - if (PEAR::isError($status = $unserializer->unserialize($this->_filename, true))) {
302 - fclose($fp);
303 - return $status;
304 -diff -uarN a/Translation2/Container.php b/Translation2/Container.php
305 ---- a/Translation2/Container.php 2010-12-05 17:56:31.000000000 -0500
306 -+++ b/Translation2/Container.php 2017-08-04 09:32:40.021575421 -0400
307 -@@ -80,6 +80,9 @@
308 - *
309 - * @access public
310 - */
311 -+ function __construct()
312 -+ {
313 -+ }
314 - function Translation2_Container()
315 - {
316 - }
317 -@@ -357,4 +360,4 @@
318 -
319 - // }}}
320 - }
321 --?>
322 -\ No newline at end of file
323 -+?>
324 -diff -uarN a/Translation2/Decorator.php b/Translation2/Decorator.php
325 ---- a/Translation2/Decorator.php 2010-12-05 17:56:31.000000000 -0500
326 -+++ b/Translation2/Decorator.php 2017-08-04 09:33:23.341206788 -0400
327 -@@ -35,7 +35,7 @@
328 - * @version CVS: $Id: Decorator.php 305985 2010-12-05 22:55:33Z clockwerx $
329 - * @link http://pear.php.net/package/Translation2
330 - */
331 --
332 -+require_once 'Translation2.php';
333 - /**
334 - * Translation2_Decorator. Base Decorator class for Translation2
335 - *
336 -@@ -88,7 +88,7 @@
337 - *
338 - * @param object &$translation2 Translation2 object to decorate
339 - */
340 -- function Translation2_Decorator(& $translation2)
341 -+ function __construct(& $translation2)
342 - {
343 - $this->translation2 = & $translation2;
344 - //used for debug only
345 -@@ -96,7 +96,10 @@
346 - $this->currentPageID = & $translation2->currentPageID;
347 - $this->lang = & $translation2->lang;
348 - }
349 --
350 -+ function Translation2_Decorator(& $translation2)
351 -+ {
352 -+ self::__construct($translation2);
353 -+ }
354 - // }}}
355 - // {{{ setOptions()
356 -
357 -@@ -413,4 +416,4 @@
358 -
359 - // }}}
360 - }
361 --?>
362 -\ No newline at end of file
363 -+?>
364 -diff -uarN a/Translation2.php b/Translation2.php
365 ---- a/Translation2.php 2010-12-05 17:56:31.000000000 -0500
366 -+++ b/Translation2.php 2017-08-04 09:31:14.843367708 -0400
367 -@@ -122,7 +122,7 @@
368 - /**
369 - * Constructor
370 - */
371 -- function Translation2()
372 -+ function __construct()
373 - {
374 - if (func_num_args()) {
375 - $msg = '<b>Translation2 error:</b>'
376 -@@ -130,7 +130,10 @@
377 - trigger_error($msg, E_USER_ERROR);
378 - }
379 - }
380 --
381 -+ function Translation2()
382 -+ {
383 -+ self::__construct();
384 -+ }
385 - // }}}
386 - // {{{ factory()
387 -
388 -@@ -595,4 +598,4 @@
389 -
390 - // }}}
391 - }
392 --?>
393 -\ No newline at end of file
394 -+?>
395
396 diff --git a/dev-php/PEAR-Translation2/metadata.xml b/dev-php/PEAR-Translation2/metadata.xml
397 deleted file mode 100644
398 index b86acf66c75..00000000000
399 --- a/dev-php/PEAR-Translation2/metadata.xml
400 +++ /dev/null
401 @@ -1,8 +0,0 @@
402 -<?xml version="1.0" encoding="UTF-8"?>
403 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
404 -<pkgmetadata>
405 - <maintainer type="project">
406 - <email>php-bugs@g.o</email>
407 - <name>PHP</name>
408 - </maintainer>
409 -</pkgmetadata>
410
411 diff --git a/profiles/package.mask b/profiles/package.mask
412 index 679da79c026..24b676e53ec 100644
413 --- a/profiles/package.mask
414 +++ b/profiles/package.mask
415 @@ -365,7 +365,6 @@ dev-php/PEAR-SOAP
416 dev-php/PEAR-Services_Amazon
417 dev-php/PEAR-Services_Weather
418 dev-php/PEAR-Testing_Selenium
419 -dev-php/PEAR-Translation2
420
421 # Lars Wendler <polynomial-c@g.o> (06 Aug 2017)
422 # Masked for security reasons: