gentoo resync : 28.04.2018

3 files changed, 37 insertions, 30 deletions

diff --git a/dev-php/phptal/Manifest b/dev-php/phptal/Manifest
index 57aa6bdb01a6..fa28599243ac 100644
--- a/dev-php/phptal/Manifest
+++ b/dev-php/phptal/Manifest
@@ -1,3 +1,3 @@
-DIST PHPTAL-1.2.2.tar.gz 163248 BLAKE2B d0b48a5131a4567eb058e6c3395bdfff7d0e9535dae036616dbfcb11564ce9db07bec8a77ee3201dcaff7a0bcdbb451b4d7443307d6092ba81d35b849f05603f SHA512 7af41180bccbc81481a48f474b1d2c811ba678706f85045611ff1e69c3ee820e27e6cf17ea58ec562120dcdaae1cf3d91f606a13b5c262906ceba7570b092d9b
-EBUILD phptal-1.2.2.ebuild 576 BLAKE2B f850cee3de500bc9421afb9320b99ab2b3ddedfc869b9e5b03da9606a88ea4d38d7f89abb328b68621fdfe2234061006c09d4a87a11e62d7240398521ae892f3 SHA512 b1fb2393d250f37979ea2de97052321bea0648d10cc9e3e4628690daa21ca7bf76bca36e2f1abc9c53a73a83b9ade0a8045bd3104820782500a2d882faba8944
+DIST phptal-1.3.1.tar.gz 272883 BLAKE2B 4914b8bb40464f22417fd7ed7dbf88709b95b69a69a905a5152ff640dd5af6af2be7c7d67a622d78029e4075b6b19d8d1bf537a4a6ccc0c97260e5183a961ecd SHA512 74856cbeab3f8d9d552bcb7275a0180fd25e7703230c90e4343fbe9be4001118b091fabbace89efa98a8bf0344f46edf36c4ba709ed0e9b040b82204ea3b7290
+EBUILD phptal-1.3.1.ebuild 808 BLAKE2B 28f94a4cfbef459c5a6b4cd2362529e358f692c346c46481f37757fd5d9d6112a6528ce77bde166e87d02242c19e73ed997bcdeb80c6b082e07f0ed84e4658e3 SHA512 cbc0477ffd9e5288df3bfcd374fcc9f4187730cf284fbc4d930be38134d34a201302abec8fc1d9f2428ef6d0af36c21d96df2811b1d150c88a8c171513dc52ba
 MISC metadata.xml 245 BLAKE2B 7d88a41bb224d6e6c8bc6ed766d24c4141ff7079307fc4e2dadd0d2300b565f5d8332f5a61ad49896af208f136f102bbfedb7b1f61241a82f21cbb6b0d9cc7e9 SHA512 81a613ac5d1bbcb88aad55e16c2b878dcc3a985a8c0d3b802a302067d94c3f878fa8b10aa4804a799a4180464b523eac2ee1bd6547d8baca8647e1e5cce38897
diff --git a/dev-php/phptal/phptal-1.2.2.ebuild b/dev-php/phptal/phptal-1.2.2.ebuild
deleted file mode 100644
index d09c2bf8e06e..000000000000
--- a/dev-php/phptal/phptal-1.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_LIB_NAME="PHPTAL"
-
-DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax"
-HOMEPAGE="http://phptal.org/"
-SRC_URI="http://phptal.org/files/${PHP_LIB_NAME}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php"
-
-S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
-
-src_install() {
-	insinto /usr/share/php/${PN}
-	doins -r "${PHP_LIB_NAME}"
-	doins PHPTAL.php phptal_lint.php
-
-	dodoc README
-}
diff --git a/dev-php/phptal/phptal-1.3.1.ebuild b/dev-php/phptal/phptal-1.3.1.ebuild
new file mode 100644
index 000000000000..f5ab86bdfd82
--- /dev/null
+++ b/dev-php/phptal/phptal-1.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_LIB_NAME="PHPTAL"
+
+DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax"
+HOMEPAGE="https://phptal.org/"
+SRC_URI="https://github.com/${PN}/${PHP_LIB_NAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/php/${PN}
+	doins -r "classes/${PHP_LIB_NAME}"
+	doins classes/PHPTAL.php tools/phptal_lint.php
+
+	dodoc README.md
+}
+
+src_test() {
+	[[ -z $(locale -a |grep en_GB) ]] && ewarn "Tests require en_GB locale to complete"
+	phpunit || die
+}