gentoo resync : 15.02.2018

3 files changed, 29 insertions, 16 deletions

diff --git a/dev-php/PEAR-Text_Wiki/Manifest b/dev-php/PEAR-Text_Wiki/Manifest
index c6fc40630957..e2e7f4c7a4fb 100644
--- a/dev-php/PEAR-Text_Wiki/Manifest
+++ b/dev-php/PEAR-Text_Wiki/Manifest
@@ -1,3 +1,3 @@
-DIST PEAR-Text_Wiki-1.2.2.tar.gz 82036 BLAKE2B 898d62c448352fb7e6d4877852ce45200ac676a5f6fb18987ab602428ef495f23ef37f6f1fb0538a644f3679e0dbbfdceec65698a7282d2ab2807d0f8126d102 SHA512 c799245d297349ed73f81997ce1c38f24b7dde18bd7535089275c467deed284de9daff6b4fbfb5728771b227e05dee42a00366e655715a1cc0baa807fea02320
-EBUILD PEAR-Text_Wiki-1.2.2.ebuild 474 BLAKE2B 97e70c98ed8f9be7cba07998e537f2f607dd06ec6a0b8c3527f96c70dc2e0deba4c61dc7cd3b948c8f47986305bc5a0f277cbccfb21c3d022cd76e34a64fb8b0 SHA512 7133912f96f9f350ea09219fea2b6e4ab106db4800d0997adcaad273dbb2bc2b00c3dced8fc4da53781469a764e12b9d2d8bd9e6aa5ce34870f57f2b1877424c
+DIST Text_Wiki-1.2.2_p20170904.tar.gz 86810 BLAKE2B 3277fbfae5683c147c1537a7f789b8b9500bfa39014832ed08d91028882813f60727f9ff503d38dde5f017fd5f1ec69d61775a14094b0d267a1b0019f10090c8 SHA512 8e731a6cc9ec0e964d86de5eb96f285155f61d21e229499132f5b06ef8ff520658a42c9c6fb60d73b9bc8828ec9b616bc11e4f04bdd6e74836d52fc53a92dd71
+EBUILD PEAR-Text_Wiki-1.2.2_p20170904.ebuild 763 BLAKE2B 73b4d3a410e24afdf0008fde5b7fce25c63075db2f33eba44f6581d161569ca0ae3b2d407ce5ad8e72899920e0b0b6717efc6b3751134ce9f3f18967969d7a5d SHA512 57592893c62bea481e5b58d82c41cd73f5bce078e353fdf28334941aea3c47a10d660455ae94e2eb6def445388a6ababa9c705f527c7b61f95e8ef6efa9304f6
 MISC metadata.xml 326 BLAKE2B a47b62c42ef2f751077622f4a770ffe42148d1d185948fd956e3b6caa57b37962af47733e129851e8931c449fd958d76f5261a1483d0dce20dbd73ff07d688ec SHA512 0d6ef943c1e68ec438ea1ef9627745be5abd72124e378313cb68895452db19873da7ca975f5865ca191b8b9b6855665064000a7d2071df334f486a5b172c7aeb
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild
deleted file mode 100644
index 0495e750dc24..000000000000
--- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text"
-LICENSE="LGPL-2.1 PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-# Pull from github as pear.php.net is not updated
-SRC_URI="https://github.com/pear/${PHP_PEAR_PKG_NAME}/archive/${PEAR_PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
new file mode 100644
index 000000000000..cf72e330dc7e
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+# Pull from github as pear.php.net is not updated
+SRC_URI="https://github.com/pear/${PHP_PEAR_PKG_NAME}/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> ${PEAR_P}.tar.gz"
+
+DEPEND="test? ( dev-php/phpunit dev-php/PEAR-PEAR )"
+
+src_test() {
+	peardev run-tests tests || die
+	phpunit tests/*.php || die
+}
+
+src_install() {
+	php-pear-r2_src_install
+	insinto /usr/share/php/.packagexml
+	newins package.xml "${PEAR_P}.xml"
+}