Version bump.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 105 insertions, 1 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 656597cc667a..b915f7d9e3bb 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.30 2010/12/15 18:01:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.31 2010/12/15 18:37:00 graaff Exp $
+
+*mysql-workbench-5.2.31 (15 Dec 2010)
+
+  15 Dec 2010; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.31.ebuild,
+  +files/mysql-workbench-5.2.31-python-libs.patch:
+  Version bump.
 
   15 Dec 2010; Hans de Graaff <graaff@gentoo.org>
   -mysql-workbench-5.2.28.ebuild, -mysql-workbench-5.2.29-r1.ebuild:
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch
new file mode 100644
index 000000000000..5e78761cd8a5
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch
@@ -0,0 +1,21 @@
+Use a simpler check for Python's libs that returns an actual linker
+invocation (e.g. -lpython2.6) instead of the .so file. This fixes the
+case with forced as-needed where the .so gets re-ordered to the front
+during link.
+
+--- configure.in.~1~	2010-12-08 03:20:38.000000000 +0100
++++ configure.in	2010-12-15 19:10:11.716940123 +0100
+@@ -280,12 +280,7 @@
+ AC_CHECK_PROG(PYTHON27, python2.7, [yes])
+ # Python headers
+ AC_MSG_CHECKING(for Python libraries)
+-PYTHON_LIBS=[$(python -c "from distutils import sysconfig
+-import os 
+-cfg=sysconfig.get_config_vars()
+-lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
+-if os.path.exists(lib):
+-    print lib")]
++PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')]
+ PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
+ print sysconfig.get_python_inc()")]
+ PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.31.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.31.ebuild
new file mode 100644
index 000000000000..d7b43116ce0f
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.31.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.31.ebuild,v 1.1 2010/12/15 18:37:00 graaff Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils flag-o-matic autotools
+
+MY_P="${PN}-gpl-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="http://dev.mysql.com/workbench/"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc nls readline static-libs"
+
+CDEPEND="dev-db/sqlite:3
+	>=x11-libs/gtk+-2.6
+	dev-libs/glib:2
+	gnome-base/libglade:2.0
+	dev-libs/libsigc++:2
+	dev-libs/boost
+	>=dev-cpp/ctemplate-0.95
+	>=dev-libs/libxml2-2.6.2
+	>=dev-cpp/glibmm-2.14
+	>=dev-cpp/gtkmm-2.14
+	dev-libs/libzip
+	>=virtual/mysql-5.1
+	dev-libs/libpcre
+	virtual/opengl
+	>=dev-lang/lua-5.1[deprecated]
+	gnome-base/libgnome
+	x11-libs/pango
+	|| ( sys-libs/e2fsprogs-libs
+		dev-libs/ossp-uuid )
+	>=x11-libs/cairo-1.5.12[svg]
+	dev-python/pexpect
+	dev-python/paramiko
+	doc? ( dev-python/pysqlite:2 )
+	nls? ( sys-devel/gettext )
+	readline? ( sys-libs/readline )"
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	sys-apps/net-tools"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_prepare() {
+	# ifconfig isn't in the normal path
+	sed -i -e 's:ifconfig:/sbin/ifconfig:' plugins/wb.admin/backend/wb_server_control.py || die
+
+	epatch "${FILESDIR}/${PN}-5.2.31-python-libs.patch"
+	eautoreconf
+
+	# Remove bundled ctemplate version to make sure we use the system version.
+	rm -rf ext/ctemplate || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls i18n) \
+		$(use_enable readline readline) \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${ED}" -name '*.la' -delete || die
+}