version bump, removed old versions

(Portage version: 2.2_rc60/cvs/Linux i686)

8 files changed, 17 insertions, 169 deletions

diff --git a/dev-db/mysql-proxy/ChangeLog b/dev-db/mysql-proxy/ChangeLog
index d586812a0251..b7f07101a3bb 100644
--- a/dev-db/mysql-proxy/ChangeLog
+++ b/dev-db/mysql-proxy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/mysql-proxy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/ChangeLog,v 1.5 2009/11/21 14:16:33 wschlich Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/ChangeLog,v 1.6 2010/05/14 10:34:29 wschlich Exp $
+
+*mysql-proxy-0.8.0 (14 May 2010)
+
+  14 May 2010; Wolfram Schlich <wschlich@gentoo.org>
+  -files/0.6.0/mysql-proxy.confd, -files/0.6.0/mysql-proxy.initd,
+  -files/0.6.1/mysql-proxy.confd, -files/0.6.1/mysql-proxy.initd,
+  -mysql-proxy-0.6.0.ebuild, -mysql-proxy-0.6.1.ebuild,
+  -mysql-proxy-0.7.2-r1.ebuild, +mysql-proxy-0.8.0.ebuild:
+  version bump, removed old versions
 
 *mysql-proxy-0.7.2-r1 (21 Nov 2009)
 
diff --git a/dev-db/mysql-proxy/files/0.6.0/mysql-proxy.confd b/dev-db/mysql-proxy/files/0.6.0/mysql-proxy.confd
deleted file mode 100644
index fc19ebe5769a..000000000000
--- a/dev-db/mysql-proxy/files/0.6.0/mysql-proxy.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/conf.d/mysql-proxy: config file for /etc/init.d/mysql-proxy
-
-# location auf pidfile
-PIDFILE="/var/run/mysql-proxy.pid"
-
-# general options for mysql-proxy
-#OPTS="--proxy-lua-script=/usr/share/doc/mysql-proxy-0.6.0/tutorial-basic.lua"
-OPTS=""
-
-# if you want mysql-proxy to depend on mysql, enable this:
-#RC_NEED="mysql"
diff --git a/dev-db/mysql-proxy/files/0.6.0/mysql-proxy.initd b/dev-db/mysql-proxy/files/0.6.0/mysql-proxy.initd
deleted file mode 100755
index f761ef2072e4..000000000000
--- a/dev-db/mysql-proxy/files/0.6.0/mysql-proxy.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/files/0.6.0/mysql-proxy.initd,v 1.1 2007/10/03 15:36:24 wschlich Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting MySQL Proxy"
-	start-stop-daemon --start --quiet --exec /usr/sbin/mysql-proxy -- --daemon --pid-file="${PIDFILE}" ${OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping MySQL Proxy"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/dev-db/mysql-proxy/files/0.6.1/mysql-proxy.confd b/dev-db/mysql-proxy/files/0.6.1/mysql-proxy.confd
deleted file mode 100644
index fc19ebe5769a..000000000000
--- a/dev-db/mysql-proxy/files/0.6.1/mysql-proxy.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/conf.d/mysql-proxy: config file for /etc/init.d/mysql-proxy
-
-# location auf pidfile
-PIDFILE="/var/run/mysql-proxy.pid"
-
-# general options for mysql-proxy
-#OPTS="--proxy-lua-script=/usr/share/doc/mysql-proxy-0.6.0/tutorial-basic.lua"
-OPTS=""
-
-# if you want mysql-proxy to depend on mysql, enable this:
-#RC_NEED="mysql"
diff --git a/dev-db/mysql-proxy/files/0.6.1/mysql-proxy.initd b/dev-db/mysql-proxy/files/0.6.1/mysql-proxy.initd
deleted file mode 100755
index c6ef7a32d835..000000000000
--- a/dev-db/mysql-proxy/files/0.6.1/mysql-proxy.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/files/0.6.1/mysql-proxy.initd,v 1.1 2008/02/07 19:44:01 wschlich Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting MySQL Proxy"
-	start-stop-daemon --start --quiet --exec /usr/sbin/mysql-proxy -- --daemon --pid-file="${PIDFILE}" ${OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping MySQL Proxy"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.6.0.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.6.0.ebuild
deleted file mode 100644
index 82c87a9cd45c..000000000000
--- a/dev-db/mysql-proxy/mysql-proxy-0.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 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.6.0.ebuild,v 1.3 2008/01/28 01:08:04 rich0 Exp $
-
-inherit eutils
-
-DESCRIPTION="A Proxy for the MySQL Client/Server protocol"
-HOMEPAGE="http://forge.mysql.com/wiki/MySQL_Proxy"
-SRC_URI="mirror://mysql/Downloads/MySQL-Proxy/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua examples"
-DEPEND=">=dev-libs/libevent-1.0
-	>=dev-libs/glib-2.0
-	>=virtual/mysql-4.0
-	lua? ( >=dev-lang/lua-5.1 )"
-
-src_compile() {
-	econf \
-		--with-mysql \
-		$(use_with lua) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin src/mysql-proxy
-	if useq lua; then
-		insinto /usr/share/${PN}
-		doins lib/*.lua
-		insinto /usr/share/${PN}/proxy
-		doins lib/proxy/*.lua
-		if useq examples; then
-			insinto /usr/share/${PN}/examples
-			doins examples/*.lua
-		fi
-	fi
-	dodoc README INSTALL NEWS
-	newinitd "${FILESDIR}/${PV}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PV}/${PN}.confd" ${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You might want to have a look at"
-	einfo "http://dev.mysql.com/tech-resources/articles/proxy-gettingstarted.html"
-	einfo "on how to get started with MySQL Proxy."
-	einfo
-}
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.6.1.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.6.1.ebuild
deleted file mode 100644
index bdf767a0f72d..000000000000
--- a/dev-db/mysql-proxy/mysql-proxy-0.6.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 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.6.1.ebuild,v 1.1 2008/02/07 19:44:00 wschlich Exp $
-
-inherit eutils
-
-DESCRIPTION="A Proxy for the MySQL Client/Server protocol"
-HOMEPAGE="http://forge.mysql.com/wiki/MySQL_Proxy"
-SRC_URI="mirror://mysql/Downloads/MySQL-Proxy/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua examples"
-DEPEND=">=dev-libs/libevent-1.0
-	>=dev-libs/glib-2.0
-	>=virtual/mysql-4.0
-	lua? ( >=dev-lang/lua-5.1 )"
-
-src_compile() {
-	econf \
-		--with-mysql \
-		$(use_with lua) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin src/mysql-proxy
-	if useq lua; then
-		insinto /usr/share/${PN}
-		doins lib/*.lua
-		insinto /usr/share/${PN}/proxy
-		doins lib/proxy/*.lua
-		if useq examples; then
-			insinto /usr/share/${PN}/examples
-			doins examples/*.lua
-		fi
-	fi
-	dodoc README INSTALL NEWS
-	newinitd "${FILESDIR}/${PV}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PV}/${PN}.confd" ${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You might want to have a look at"
-	einfo "http://dev.mysql.com/tech-resources/articles/proxy-gettingstarted.html"
-	einfo "on how to get started with MySQL Proxy."
-	einfo
-}
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.7.2-r1.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.8.0.ebuild
index d338d264b97e..486f466123a2 100644
--- a/dev-db/mysql-proxy/mysql-proxy-0.7.2-r1.ebuild
+++ b/dev-db/mysql-proxy/mysql-proxy-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7.2-r1.ebuild,v 1.1 2009/11/21 14:16:33 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.0.ebuild,v 1.1 2010/05/14 10:34:29 wschlich Exp $
 
 EAPI=2
 
@@ -13,16 +13,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
-RDEPEND=">=dev-libs/libevent-1.0
-	>=dev-libs/glib-2.0
-	>=virtual/mysql-4.0
+RDEPEND=">=dev-libs/libevent-1.4
+	>=dev-libs/glib-2.16
 	>=dev-lang/lua-5.1"
 DEPEND="${RDEPEND}
+	>=virtual/mysql-5.0
 	dev-util/pkgconfig"
 RESTRICT="test"
 
 src_configure() {
 	econf \
+		--includedir=/usr/include/${PN} \
 		--with-mysql \
 		--with-lua \
 		|| die "econf failed"