[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, dev-php/PHP_CodeSniffer/, dev-php/PEAR-PHP_CodeSniffer/

[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, dev-php/PHP_CodeSniffer/, dev-php/PEAR-PHP_CodeSniffer/

[Michael Orlitzky]

commit:     d20f220823a60f0eb2bffeb8d8583ea76bce3917
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 20:45:13 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 20:48:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20f2208

dev-php/PEAR-PHP_CodeSniffer: rename to  dev-php/PHP_CodeSniffer.

Gentoo-Bug: 575422

 .../PEAR-PHP_CodeSniffer-2.6.2-r1.ebuild           | 48 ----------------------
 .../Manifest                                       |  1 -
 .../PHP_CodeSniffer-2.6.2-r2.ebuild}               |  9 +---
 .../metadata.xml                                   |  0
 profiles/updates/3Q-2016                           |  1 +
 5 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.6.2-r1.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.6.2-r1.ebuild
deleted file mode 100644
index 7ef39e9..0000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# Can go if we ever drop the "PEAR-" prefix.
-MY_PN="${PN#PEAR-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Detect violations of PHP code standards"
-HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
-
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( >=dev-php/phpunit-4 )"
-RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
-
-# Can go if we ever drop the "PEAR-" prefix.
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CONTRIBUTING.md README.md )
-src_install() {
-	# The PEAR eclass would install everything into the wrong location.
-	insinto "/usr/share/${PN}"
-	doins -r CodeSniffer CodeSniffer.php
-
-	# These load code via relative paths, so they have to be symlinked
-	# and not dobin'd.
-	exeinto "/usr/share/${PN}/scripts"
-	for script in phpcbf phpcs; do
-		doexe "scripts/${script}"
-		dosym "/usr/share/${PN}/scripts/${script}" "/usr/bin/${script}"
-	done
-
-	einstalldocs
-}
-
-src_test() {
-	# The test suite will fail if date.timezone isn't set in php.ini.
-	phpunit -d date.timezone=UTC tests/AllTests.php \
-		|| die "test suite failed"
-}

diff --git a/dev-php/PEAR-PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
similarity index 50%
rename from dev-php/PEAR-PHP_CodeSniffer/Manifest
rename to dev-php/PHP_CodeSniffer/Manifest
index 4c0e201..738d545 100644
--- a/dev-php/PEAR-PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -1,2 +1 @@
-DIST PHP_CodeSniffer-2.5.1.tgz 484780 SHA256 9de1a12f2d184bd1846a6f756f7507b16722538c88c9dd66912915f498a3f330 SHA512 285cfa1c39ffa6d53317df1d9a4f78f718e0a8c8aded016b07982e83e5bed7713a8f8f8d0da988eb716cf9006f2261d32cc5ecb31c56e07d1be830e85213b002 WHIRLPOOL 74355c23de5ae70bb91ac226d68b61936fefd47487c20cb6d07a92a3060b27a220812a5b5af28d32cdf9be90890ad3c77591cf75ff5f47eef3e0f6fa444337af
 DIST PHP_CodeSniffer-2.6.2.tgz 497234 SHA256 f5c71941e254742130e22cd5ef48d3b06b486efbd1b3dbc7f2fa77acdeac650d SHA512 8e74ca2035f25647c836c6cacb6da6c1a3d0d280077cc6b31f5abf01843546c7370a96cba4f3a1b56fe8bac6954e10ce6570352ae67b14f717bab6a30bd2c865 WHIRLPOOL 558653b7ca61d65cdb20dc5e91b3b53f4de57e00aa399a58e798a497b5b1659241f946390817333621ed7e4737f6eda90088085b57e43832af24f7fd4a273a76

diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1-r1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-2.6.2-r2.ebuild
similarity index 84%
rename from dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1-r1.ebuild
rename to dev-php/PHP_CodeSniffer/PHP_CodeSniffer-2.6.2-r2.ebuild
index 2dfa8b7..ef6e783 100644
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1-r1.ebuild
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-2.6.2-r2.ebuild
@@ -4,16 +4,12 @@
 
 EAPI=6
 
-# Can go if we ever drop the "PEAR-" prefix.
-MY_PN="${PN#PEAR-}"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Detect violations of PHP code standards"
 HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
 
 # The test suite isn't part of the Github tarball at the moment. Keep an
 # eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+SRC_URI="http://download.pear.php.net/package/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,9 +19,6 @@ IUSE="test"
 DEPEND="test? ( >=dev-php/phpunit-4 )"
 RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
 
-# Can go if we ever drop the "PEAR-" prefix.
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( CONTRIBUTING.md README.md )
 src_install() {
 	# The PEAR eclass would install everything into the wrong location.

diff --git a/dev-php/PEAR-PHP_CodeSniffer/metadata.xml b/dev-php/PHP_CodeSniffer/metadata.xml
similarity index 100%
rename from dev-php/PEAR-PHP_CodeSniffer/metadata.xml
rename to dev-php/PHP_CodeSniffer/metadata.xml

diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index eabb71b..6b5a35d 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -9,3 +9,4 @@ move net-misc/ksshaskpass kde-plasma/ksshaskpass
 move dev-perl/convert-pem dev-perl/Convert-PEM
 slotmove >=dev-php/pecl-yaml-2.0.0_rc1 0 7
 move dev-perl/regexp-common dev-perl/Regexp-Common
+move dev-php/PEAR-PHP_CodeSniffer dev-php/PHP_CodeSniffer