Patched for >=libevent-2.1, restricted <libevent-2.1 for older ebuilds and removed older version. Closes bug #538158.

Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x748B2C601F6F0683

4 files changed, 42 insertions, 15 deletions

diff --git a/dev-db/mysql-proxy/ChangeLog b/dev-db/mysql-proxy/ChangeLog
index 8fc274e5c843..59c1f277c9e8 100644
--- a/dev-db/mysql-proxy/ChangeLog
+++ b/dev-db/mysql-proxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-proxy
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/ChangeLog,v 1.12 2013/03/03 16:50:46 wschlich Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/ChangeLog,v 1.13 2015/02/01 18:19:07 neurogeek Exp $
+
+*mysql-proxy-0.8.2-r1 (01 Feb 2015)
+
+  01 Feb 2015; Jesus Rivero <neurogeek@gentoo.org> -mysql-proxy-0.8.0.ebuild,
+  mysql-proxy-0.8.2.ebuild, +mysql-proxy-0.8.2-r1.ebuild:
+  Patched for >=libevent-2.1, restricted <libevent-2.1 for older ebuilds and
+  removed older version. Closes bug #538158.
 
   03 Mar 2013; Wolfram Schlich <wschlich@gentoo.org> metadata.xml:
   removed myself from metadata.xml
diff --git a/dev-db/mysql-proxy/Manifest b/dev-db/mysql-proxy/Manifest
index a0f0a2083fd5..d365038cf6db 100644
--- a/dev-db/mysql-proxy/Manifest
+++ b/dev-db/mysql-proxy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mysql-proxy.cnf 1120 SHA256 ae0e763dc1e5ef37d1b8708dc7a2c49c063843268a57e1fc0294678d173330af SHA512 5f889422d7232608dcde5f332577c563b0c29b0db5a327659ce7b30cef7e4d498eca641159d49671b7368080ff2113511b6b362b44fb75ddd781a00e2879246b WHIRLPOOL 2dd62bf08eefed090e6d6db161925201daad44c443d0f314472ecd5a435a90384d78b3c7cc3b2fbf229b158d4a7182606d56375583e78a2de35dcf040e18955b
 AUX mysql-proxy.confd 365 SHA256 4828001b27499b5de40810ed74dbfe907a6369a11670c523ea3b4898bbb56b5f SHA512 9a4a6499e03d939fcc5fbd5f71d1e377a1d003e542be7fab47d810899649f58e518aa34617c67b207477c7b1a85b75ce3045eb5959156c673b4c28c2c101185b WHIRLPOOL 57ac502c0b9763bfb0b804d25f3d55b53700359d396315627894de4e1fb6d18b8ed2f799b67ca16d0e9da4fb0354faa582a68606000ee314cafbf61eb89eb937
 AUX mysql-proxy.confd-0.8.0-r1 391 SHA256 68301473edd001349639dd4b2c826c0f6c5f68b59a32843e9bd4d9429258d2ac SHA512 e07afd8502d87006cfd4640e83c1ecab98b862d0916ee351c9c60aaaa01f0766d51d0749d3f63f33df9f8bbbbc45ef21517fa0dbc87bf3ade8e3e6c4048c8a5b WHIRLPOOL 038ec55217d58de957d00f768a85088cd214918f52e4a1d6250e8ede4c9b9a21cdfc20f17a72f7c6d399135e7f2d21f4e7acf4dbf52171147004c531887563d4
@@ -5,7 +8,14 @@ AUX mysql-proxy.initd 548 SHA256 9ceaf7afa71aa39ded8af1ce24cbef1952800abf6b2878d
 DIST mysql-proxy-0.8.0.tar.gz 756371 SHA256 0a195fe0f86d12df8d9ffc27e91347680521c8702460bac5ed591608a740bc1c SHA512 c0283881d4e79d662ce61fcb361d72f4711114a3a9a089ab2f3d2b1dccdb0c316bc5223ea040f0efef7663e97080cd7e6415ce1a046b69bfa4fed8f9b9b272d0 WHIRLPOOL 349c573041a19d0ad8d164b2e9a2e3334daa25e3bbecb0e16a08cb9a257fc55660da720f4ed3832233b3ee2ebc9ed33f0ccea959c2cbf23587d2d1f37b764070
 DIST mysql-proxy-0.8.2.tar.gz 861995 SHA256 3955d9a60249d36b2c5c949706f7a3294419d2563c1e8474164a3a307865f550 SHA512 e083ea6344bf2d3b85a38127e42cbab659a959684f7f0f63272fa0df926d6d32dbbaaab2b6479ee8fc227fbc9af6f24e855d19700ec1ab4b904c5e638b4d64c8 WHIRLPOOL e7c3355b221c7d150004a3bcb02db28c67759d9c83f9d8d4219c2b8e403d176fdbe562e05f5e7ea1e6768f78144a4438678991fcc974448e2c271405d8c6f3a2
 EBUILD mysql-proxy-0.8.0-r1.ebuild 1431 SHA256 ab2d3e5912719f23e75b946b12637e23a7648be9eec6c3063016b096670fcac6 SHA512 d51c2c8c476b6b098e3f9e799e9b8b209930a2c74ccf554e785e7384b715d5634dcae299cd38ddddd312c93bb2fb4c447368a5bcf9e2f9de2f9a413cff7b5d8c WHIRLPOOL ec8e1b9cbf167fbcb0fc71d82e9fe6c521733f363a4ae08267cb48a7e55a5bd5d0232388267f4e4db19473bf0ff07bb0e76cdb9f9aa9f0c2723597db304d6088
-EBUILD mysql-proxy-0.8.0.ebuild 1237 SHA256 4d90d5e8ec309748c6e2cf95abebb33efef80e598fbddc8836a5ead633950aca SHA512 38f22a6e2bb83c2f8ac5f860978e6b8eaad1df67c064754103b6ed84cc0b92d279f4f2bddd1465e662e6163332a4d987f9ca377359256a73f21c6939a3428f1a WHIRLPOOL f80a84319ac2d7f46a822fb1132ebdb0e7f27accbe7eb34a4815cd34d13be319d4cb1bed7527d79fde5eb9df57543d6d7af55f82240f1baa2cf5e63d4d3e6fac
-EBUILD mysql-proxy-0.8.2.ebuild 1431 SHA256 56e1987ea36024c435457f59d064d38b0f888f7cdccb6cf8d5a0c2e74fd1ab76 SHA512 6749548458df4c07f3969bf9d86fef6d0f363126b25173a713e3e9a30f1c94a9668a62e99cbdc012583555944deb2a70b7bed02f0c064d9fa0c2ec876ac37218 WHIRLPOOL 94831b759bbba10920a0513e80f71a256910579bd7bf55e2d6028b902507479cbb4928eb634a2997e1db2547fa57b662ce23cfba251709c138dddbd6770e52e5
-MISC ChangeLog 2568 SHA256 1699ad1cd65dfe1329747260267b7418f2f4d8991bfd80ca41838c5e2f8ac361 SHA512 ea06297298d01cb0ab635a1e09f8686691f82dfbd45193ae8a6b44971bd1f6c897b8f9c17c1fcd4dc5e92a6ccb28cef8f5446208f7b5cae870f8354beea7f7c9 WHIRLPOOL 5f1c692cb323e84cc382e828796e8f7e7b01079a102950bf7ae8df396f40c912aacdd375430bff267d3e783166def1aebd8d26ab94829c84f1f666f332c6948b
+EBUILD mysql-proxy-0.8.2-r1.ebuild 1525 SHA256 08e30d9dd0a156ac858fce79ed51e906ba9e69bf906d1f50c629ee7b34aaf632 SHA512 7bb1722cb18d0c40965479283d4bd9bc9669930e9f3a0478781cd234e53cb6ed15259ff646512dd2315da5e701419ae1e11c58b93f9796b22db298ade9eabe34 WHIRLPOOL cd7f1fd9769ad8fd9c5d1c90d524a9a1cf8ed78fc749f149c7c892705c7c787e7f049b06e7f0122e17b3eb5a3400859f3ceb40d999e288c0f039289142a1ba78
+EBUILD mysql-proxy-0.8.2.ebuild 1430 SHA256 7b8f68da20ca4ae2bf7a89c4706cf4bf47a3ff916b83d0700800d854de35a04d SHA512 17685493524fb47b22c3ac074a76460c54669ed61632eff4a89c8da4da4fadab800994be5fbbec3e3ff9568bc4f6c9835bbdf9b79506ef455ee6e77482d42176 WHIRLPOOL 01ed54b748498959f78d3374e9a5bedd0891fb7d434af985e07930e68df75cf11e9193d1b2a175c18a667d8ae95880e3b5eb0cce65f8c21652363b30ed277432
+MISC ChangeLog 2865 SHA256 93167194d84f70043002552d34f02030bd3547e503edafe774176de1fc4e3af1 SHA512 b3fff822ead06404db2cd482fc41297dbcd093d71f9fba1852845cfc2c9d9cd529693d79f80c9ac230d02961718dbc9b7b4c0b2b9e2dd3220aace22d62d8cd0b WHIRLPOOL 67f98fde6a4657aa915bab093d67e71106a873ef783c4899a5f928225cc27004a1b81806eb22bf1e2c606cf7191461c67108e1c606ecf0cc87a0f8311da2e585
 MISC metadata.xml 612 SHA256 eb0e8f93d2203bd4fe0f8b4b9aa92b6a33165edb1b76c8361729e132b60659cf SHA512 291f1642f7b9a697d109b44a19cfb8566d87c55dd560f0f2d8d776978274e15abde71b140799f71341ae76ecffb016fe47b67482543772cc1f435470633f9498 WHIRLPOOL b11e7f692eca452428062a078cdecf558cb00fb70e5f687981b7c75cf332846b9e5f88e510652648f7cae9d9bdff60b57f9f927be9b767635b472322a2ab733e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTOJ5UACgkQdIssYB9vBoPWvgCeJvGp0oe1rZx5CNGveU1BkYkj
+JxEAn1xhHYXw/34/7TTNQNd53bFdq38/
+=VIQv
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.8.0.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.8.2-r1.ebuild
index 59e17b71e362..6d0ef26fbec6 100644
--- a/dev-db/mysql-proxy/mysql-proxy-0.8.0.ebuild
+++ b/dev-db/mysql-proxy/mysql-proxy-0.8.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.0.ebuild,v 1.3 2012/05/03 02:33:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.2-r1.ebuild,v 1.1 2015/02/01 18:19:07 neurogeek Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils
 
@@ -13,13 +13,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
-RDEPEND=">=dev-libs/libevent-1.4
+RDEPEND=">=dev-libs/libevent-2.1
 	>=dev-libs/glib-2.16
 	>=dev-lang/lua-5.1"
 DEPEND="${RDEPEND}
 	>=virtual/mysql-5.0
 	virtual/pkgconfig"
-RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e 's|_EVENT_VERSION|LIBEVENT_VERSION|g' \
+			src/chassis-mainloop.c || die
+}
 
 src_configure() {
 	econf \
@@ -32,12 +37,17 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
+	newconfd "${FILESDIR}"/${PN}.confd-0.8.0-r1 ${PN} || die
 	dodoc ChangeLog NEWS README
 	if use examples; then
 		docinto examples
-		dodoc examples/*.lua
+		dodoc examples/*.lua || die
+		dodoc lib/*.lua || die
 	fi
+	# mysql-proxy will refuse to start unless the config file is at most 0660.
+	insinto /etc/mysql
+	insopts -m0660
+	doins "${FILESDIR}"/${PN}.cnf || die
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild
index 4a597371c53d..7c15a9290c19 100644
--- a/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild
+++ b/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild,v 1.1 2012/12/05 15:27:40 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild,v 1.2 2015/02/01 18:19:07 neurogeek Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
-RDEPEND=">=dev-libs/libevent-1.4
+RDEPEND="<dev-libs/libevent-2.1
 	>=dev-libs/glib-2.16
 	>=dev-lang/lua-5.1"
 DEPEND="${RDEPEND}