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

(Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 748B2C601F6F0683)

3 files changed, 29 insertions, 12 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/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}