Revbump for EAPI5 and QA; cleanup old patch file

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

4 files changed, 34 insertions, 18 deletions

diff --git a/dev-php/PEAR-HTTP/ChangeLog b/dev-php/PEAR-HTTP/ChangeLog
index ae837fb2188e..317e16e48a5a 100644
--- a/dev-php/PEAR-HTTP/ChangeLog
+++ b/dev-php/PEAR-HTTP/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/PEAR-HTTP
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP/ChangeLog,v 1.45 2014/08/10 20:49:50 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP/ChangeLog,v 1.46 2014/10/12 02:24:46 grknight Exp $
+
+*PEAR-HTTP-1.4.1-r2 (12 Oct 2014)
+
+  12 Oct 2014; Brian Evans <grknight@gentoo.org> +PEAR-HTTP-1.4.1-r2.ebuild,
+  -files/PEAR-HTTP-1.4.0-trailingslash-redirect-bug12672.patch:
+  Revbump for EAPI5 and QA; cleanup old patch file
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> PEAR-HTTP-1.4.1-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-php/PEAR-HTTP/Manifest b/dev-php/PEAR-HTTP/Manifest
index f1d21b3632b9..06f1357e7152 100644
--- a/dev-php/PEAR-HTTP/Manifest
+++ b/dev-php/PEAR-HTTP/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX PEAR-HTTP-1.4.0-trailingslash-redirect-bug12672.patch 565 SHA256 5f88c969a2caee07f46252eb3bb720e0e2f28baa59d21c1f28cd5a6f80f8dcc9 SHA512 f2bd3f29d41bbd2767c47f8490d0e0cdf7fad1e968f598e519214e55a2e68fa568369e0e8c6efbde0da03765937625d063991917e8986d9eb0ba0d21fbaf80cd WHIRLPOOL 85fe8f8d28fad3d6e3f37aa1ac2cd2a84c1b552200624770fa7070625619a8ba801abd749ae13afa28c78b49cccf807a7403ded437ce433c9c37de111c612899
 DIST HTTP-1.4.1.tgz 8635 SHA256 5ec91f1f4f1bacf637af5413d3801fd5aaefa9c10c8079b9bd0fd0cc33f03d52 SHA512 60f9ef88eea358e83942213c9643ed7a635822c0963b79221eabb1000e126e5a79e4c6b3901c83c53ad1734ac6b774d355328a8d94087faee544af9bdc20f71c WHIRLPOOL 6b513e5aa352869dab3ffd47a0f6a234a94aee84035339255161129ad818440704391bd606b52b40f0da0582ae92675355a510965066c242d90bd32aea9a6e37
 EBUILD PEAR-HTTP-1.4.1-r1.ebuild 541 SHA256 3e359a5ee42e3a91528904276508a0c4c85d9bbf74037aaa9e670d15c3268477 SHA512 ad7942a9bf5f8e670951b455695e55b61cadb81e401d2fa050f5a0ad245be7af17f39c0b5fbcc76153bd727d7960dd76f1838443f5dfc1d2209cfcc2e3f19f52 WHIRLPOOL 00cefabf10da6198514af214c4b9a2956b92a9aa9d31f12975a5fd92807865ebb3fcad70a82f5cb0d87deb675ce2a5b8540fca325dabb475ad7b04781dc6c29d
-MISC ChangeLog 5896 SHA256 96b7277d4f114aeebbf19c6eff8cc550c8cca823b65784de9b42796c2b9e2baa SHA512 5ee283ebde35f1cd13173cb1c58a725dbb5005b3968ea9707bfaab405cee19793aeb409b2438fcbd0171205d413ca31a29b4db1056d8265bbad8e266f1d2f3c6 WHIRLPOOL b9038d16cfd2bb9e5a85f5997baced6abcb9306c61758e7de32df9b32e424eec787a664f5739a6ebc36efffa6f0c65f3ae1bc8ac2cd2295ea857e7c3924fbcf2
+EBUILD PEAR-HTTP-1.4.1-r2.ebuild 466 SHA256 a0e009b28259253c3fd6f1b66f51850f42890b0f382b47680eeb7ba42c085e6a SHA512 ac09e58bba66ffdcdb49580563f1445d5dfb9210ed938877632ce71ecd8d9aac12fd011fe010599b02e3255fe4a4799a41f1c7a8ee7ce40eb660c108b9e3263d WHIRLPOOL b1714e528a336b812ea693c8900ca5b070871dfa00465b9ff35abbd0c2207d6a2e018f2b116da173045e27165b359402d8c576fe5b13fe025c51b057aac1b92a
+MISC ChangeLog 6126 SHA256 57590e59789940cf226fbee84938f73833dc1e5607afea26eb0e13811346d94e SHA512 191c2de6f0daa0920859fefc7228e01f36725ea94b8ae62d7ae6ce7f9ba258b2614a90fabcf17ef0a5428b1539639efb832ad2a4589dfd7926ea09731c4651b2 WHIRLPOOL ee3b03dc47b53e2ac85fb8096252da1877515eeb232b0db67ff34c9514e2628516a2a9504b7c31c7b31defd11af94fff5f7419059421cd82283a7831b9ca2061
 MISC metadata.xml 156 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba SHA512 c15813e9ecae01488222d09140617eaf0e6e9b9b9d40412e1cda7838e64c8fb8c73c030dc90d723aea571acadddb76941c9a620fc4e554ba052ace1cc6b0ef79 WHIRLPOOL 1b1513674a388e3e95e09cfd70996bc98fc058ca0e0e7c5dc63e0b3389bedeb4dc16b55245b92a8ded7390cca0dc481e418f236a236ded9afcc2ef3845b25130
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn2u8ACgkQcaHudmEf86qa9ACfVq18MrRsegxSlltGEMuF5tqm
-NN0An0pFsRkSLieWfBOTadytqHanYRPk
-=jTjE
+iQEcBAEBCAAGBQJUOeZyAAoJEE4V4vFnx44dEx0IAJBLSbJUWKAyLxhI5WZzgI1x
+56A7kE9ZovVjrvyKu2qlLsSjI3gBrmxDXllXgB8Rla2056gCNN2eogJcOc9ERPGw
+hbjb0AdUZjBHtD6XiFQ3S2423od5QSMvDayEYvjTBv+MtYqZjkTtbSsZE7M1Cx0Z
+lTHoKppETDzh2LGk46F/9cshGM8k++/JHgmExXZA9n/yavOuSoOvdmluqFEFQ9XQ
++8humMzDQaC2RoN5irpa+L1VbyLwWvkgiZFRMDruBFIILDhBSgmDsrXucCsSVSrb
+20/LWtPdCTv6oj1RdsBuWikArn0Osy6+J30hRGTTO2Sn5hYaA+W5NGx5WKRQLdY=
+=/Go8
 -----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..5d768fc2af96
--- /dev/null
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild,v 1.1 2014/10/12 02:24:46 grknight Exp $
+
+EAPI=5
+
+inherit php-pear-r1 eutils
+
+DESCRIPTION="Miscellaneous HTTP utilities"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	# fix nasty DOS linebreaks
+	edos2unix HTTP.php
+}
diff --git a/dev-php/PEAR-HTTP/files/PEAR-HTTP-1.4.0-trailingslash-redirect-bug12672.patch b/dev-php/PEAR-HTTP/files/PEAR-HTTP-1.4.0-trailingslash-redirect-bug12672.patch
deleted file mode 100644
index fc986be13d89..000000000000
--- a/dev-php/PEAR-HTTP/files/PEAR-HTTP-1.4.0-trailingslash-redirect-bug12672.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nau HTTP.php.orig HTTP.php
---- HTTP.php.orig	23 Apr 2006 14:20:52 -0000
-+++ HTTP.php	12 Dec 2007 14:16:25 -0000
-@@ -332,6 +332,8 @@
-         if (isset($_SERVER['PATH_INFO']) && strlen($_SERVER['PATH_INFO']) && 
-                 $_SERVER['PHP_SELF'] != $_SERVER['PATH_INFO']) {
-             $path = dirname(substr($_SERVER['PHP_SELF'], 0, -strlen($_SERVER['PATH_INFO'])));
-+        } else if (substr($_SERVER['PHP_SELF'], -1) == "/") {
-+            $path = $_SERVER['PHP_SELF'];
-         } else {
-             $path = dirname($_SERVER['PHP_SELF']);
-         }