1 |
commit: 95854119c39b6b2bd16f6fb2753604357982f1e0 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 30 14:52:56 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 30 15:09:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95854119 |
7 |
|
8 |
dev-php/pecl-mysqlnd_qc: Drop package |
9 |
|
10 |
Bug: https://bugs.gentoo.org/651784 |
11 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
12 |
|
13 |
dev-php/pecl-mysqlnd_qc/Manifest | 1 - |
14 |
.../files/pecl-mysqlnd_qc-1.2.0-php56.patch | 48 --------------------- |
15 |
dev-php/pecl-mysqlnd_qc/metadata.xml | 12 ------ |
16 |
.../pecl-mysqlnd_qc-1.2.0-r2.ebuild | 49 ---------------------- |
17 |
profiles/package.mask | 1 - |
18 |
5 files changed, 111 deletions(-) |
19 |
|
20 |
diff --git a/dev-php/pecl-mysqlnd_qc/Manifest b/dev-php/pecl-mysqlnd_qc/Manifest |
21 |
deleted file mode 100644 |
22 |
index da9b5879d42..00000000000 |
23 |
--- a/dev-php/pecl-mysqlnd_qc/Manifest |
24 |
+++ /dev/null |
25 |
@@ -1 +0,0 @@ |
26 |
-DIST mysqlnd_qc-1.2.0.tgz 147416 BLAKE2B 11bf82ca978a809e7aa196a7d9e4b93930e99c4c09081980c27d0145250b0a0c34f62cdbf2eb4bc62015fd66d8adbf869944c6f69a99aab0ceb9ead173f8308e SHA512 7f04167e671f7018a72293c665f7d2b041c90a7005748ad102a2bbcbfb2331a07335f8a624ac35f1dc05066811e3a1caa1a2314c3b083a1276e36818872df8d2 |
27 |
|
28 |
diff --git a/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch b/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch |
29 |
deleted file mode 100644 |
30 |
index 6f3b24171a3..00000000000 |
31 |
--- a/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch |
32 |
+++ /dev/null |
33 |
@@ -1,48 +0,0 @@ |
34 |
---- a/mysqlnd_qc.c 2013/09/17 08:28:58 331414 |
35 |
-+++ b/mysqlnd_qc.c 2014/03/22 08:20:55 333056 |
36 |
-@@ -613,7 +613,11 @@ |
37 |
- |
38 |
- /* {{{ MYSQLND_METHOD(mysqlnd_qc, store_result) */ |
39 |
- static MYSQLND_RES * |
40 |
-+#if PHP_VERSION_ID < 50600 |
41 |
- MYSQLND_METHOD(mysqlnd_qc, store_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC) |
42 |
-+#else |
43 |
-+MYSQLND_METHOD(mysqlnd_qc, store_result)(MYSQLND_CONN_DATA * const conn, const unsigned int flags TSRMLS_DC) |
44 |
-+#endif |
45 |
- { |
46 |
- MYSQLND_RES * result; |
47 |
- uint64_t store_time; |
48 |
-@@ -621,7 +625,11 @@ |
49 |
- DBG_ENTER("mysqlnd_qc::store_result"); |
50 |
- |
51 |
- STATS_TIME_SET(store_time); |
52 |
-+#if PHP_VERSION_ID < 50600 |
53 |
- result = QC_CALL_ORIGINAL_CONN_DATA_METHOD(store_result)(conn TSRMLS_CC); |
54 |
-+#else |
55 |
-+ result = QC_CALL_ORIGINAL_CONN_DATA_METHOD(store_result)(conn, flags TSRMLS_CC); |
56 |
-+#endif |
57 |
- STATS_TIME_DIFF(store_time); |
58 |
- MYSQLND_QC_INC_STATISTIC_W_VALUE(QC_STAT_QUERY_AGGR_STORE_TIME_TOTAL, (uint64_t)store_time); |
59 |
- |
60 |
-@@ -777,13 +785,21 @@ |
61 |
- |
62 |
- /* {{{ MYSQLND_METHOD(mysqlnd_qc, use_result) */ |
63 |
- static MYSQLND_RES * |
64 |
-+#if PHP_VERSION_ID < 50600 |
65 |
- MYSQLND_METHOD(mysqlnd_qc, use_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC) |
66 |
-+#else |
67 |
-+MYSQLND_METHOD(mysqlnd_qc, use_result)(MYSQLND_CONN_DATA * const conn, const unsigned int flags TSRMLS_DC) |
68 |
-+#endif |
69 |
- { |
70 |
- MYSQLND_RES * ret; |
71 |
- DBG_ENTER("mysqlnd_qc::use_result"); |
72 |
- MYSQLND_QC_INC_STATISTIC_W_VALUE2(QC_STAT_MISS, 1, QC_STAT_QUERY_UNCACHED_USE_RESULT, 1); |
73 |
- |
74 |
-+#if PHP_VERSION_ID < 50600 |
75 |
- ret = QC_CALL_ORIGINAL_CONN_DATA_METHOD(use_result)(conn TSRMLS_CC); |
76 |
-+#else |
77 |
-+ ret = QC_CALL_ORIGINAL_CONN_DATA_METHOD(use_result)(conn, flags TSRMLS_CC); |
78 |
-+#endif |
79 |
- if (ret) { |
80 |
- QC_DECLARE_AND_LOAD_CONN_DATA(conn_data_pp, conn); |
81 |
- |
82 |
|
83 |
diff --git a/dev-php/pecl-mysqlnd_qc/metadata.xml b/dev-php/pecl-mysqlnd_qc/metadata.xml |
84 |
deleted file mode 100644 |
85 |
index fb173f77d37..00000000000 |
86 |
--- a/dev-php/pecl-mysqlnd_qc/metadata.xml |
87 |
+++ /dev/null |
88 |
@@ -1,12 +0,0 @@ |
89 |
-<?xml version="1.0" encoding="UTF-8"?> |
90 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
91 |
-<pkgmetadata> |
92 |
- <maintainer type="project"> |
93 |
- <email>php-bugs@g.o</email> |
94 |
- <name>PHP</name> |
95 |
- </maintainer> |
96 |
- <use> |
97 |
- <flag name="memcached">Use <pkg>dev-libs/libmemcached</pkg> as a storage handler</flag> |
98 |
- <flag name="sqlite">Use <pkg>dev-db/sqlite</pkg> as a storage handler</flag> |
99 |
- </use> |
100 |
-</pkgmetadata> |
101 |
|
102 |
diff --git a/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r2.ebuild b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r2.ebuild |
103 |
deleted file mode 100644 |
104 |
index 45eba445ab3..00000000000 |
105 |
--- a/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r2.ebuild |
106 |
+++ /dev/null |
107 |
@@ -1,49 +0,0 @@ |
108 |
-# Copyright 1999-2016 Gentoo Foundation |
109 |
-# Distributed under the terms of the GNU General Public License v2 |
110 |
- |
111 |
-EAPI=6 |
112 |
- |
113 |
-PHP_EXT_NAME="mysqlnd_qc" |
114 |
-PHP_EXT_INI="yes" |
115 |
-PHP_EXT_ZENDEXT="no" |
116 |
- |
117 |
-USE_PHP="php5-6" |
118 |
- |
119 |
-inherit php-ext-pecl-r3 flag-o-matic |
120 |
- |
121 |
-KEYWORDS="~amd64" |
122 |
- |
123 |
-DESCRIPTION="A query cache plugin for the mysqlnd library" |
124 |
-LICENSE="PHP-3" |
125 |
-SLOT="0" |
126 |
-IUSE="memcached sqlite" |
127 |
- |
128 |
-# Specifying targets due to USE flag transition |
129 |
-DEPEND=" |
130 |
- memcached? ( dev-libs/libmemcached ) |
131 |
- sqlite? ( dev-db/sqlite:3 ) |
132 |
- php_targets_php5-6? ( || ( |
133 |
- dev-lang/php:5.6[-libmysqlclient,mysql] |
134 |
- dev-lang/php:5.6[-libmysqlclient,mysqli] |
135 |
- ) |
136 |
- ) |
137 |
-" |
138 |
-RDEPEND="${DEPEND}" |
139 |
-PATCHES=( "${FILESDIR}/${P}-php56.patch" ) |
140 |
- |
141 |
-src_configure() { |
142 |
- local PHP_EXT_ECONF_ARGS=() |
143 |
- if use memcached ; then |
144 |
- # configure does not find pthreads when memcache is enabled |
145 |
- append-flags -pthread |
146 |
- PHP_EXT_ECONF_ARGS+=( --enable-mysqlnd_qc_memcache --with-libmemcached-dir="${ROOT}usr" ) |
147 |
- else |
148 |
- PHP_EXT_ECONF_ARGS+=( --disable-mysqlnd_qc_memcache ) |
149 |
- fi |
150 |
- if use sqlite ; then |
151 |
- PHP_EXT_ECONF_ARGS+=( --enable-mysqlnd_qc_sqlite --with-sqlite-dir="${ROOT}usr" ) |
152 |
- else |
153 |
- PHP_EXT_ECONF_ARGS+=( --disable-mysqlnd_qc_sqlite ) |
154 |
- fi |
155 |
- php-ext-source-r3_src_configure |
156 |
-} |
157 |
|
158 |
diff --git a/profiles/package.mask b/profiles/package.mask |
159 |
index 2d8d766c315..14b776d8cb4 100644 |
160 |
--- a/profiles/package.mask |
161 |
+++ b/profiles/package.mask |
162 |
@@ -780,7 +780,6 @@ virtual/httpd-php:5.6 |
163 |
# Brian Evans <grknight@g.o> (2019-10-01) |
164 |
# Old extensions which only work with PHP <7 |
165 |
# Removal in 90 days. Bug 651784 |
166 |
-dev-php/pecl-mysqlnd_qc |
167 |
dev-php/pecl-sphinx |
168 |
dev-php/pecl-spl_types |
169 |
dev-php/pecl-svn |