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: dev-php/PEAR-HTML_Template_IT/files/, dev-php/PEAR-HTML_Template_IT/, profiles/
Date: Mon, 11 Sep 2017 18:57:42
Message-Id: 1505156191.8544036496c44901cc6d67c2b3f177e78d4c5378.mgorny@gentoo
1 commit: 8544036496c44901cc6d67c2b3f177e78d4c5378
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 11 18:54:54 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 11 18:56:31 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85440364
7
8 dev-php/PEAR-HTML_Template_IT: Remove last-rited pkg
9
10 dev-php/PEAR-HTML_Template_IT/Manifest | 1 -
11 .../PEAR-HTML_Template_IT-1.3.0-r1.ebuild | 32 -----------
12 .../PEAR-HTML_Template_IT-1.3.0.ebuild | 12 -----
13 .../PEAR-HTML_Template_IT/files/constructor.patch | 62 ----------------------
14 .../files/preg-callback.patch | 17 ------
15 dev-php/PEAR-HTML_Template_IT/metadata.xml | 8 ---
16 profiles/package.mask | 1 -
17 7 files changed, 133 deletions(-)
18
19 diff --git a/dev-php/PEAR-HTML_Template_IT/Manifest b/dev-php/PEAR-HTML_Template_IT/Manifest
20 deleted file mode 100644
21 index ff46c074bfc..00000000000
22 --- a/dev-php/PEAR-HTML_Template_IT/Manifest
23 +++ /dev/null
24 @@ -1 +0,0 @@
25 -DIST HTML_Template_IT-1.3.0.tgz 23309 SHA256 fe042e9fcc34b77cb6c008090257a25c39e3c1f5e3b0cac99e4eef142954fe70 SHA512 3174db25b09de3dd11e572c6f85b40ba8d6dd213175bcf9b308a52a6b3756ffa7870cfca5766f5692282b5788d6ae586003259e518f26fc263b25da12f99e168 WHIRLPOOL 6591343353dcd5ce09161d0afed1ebedaf6d92592ef467f11bb1126c733059a41d043675d8ed966d0cd949cfc22897cc659c5c229d85bd421221a11f6fb4cff4
26
27 diff --git a/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.3.0-r1.ebuild b/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.3.0-r1.ebuild
28 deleted file mode 100644
29 index c60b49c2ffd..00000000000
30 --- a/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.3.0-r1.ebuild
31 +++ /dev/null
32 @@ -1,32 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit php-pear-r2
39 -
40 -DESCRIPTION="Integrated Templates"
41 -LICENSE="BSD"
42 -SLOT="0"
43 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
44 -IUSE="examples test"
45 -DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
46 -
47 -src_prepare() {
48 - eapply "${FILESDIR}/preg-callback.patch" \
49 - "${FILESDIR}/constructor.patch"
50 - eapply_user
51 -}
52 -
53 -src_install() {
54 - use examples && HTML_DOCS=(
55 - examples/sample_it.php
56 - examples/sample_itx_addblockfile.php
57 - examples/templates/
58 - )
59 - php-pear-r2_src_install
60 -}
61 -
62 -src_test() {
63 - phpunit tests/AllTests.php || die
64 -}
65
66 diff --git a/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.3.0.ebuild b/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.3.0.ebuild
67 deleted file mode 100644
68 index 6afed25538f..00000000000
69 --- a/dev-php/PEAR-HTML_Template_IT/PEAR-HTML_Template_IT-1.3.0.ebuild
70 +++ /dev/null
71 @@ -1,12 +0,0 @@
72 -# Copyright 1999-2014 Gentoo Foundation
73 -# Distributed under the terms of the GNU General Public License v2
74 -
75 -EAPI=5
76 -
77 -inherit php-pear-r1
78 -
79 -DESCRIPTION="Integrated Templates"
80 -LICENSE="BSD"
81 -SLOT="0"
82 -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
83 -IUSE=""
84
85 diff --git a/dev-php/PEAR-HTML_Template_IT/files/constructor.patch b/dev-php/PEAR-HTML_Template_IT/files/constructor.patch
86 deleted file mode 100644
87 index 61d54eab4e2..00000000000
88 --- a/dev-php/PEAR-HTML_Template_IT/files/constructor.patch
89 +++ /dev/null
90 @@ -1,62 +0,0 @@
91 -diff -aurN a/HTML/Template/IT_Error.php b/HTML/Template/IT_Error.php
92 ---- a/HTML/Template/IT_Error.php 2010-03-10 03:08:10.000000000 -0500
93 -+++ b/HTML/Template/IT_Error.php 2017-08-01 16:44:31.257269180 -0400
94 -@@ -58,8 +58,11 @@
95 - */
96 - function IT_Error($msg, $file = __FILE__, $line = __LINE__)
97 - {
98 -+ $this->__construct($msg, $file, $line);
99 -+ }
100 -+ function __construct($msg, $file = __FILE__, $line = __LINE__)
101 -+ {
102 - $this->PEAR_Error(sprintf("%s [%s on line %d].", $msg, $file, $line));
103 - } // end func IT_Error
104 -
105 - } // end class IT_Error
106 --?>
107 -diff -aurN a/HTML/Template/IT.php b/HTML/Template/IT.php
108 ---- a/HTML/Template/IT.php 2017-08-01 16:40:29.822907534 -0400
109 -+++ b/HTML/Template/IT.php 2017-08-01 16:44:46.515860952 -0400
110 -@@ -409,6 +409,10 @@
111 - */
112 - function HTML_Template_IT($root = '', $options = null)
113 - {
114 -+ $this->__construct($root, $options);
115 -+ }
116 -+ function __construct($root = '', $options = null)
117 -+ {
118 - if (!is_null($options)) {
119 - $this->setOptions($options);
120 - }
121 -@@ -1184,4 +1188,3 @@
122 - $errorMessages[$value] : $errorMessages[IT_ERROR];
123 - }
124 - } // end class IntegratedTemplate
125 --?>
126 -diff -aurN a/HTML/Template/ITX.php b/HTML/Template/ITX.php
127 ---- a/HTML/Template/ITX.php 2010-03-10 03:08:10.000000000 -0500
128 -+++ b/HTML/Template/ITX.php 2017-08-01 16:44:41.185654236 -0400
129 -@@ -138,13 +138,17 @@
130 - */
131 - function HTML_Template_ITX($root = '')
132 - {
133 -+ $this->__construct($root);
134 -+ }
135 -+ function __construct($root = '')
136 -+ {
137 -
138 - $this->checkblocknameRegExp = '@' . $this->blocknameRegExp . '@';
139 -
140 - $this->functionRegExp = '@' . $this->functionPrefix . '(' .
141 - $this->functionnameRegExp . ')\s*\(@sm';
142 -
143 -- $this->HTML_Template_IT($root);
144 -+ parent::__construct($root);
145 - } // end func constructor
146 -
147 - /**
148 -@@ -886,4 +890,3 @@
149 - } // end func warning
150 -
151 - } // end class HTML_Template_ITX
152 --?>
153
154 diff --git a/dev-php/PEAR-HTML_Template_IT/files/preg-callback.patch b/dev-php/PEAR-HTML_Template_IT/files/preg-callback.patch
155 deleted file mode 100644
156 index 60ae20af189..00000000000
157 --- a/dev-php/PEAR-HTML_Template_IT/files/preg-callback.patch
158 +++ /dev/null
159 @@ -1,17 +0,0 @@
160 -diff -aurN a/HTML/Template/IT.php b/HTML/Template/IT.php
161 ---- a/HTML/Template/IT.php 2010-03-10 03:08:10.000000000 -0500
162 -+++ b/HTML/Template/IT.php 2017-08-01 15:12:31.161235223 -0400
163 -@@ -1088,9 +1088,10 @@
164 - $content = fread($fh, $fsize);
165 - fclose($fh);
166 -
167 -- return preg_replace(
168 -- "#<!-- INCLUDE (.*) -->#ime",
169 -- "\$this->getFile('\\1')",
170 -+ return preg_replace_callback(
171 -+ "#<!-- INCLUDE (.*) -->#im",
172 -+ function($matches) {
173 -+ return $this->getFile($matches[1]); },
174 - $content
175 - );
176 - } // end func getFile
177
178 diff --git a/dev-php/PEAR-HTML_Template_IT/metadata.xml b/dev-php/PEAR-HTML_Template_IT/metadata.xml
179 deleted file mode 100644
180 index aca42932b83..00000000000
181 --- a/dev-php/PEAR-HTML_Template_IT/metadata.xml
182 +++ /dev/null
183 @@ -1,8 +0,0 @@
184 -<?xml version="1.0" encoding="UTF-8"?>
185 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
186 -<pkgmetadata>
187 -<maintainer type="project">
188 - <email>php-bugs@g.o</email>
189 - <name>PHP</name>
190 -</maintainer>
191 -</pkgmetadata>
192
193 diff --git a/profiles/package.mask b/profiles/package.mask
194 index f04ae2a48ef..e2b60c7767a 100644
195 --- a/profiles/package.mask
196 +++ b/profiles/package.mask
197 @@ -355,7 +355,6 @@ kde-apps/kommander
198 # Masked for removal in 30 days
199 dev-php/PEAR-Auth
200 dev-php/PEAR-Auth_HTTP
201 -dev-php/PEAR-HTML_Template_IT
202
203 # Lars Wendler <polynomial-c@g.o> (06 Aug 2017)
204 # Masked for security reasons: