From 64fbaca2f3ef3f102f2773765280ed16b33761a0 Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Thu, 19 Dec 2019 10:40:11 -0500
Subject: [PATCH] dev-php/PHP_TokenStream: Revbump for new revision; drop old

Signed-off-by: Brian Evans <grknight@gentoo.org>
---
 dev-php/PHP_TokenStream/Manifest              |  1 -
 .../PHP_TokenStream-1.1.3.ebuild              | 24 -------------------
 ...build => PHP_TokenStream-1.4.11-r1.ebuild} |  8 +++----
 dev-php/PHP_TokenStream/files/channel.xml     | 16 -------------
 4 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
 rename dev-php/PHP_TokenStream/{PHP_TokenStream-1.4.11.ebuild => PHP_TokenStream-1.4.11-r1.ebuild} (83%)
 delete mode 100644 dev-php/PHP_TokenStream/files/channel.xml

diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest
index c0cf241bd694..bb3db6b0d47d 100644
--- a/dev-php/PHP_TokenStream/Manifest
+++ b/dev-php/PHP_TokenStream/Manifest
@@ -1,2 +1 @@
-DIST PHP_TokenStream-1.1.3.tgz 9860 BLAKE2B 7160e80b5dc73cabd6cae388add7285fb99891d4e33a7b1224bd3ee9769b88c4e7c4927f96caa91bad2bbad86826f6a73665f716ea3d79b9f89eaa02a5187bf9 SHA512 2751acabc340f05c59bb46f8fb9e47ff25a5f8a6503f1525ed4977d96f2044ad0f9714b40f573d0b845aaf47424a89c3d9e7cfdada67c58d650bb98ee7b47772
 DIST PHP_TokenStream-1.4.11.tar.gz 13388 BLAKE2B 20ef9907ce660e2958ffd50f588ead563efa04c9fc4adda4a823830000f73ee7a4c988adc79d14e549c4f02836b7128aa42b01b26996a090595d34a191282b67 SHA512 4e8d8d1eb16169d46b64a43d91f3066d49fe8e3f184d90c5c7cf4234ebfe4eac271a811744b201f05dc86976b3c5b8ad4ae9f2532165a3849980663f1ac5852e
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
deleted file mode 100644
index 16306964ba0f..000000000000
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_PEAR_PKG_NAME="PHP_TokenStream"
-PHP_PEAR_DOMAIN="pear.phpunit.de"
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-
-inherit php-pear-r2
-
-DESCRIPTION="Wrapper around PHP's tokenizer extension"
-HOMEPAGE="http://pear.phpunit.de"
-SRC_URI="http://pear.phpunit.de/get/PHP_TokenStream-1.1.3.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND="dev-lang/php:*[tokenizer]
-	>=dev-php/pear-1.9.4"
-RDEPEND="${DEPEND}"
-DOCS=( README.markdown ChangeLog.markdown )
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
similarity index 83%
rename from dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild
rename to dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
index 8ebb0d66df95..4cf938f01d85 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="php-token-stream"
 
@@ -18,9 +18,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 RDEPEND="dev-php/fedora-autoloader
 	|| (
-		dev-lang/php:5.6[tokenizer]
-		dev-lang/php:7.0[tokenizer]
-		dev-lang/php:7.1[tokenizer]
+		dev-lang/php:7.2[tokenizer(-)]
 	)"
 
 src_install() {
diff --git a/dev-php/PHP_TokenStream/files/channel.xml b/dev-php/PHP_TokenStream/files/channel.xml
deleted file mode 100644
index 91bb6786f543..000000000000
--- a/dev-php/PHP_TokenStream/files/channel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
-    <name>pear.phpunit.de</name>
-    <summary>PHPUnit PEAR Channel</summary>
-    <suggestedalias>phpunit</suggestedalias>
-    <servers>
-        <primary>
-            <rest>
-                <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
-            </rest>
-        </primary>
-    </servers>
-</channel>
\ No newline at end of file
-- 
2.26.2