Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-HTTP_Client/, profiles/, dev-php/PEAR-HTTP_Client/files/
Date: Mon, 11 Sep 2017 18:57:43
Message-Id: 1505156189.dc9ff9ae1becc0f6975e57637a7d8950a7e22ac9.mgorny@gentoo
1 commit: dc9ff9ae1becc0f6975e57637a7d8950a7e22ac9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 11 18:54:36 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 11 18:56:29 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9ff9ae
7
8 dev-php/PEAR-HTTP_Client: Remove last-rited pkg
9
10 dev-php/PEAR-HTTP_Client/Manifest | 1 -
11 .../PEAR-HTTP_Client-1.2.1-r1.ebuild | 22 -------
12 .../PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1.ebuild | 11 ----
13 dev-php/PEAR-HTTP_Client/files/modern-php.patch | 69 ----------------------
14 dev-php/PEAR-HTTP_Client/metadata.xml | 8 ---
15 profiles/package.mask | 1 -
16 6 files changed, 112 deletions(-)
17
18 diff --git a/dev-php/PEAR-HTTP_Client/Manifest b/dev-php/PEAR-HTTP_Client/Manifest
19 deleted file mode 100644
20 index 31df5041d97..00000000000
21 --- a/dev-php/PEAR-HTTP_Client/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST HTTP_Client-1.2.1.tgz 10202 SHA256 1c76e6748fe59270c5df058042c692aa00a0cc23f61f5cd64eb61673158e3e55 SHA512 9865a63b11362ef5397ed52e052e8b322e5132db674aa26720d6dbabd542415a640c9c9a5804025ee634d9b17fe4f14003c35f2f516c3674ca688a44e9a7958d WHIRLPOOL 2531d31c0cb4d71ea67601718f359fe2b44ed90259f5192ff4326b68ed17e1211310645080c6d671831b670ca8ccb9c7638b2b16b2cca74de5b75d60c1a57445
25
26 diff --git a/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1-r1.ebuild b/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1-r1.ebuild
27 deleted file mode 100644
28 index be135e1f8c4..00000000000
29 --- a/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1-r1.ebuild
30 +++ /dev/null
31 @@ -1,22 +0,0 @@
32 -# Copyright 1999-2017 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -inherit php-pear-r2
38 -
39 -DESCRIPTION="Perform multiple HTTP requests and process their results"
40 -LICENSE="BSD"
41 -SLOT="0"
42 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
43 -IUSE=""
44 -RDEPEND=">=dev-php/PEAR-HTTP_Request-1.2"
45 -
46 -PATCHES=( "${FILESDIR}/modern-php.patch" )
47 -
48 -src_install() {
49 - insinto /usr/share/php/HTTP
50 - doins -r Client.php Client
51 - php-pear-r2_install_packagexml
52 - einstalldocs
53 -}
54
55 diff --git a/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1.ebuild b/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1.ebuild
56 deleted file mode 100644
57 index 0cf3b60e5b6..00000000000
58 --- a/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1.ebuild
59 +++ /dev/null
60 @@ -1,11 +0,0 @@
61 -# Copyright 1999-2017 Gentoo Foundation
62 -# Distributed under the terms of the GNU General Public License v2
63 -
64 -inherit php-pear-r1
65 -
66 -DESCRIPTION="Perform multiple HTTP requests and process their results"
67 -LICENSE="BSD"
68 -SLOT="0"
69 -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
70 -IUSE=""
71 -RDEPEND=">=dev-php/PEAR-HTTP_Request-1.2"
72
73 diff --git a/dev-php/PEAR-HTTP_Client/files/modern-php.patch b/dev-php/PEAR-HTTP_Client/files/modern-php.patch
74 deleted file mode 100644
75 index 6e715452b48..00000000000
76 --- a/dev-php/PEAR-HTTP_Client/files/modern-php.patch
77 +++ /dev/null
78 @@ -1,69 +0,0 @@
79 -diff -aurN a/Client/CookieManager.php b/Client/CookieManager.php
80 ---- a/Client/CookieManager.php 2008-10-25 13:08:26.000000000 -0400
81 -+++ b/Client/CookieManager.php 2017-08-07 10:17:04.495233973 -0400
82 -@@ -75,11 +75,14 @@
83 - * @access public
84 - * @see serializeSessionCookies()
85 - */
86 -- function HTTP_Client_CookieManager($serializeSession = false)
87 -+ function __construct($serializeSession = false)
88 - {
89 - $this->serializeSessionCookies($serializeSession);
90 - }
91 --
92 -+ function HTTP_Client_CookieManager($serializeSession = false)
93 -+ {
94 -+ self::__construct($serializeSession);
95 -+ }
96 - /**
97 - * Sets whether session cookies should be serialized when serializing object
98 - *
99 -@@ -264,4 +267,3 @@
100 - }
101 - }
102 - }
103 --?>
104 -diff -aurN a/Client.php b/Client.php
105 ---- a/Client.php 2008-10-25 13:08:26.000000000 -0400
106 -+++ b/Client.php 2017-08-07 10:13:52.524610550 -0400
107 -@@ -171,12 +171,12 @@
108 - * @param array Default headers to send on every request
109 - * @param HTTP_Client_CookieManager Cookie manager object to use
110 - */
111 -- function HTTP_Client($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)
112 -+ function __construct($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)
113 - {
114 - if (!empty($cookieManager) && is_a($cookieManager, 'HTTP_Client_CookieManager')) {
115 - $this->_cookieManager = $cookieManager;
116 - } else {
117 -- $this->_cookieManager =& new HTTP_Client_CookieManager();
118 -+ $this->_cookieManager = new HTTP_Client_CookieManager();
119 - }
120 - if (isset($defaultHeaders)) {
121 - $this->setDefaultHeader($defaultHeaders);
122 -@@ -185,7 +185,10 @@
123 - $this->setRequestParameter($defaultRequestParams);
124 - }
125 - }
126 --
127 -+ function HTTP_Client($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)
128 -+ {
129 -+ self::__construct($defaultRequestParams, $defaultHeaders, $cookieManager);
130 -+ }
131 -
132 - /**
133 - * Sets the maximum redirects that will be processed.
134 -@@ -225,7 +228,7 @@
135 - */
136 - function &_createRequest($url, $method = HTTP_REQUEST_METHOD_GET, $headers = array())
137 - {
138 -- $req =& new HTTP_Request($url, $this->_defaultRequestParams);
139 -+ $req = new HTTP_Request($url, $this->_defaultRequestParams);
140 - $req->setMethod($method);
141 - foreach ($this->_defaultHeaders as $name => $value) {
142 - $req->addHeader($name, $value);
143 -@@ -716,4 +719,3 @@
144 - return $this->_idx < count($this->_responses);
145 - }
146 - }
147 --?>
148
149 diff --git a/dev-php/PEAR-HTTP_Client/metadata.xml b/dev-php/PEAR-HTTP_Client/metadata.xml
150 deleted file mode 100644
151 index b86acf66c75..00000000000
152 --- a/dev-php/PEAR-HTTP_Client/metadata.xml
153 +++ /dev/null
154 @@ -1,8 +0,0 @@
155 -<?xml version="1.0" encoding="UTF-8"?>
156 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
157 -<pkgmetadata>
158 - <maintainer type="project">
159 - <email>php-bugs@g.o</email>
160 - <name>PHP</name>
161 - </maintainer>
162 -</pkgmetadata>
163
164 diff --git a/profiles/package.mask b/profiles/package.mask
165 index 1835949bbdc..c8a24ba1e55 100644
166 --- a/profiles/package.mask
167 +++ b/profiles/package.mask
168 @@ -357,7 +357,6 @@ dev-php/PEAR-Auth
169 dev-php/PEAR-Auth_HTTP
170 dev-php/PEAR-HTML_Template_IT
171 dev-php/PEAR-HTML_TreeMenu
172 -dev-php/PEAR-HTTP_Client
173
174 # Lars Wendler <polynomial-c@g.o> (06 Aug 2017)
175 # Masked for security reasons: