| 1 |
commit: 136aaeec57f5e3cc9d9d99c5fdde58815b48fed0 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 19 14:43:55 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 19 15:19:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136aaeec |
| 7 |
|
| 8 |
dev-php/PEAR-HTML_Template_Sigma: Straight to stable revbump |
| 9 |
|
| 10 |
Add required constructor and tests patch |
| 11 |
Enable tests |
| 12 |
Bump EAPI |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 15 |
|
| 16 |
.../PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild | 20 +++++++++++ |
| 17 |
.../PEAR-HTML_Template_Sigma-1.3.0.ebuild | 14 -------- |
| 18 |
.../files/HTML_Template_Sigma-1.3.0-php7.patch | 42 ++++++++++++++++++++++ |
| 19 |
3 files changed, 62 insertions(+), 14 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..828f16ce507 |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild |
| 26 |
@@ -0,0 +1,20 @@ |
| 27 |
+# Copyright 1999-2018 Gentoo Foundation |
| 28 |
+# Distributed under the terms of the GNU General Public License v2 |
| 29 |
+ |
| 30 |
+EAPI=6 |
| 31 |
+ |
| 32 |
+inherit php-pear-r2 |
| 33 |
+ |
| 34 |
+DESCRIPTION="An implementation of Integrated Templates API with template 'compilation' added" |
| 35 |
+LICENSE="PHP-3.01" |
| 36 |
+SLOT="0" |
| 37 |
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" |
| 38 |
+IUSE="test" |
| 39 |
+ |
| 40 |
+RDEPEND="dev-lang/php:*[ctype]" |
| 41 |
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )" |
| 42 |
+PATCHES=( "${FILESDIR}/HTML_Template_Sigma-1.3.0-php7.patch" ) |
| 43 |
+ |
| 44 |
+src_test() { |
| 45 |
+ phpunit tests/AllTests.php || die |
| 46 |
+} |
| 47 |
|
| 48 |
diff --git a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0.ebuild b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0.ebuild |
| 49 |
deleted file mode 100644 |
| 50 |
index dfde6e232ff..00000000000 |
| 51 |
--- a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0.ebuild |
| 52 |
+++ /dev/null |
| 53 |
@@ -1,14 +0,0 @@ |
| 54 |
-# Copyright 1999-2015 Gentoo Foundation |
| 55 |
-# Distributed under the terms of the GNU General Public License v2 |
| 56 |
- |
| 57 |
-EAPI=5 |
| 58 |
- |
| 59 |
-inherit php-pear-r1 |
| 60 |
- |
| 61 |
-DESCRIPTION="An implementation of Integrated Templates API with template 'compilation' added" |
| 62 |
-LICENSE="PHP-3.01" |
| 63 |
-SLOT="0" |
| 64 |
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" |
| 65 |
-IUSE="" |
| 66 |
- |
| 67 |
-DEPEND="dev-lang/php[ctype]" |
| 68 |
|
| 69 |
diff --git a/dev-php/PEAR-HTML_Template_Sigma/files/HTML_Template_Sigma-1.3.0-php7.patch b/dev-php/PEAR-HTML_Template_Sigma/files/HTML_Template_Sigma-1.3.0-php7.patch |
| 70 |
new file mode 100644 |
| 71 |
index 00000000000..ffb95e20846 |
| 72 |
--- /dev/null |
| 73 |
+++ b/dev-php/PEAR-HTML_Template_Sigma/files/HTML_Template_Sigma-1.3.0-php7.patch |
| 74 |
@@ -0,0 +1,42 @@ |
| 75 |
+diff -aurN a/HTML/Template/Sigma.php b/HTML/Template/Sigma.php |
| 76 |
+--- a/HTML/Template/Sigma.php 2014-01-13 04:33:52.000000000 -0500 |
| 77 |
++++ b/HTML/Template/Sigma.php 2018-02-19 09:29:52.995013991 -0500 |
| 78 |
+@@ -384,6 +384,26 @@ |
| 79 |
+ * |
| 80 |
+ * @see setRoot(), setCacheRoot() |
| 81 |
+ */ |
| 82 |
++ function __construct($root = '', $cacheRoot = '') |
| 83 |
++ { |
| 84 |
++ // the class is inherited from PEAR to be able to use $this->setErrorHandling() |
| 85 |
++ parent::__construct(); |
| 86 |
++ $this->variablesRegExp = '@' . $this->openingDelimiter . '(' . $this->variablenameRegExp . ')' . |
| 87 |
++ '(:(' . $this->functionnameRegExp . '))?' . $this->closingDelimiter . '@sm'; |
| 88 |
++ $this->removeVariablesRegExp = '@' . $this->openingDelimiter . '\s*(' . $this->variablenameRegExp . ')\s*' |
| 89 |
++ . $this->closingDelimiter . '@sm'; |
| 90 |
++ $this->blockRegExp = '@<!--\s+BEGIN\s+(' . $this->blocknameRegExp |
| 91 |
++ . ')\s+-->(.*)<!--\s+END\s+\1\s+-->@sm'; |
| 92 |
++ $this->functionRegExp = '@' . $this->functionPrefix . '(' . $this->functionnameRegExp . ')\s*\(@sm'; |
| 93 |
++ $this->setRoot($root); |
| 94 |
++ $this->setCacheRoot($cacheRoot); |
| 95 |
++ |
| 96 |
++ $this->setCallbackFunction('h', array(&$this, '_htmlspecialchars')); |
| 97 |
++ $this->setCallbackFunction('e', array(&$this, '_htmlentities')); |
| 98 |
++ $this->setCallbackFunction('u', 'urlencode'); |
| 99 |
++ $this->setCallbackFunction('r', 'rawurlencode'); |
| 100 |
++ $this->setCallbackFunction('j', array(&$this, '_jsEscape')); |
| 101 |
++ } |
| 102 |
+ function HTML_Template_Sigma($root = '', $cacheRoot = '') |
| 103 |
+ { |
| 104 |
+ // the class is inherited from PEAR to be able to use $this->setErrorHandling() |
| 105 |
+diff -aurN a/tests/AllTests.php b/tests/AllTests.php |
| 106 |
+--- a/tests/AllTests.php 2014-01-13 04:33:52.000000000 -0500 |
| 107 |
++++ b/tests/AllTests.php 2018-02-19 09:37:14.071972780 -0500 |
| 108 |
+@@ -24,8 +24,6 @@ |
| 109 |
+ define('PHPUnit_MAIN_METHOD', 'HTML_Template_Sigma_AllTests::main'); |
| 110 |
+ } |
| 111 |
+ |
| 112 |
+-require_once 'PHPUnit/Autoload.php'; |
| 113 |
+- |
| 114 |
+ /** |
| 115 |
+ * Class for file / directory manipulation from PEAR package |
| 116 |
+ */ |
Archives