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-db/mysql-proxy/, dev-db/mysql-proxy/files/, profiles/
Date: Tue, 11 Dec 2018 13:55:52
Message-Id: 1544536275.2098bddecf9ada7c5808b965936ffe250b1101ce.mgorny@gentoo
1 commit: 2098bddecf9ada7c5808b965936ffe250b1101ce
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 11 13:51:15 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 11 13:51:15 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2098bdde
7
8 dev-db/mysql-proxy: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/629676
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-db/mysql-proxy/Manifest | 1 -
14 dev-db/mysql-proxy/files/mysql-proxy.cnf | 47 --------------------
15 dev-db/mysql-proxy/files/mysql-proxy.confd | 12 -----
16 .../mysql-proxy/files/mysql-proxy.confd-0.8.0-r1 | 12 -----
17 dev-db/mysql-proxy/files/mysql-proxy.initd | 22 ----------
18 dev-db/mysql-proxy/metadata.xml | 13 ------
19 dev-db/mysql-proxy/mysql-proxy-0.8.2-r1.ebuild | 51 ----------------------
20 profiles/package.mask | 5 ---
21 8 files changed, 163 deletions(-)
22
23 diff --git a/dev-db/mysql-proxy/Manifest b/dev-db/mysql-proxy/Manifest
24 deleted file mode 100644
25 index 2d987f3293d..00000000000
26 --- a/dev-db/mysql-proxy/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST mysql-proxy-0.8.2.tar.gz 861995 BLAKE2B 2f6071d5c2a63462dc619ade0ce92db6845d0e010d4d5022314157b3cdac553b5ccff8149763844d42892eaa444f132587f02b8495ddd446ed02953909e59b5a SHA512 e083ea6344bf2d3b85a38127e42cbab659a959684f7f0f63272fa0df926d6d32dbbaaab2b6479ee8fc227fbc9af6f24e855d19700ec1ab4b904c5e638b4d64c8
30
31 diff --git a/dev-db/mysql-proxy/files/mysql-proxy.cnf b/dev-db/mysql-proxy/files/mysql-proxy.cnf
32 deleted file mode 100644
33 index 7d15674f6b9..00000000000
34 --- a/dev-db/mysql-proxy/files/mysql-proxy.cnf
35 +++ /dev/null
36 @@ -1,47 +0,0 @@
37 -# MySQL Proxy's configuration file (mysql-proxy.cnf)
38 -# This file must be 0660 or more restrictive
39 -# otherwise mysql-proxy will refuse to load
40 -[mysql-proxy]
41 -#basedir = ...
42 -#daemon = true
43 -#defaults-file = ...
44 -#event-threads = ...
45 -keepalive = true
46 -log-backtrace-on-crash = true
47 -log-file = /var/log/mysql/mysql-proxy.log
48 -log-level = warning
49 -#log-use-syslog = true
50 -#lua-cpath = ...
51 -#lua-path = ...
52 -#max-open-files = ...
53 -pid-file = /var/run/mysql-proxy.pid
54 -#plugin-dir = ...
55 -#plugins = admin,proxy,debug,replicant
56 -#plugins = admin,proxy
57 -plugins = proxy
58 -#user = ...
59 -
60 -# module: admin
61 -admin-address = 127.0.0.1:4041
62 -#admin-lua-script = ...
63 -#admin-password = ...
64 -#admin-username = ...
65 -
66 -# module: proxy
67 -#no-proxy = false
68 -proxy-address = 127.0.0.1:4040
69 -proxy-backend-addresses = 127.0.0.1:3306
70 -proxy-fix-bug-25371 = false
71 -#proxy-lua-script = ...
72 -#proxy-pool-no-change-user = ...
73 -#proxy-read-only-backend-addresses = ...
74 -proxy-skip-profiling = false
75 -
76 -# module: replicant
77 -#replicant-master-address = ...
78 -#replicant-username = ...
79 -#replicant-password = ...
80 -#replicant-read-binlogs = ...
81 -
82 -# module: debug
83 -debug-address = 127.0.0.1:4043
84
85 diff --git a/dev-db/mysql-proxy/files/mysql-proxy.confd b/dev-db/mysql-proxy/files/mysql-proxy.confd
86 deleted file mode 100644
87 index 079530159f8..00000000000
88 --- a/dev-db/mysql-proxy/files/mysql-proxy.confd
89 +++ /dev/null
90 @@ -1,12 +0,0 @@
91 -# /etc/conf.d/mysql-proxy: config file for /etc/init.d/mysql-proxy
92 -
93 -# location of pidfile
94 -PIDFILE="/var/run/mysql-proxy.pid"
95 -
96 -# general options for mysql-proxy
97 -# do NOT specify --daemon or --pid-file=... here!
98 -OPTS="--log-use-syslog"
99 -
100 -# if you want mysql-proxy to depend on mysql, enable this:
101 -#RC_NEED="mysql" # baselayout-1
102 -#rc_need="mysql" # baselayout-2/OpenRC
103
104 diff --git a/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1 b/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1
105 deleted file mode 100644
106 index 8b86431a3d8..00000000000
107 --- a/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1
108 +++ /dev/null
109 @@ -1,12 +0,0 @@
110 -# /etc/conf.d/mysql-proxy: config file for /etc/init.d/mysql-proxy
111 -
112 -# location of pidfile
113 -PIDFILE="/var/run/mysql-proxy.pid"
114 -
115 -# general options for mysql-proxy
116 -# do NOT specify --daemon or --pid-file=... here!
117 -OPTS="--defaults-file=/etc/mysql/mysql-proxy.cnf"
118 -
119 -# if you want mysql-proxy to depend on mysql, enable this:
120 -#RC_NEED="mysql" # baselayout-1
121 -#rc_need="mysql" # baselayout-2/OpenRC
122
123 diff --git a/dev-db/mysql-proxy/files/mysql-proxy.initd b/dev-db/mysql-proxy/files/mysql-proxy.initd
124 deleted file mode 100644
125 index 7107facfd6f..00000000000
126 --- a/dev-db/mysql-proxy/files/mysql-proxy.initd
127 +++ /dev/null
128 @@ -1,22 +0,0 @@
129 -#!/sbin/openrc-run
130 -# Copyright 1999-2007 Gentoo Foundation
131 -# Distributed under the terms of the GNU General Public License v2
132 -
133 -depend() {
134 - need net
135 -}
136 -
137 -start() {
138 - ebegin "Starting MySQL Proxy"
139 - start-stop-daemon --start --quiet \
140 - --exec /usr/bin/mysql-proxy \
141 - -- --daemon --pid-file="${PIDFILE}" ${OPTS}
142 - eend $?
143 -}
144 -
145 -stop() {
146 - ebegin "Stopping MySQL Proxy"
147 - start-stop-daemon --stop --quiet \
148 - --pidfile "${PIDFILE}"
149 - eend $?
150 -}
151
152 diff --git a/dev-db/mysql-proxy/metadata.xml b/dev-db/mysql-proxy/metadata.xml
153 deleted file mode 100644
154 index dc0c708273d..00000000000
155 --- a/dev-db/mysql-proxy/metadata.xml
156 +++ /dev/null
157 @@ -1,13 +0,0 @@
158 -<?xml version="1.0" encoding="UTF-8"?>
159 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
160 -<pkgmetadata>
161 - <longdescription>
162 -MySQL Proxy is a simple program that sits between your client and MySQL
163 -server(s) that can monitor, analyze or transform their communication. Its
164 -flexibility allows for unlimited uses; common ones include: load balancing;
165 -failover; query analysis; query filtering and modification; and many more.
166 -</longdescription>
167 - <upstream>
168 - <remote-id type="launchpad">mysql-proxy</remote-id>
169 - </upstream>
170 -</pkgmetadata>
171
172 diff --git a/dev-db/mysql-proxy/mysql-proxy-0.8.2-r1.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.8.2-r1.ebuild
173 deleted file mode 100644
174 index 6a7abae6bab..00000000000
175 --- a/dev-db/mysql-proxy/mysql-proxy-0.8.2-r1.ebuild
176 +++ /dev/null
177 @@ -1,51 +0,0 @@
178 -# Copyright 1999-2015 Gentoo Foundation
179 -# Distributed under the terms of the GNU General Public License v2
180 -
181 -EAPI=5
182 -
183 -inherit eutils versionator
184 -
185 -MY_PV=$(get_version_component_range 1-2)
186 -DESCRIPTION="A Proxy for the MySQL Client/Server protocol"
187 -HOMEPAGE="http://dev.mysql.com/doc/mysql-proxy/en/"
188 -SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
189 -LICENSE="GPL-2"
190 -SLOT="0"
191 -KEYWORDS="~amd64 ~x86"
192 -IUSE="examples"
193 -RDEPEND=">=dev-libs/libevent-2.1
194 - >=dev-libs/glib-2.16
195 - >=dev-lang/lua-5.1:0"
196 -DEPEND="${RDEPEND}
197 - >=virtual/mysql-5.0
198 - virtual/pkgconfig"
199 -
200 -src_prepare() {
201 - sed -i \
202 - -e 's|_EVENT_VERSION|LIBEVENT_VERSION|g' \
203 - src/chassis-mainloop.c || die
204 -}
205 -
206 -src_configure() {
207 - econf \
208 - --includedir=/usr/include/${PN} \
209 - --with-mysql \
210 - --with-lua \
211 - || die "econf failed"
212 -}
213 -
214 -src_install() {
215 - emake DESTDIR="${D}" install || die "emake install failed"
216 - newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
217 - newconfd "${FILESDIR}"/${PN}.confd-0.8.0-r1 ${PN} || die
218 - dodoc ChangeLog NEWS README
219 - if use examples; then
220 - docinto examples
221 - dodoc examples/*.lua || die
222 - dodoc lib/*.lua || die
223 - fi
224 - # mysql-proxy will refuse to start unless the config file is at most 0660.
225 - insinto /etc/mysql
226 - insopts -m0660
227 - doins "${FILESDIR}"/${PN}.cnf || die
228 -}
229
230 diff --git a/profiles/package.mask b/profiles/package.mask
231 index 4ac91f49cbb..57c24cf2bef 100644
232 --- a/profiles/package.mask
233 +++ b/profiles/package.mask
234 @@ -177,11 +177,6 @@ media-libs/libptp2
235 media-video/gnome-mplayer
236 www-plugins/gecko-mediaplayer
237
238 -# Pacho Ramos <pacho@g.o> (11 Nov 2018)
239 -# Upstream dead for years and marked EOL (#629676, #665850). Removal in a
240 -# month.
241 -dev-db/mysql-proxy
242 -
243 # Pacho Ramos <pacho@g.o> (11 Nov 2018)
244 # Fails to build (#662000), not compatible with kernel-4, use kernel driver rtsx_pci
245 # instead. Removal in a month.