Fix linker error thanks to flameeyes and idl0r. Depend on new enough net-tools and remove our ifconfig hack.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

3 files changed, 113 insertions, 1 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 51da643a1c5f..4adc2e9006d1 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.69 2012/11/20 20:48:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.70 2012/11/26 20:41:42 graaff Exp $
+
+*mysql-workbench-5.2.44-r1 (26 Nov 2012)
+
+  26 Nov 2012; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.44-r1.ebuild,
+  +files/mysql-workbench-5.2.44-my_lib.patch:
+  Fix linker error thanks to flameeyes and idl0r. Depend on new enough
+  net-tools and remove our ifconfig hack.
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> mysql-workbench-5.2.44.ebuild:
   Stable for x86, wrt bug #441142
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch
new file mode 100644
index 000000000000..2805ff03a864
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch
@@ -0,0 +1,12 @@
+Index: mysql-workbench-gpl-5.2.44-src/modules/db.mysql.sqlparser/Makefile.am
+===================================================================
+--- mysql-workbench-gpl-5.2.44-src.orig/modules/db.mysql.sqlparser/Makefile.am
++++ mysql-workbench-gpl-5.2.44-src/modules/db.mysql.sqlparser/Makefile.am
+@@ -64,6 +64,7 @@ db_mysql_sqlparser_grt_la_SOURCES=\
+ 	$(top_srcdir)/library/sql-parser/source/myx_statement_parser.cpp\
+ 	$(top_srcdir)/library/sql-parser/source/myx_unicode_scanner.cpp\
+ 	$(top_srcdir)/library/sql-parser/source/sql_parser_symbols.cpp\
++	$(top_srcdir)/library/sql-parser/source/my_lib.cpp\
+ 	$(top_srcdir)/library/sql-parser/source/my_messnc.cpp\
+ 	$(top_srcdir)/library/sql-parser/source/my_static.cpp\
+ 	$(top_srcdir)/library/sql-parser/source/my_strtoll10.cpp\
\ No newline at end of file
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.44-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.44-r1.ebuild
new file mode 100644
index 000000000000..f55794faea03
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.44-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 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.44-r1.ebuild,v 1.1 2012/11/26 20:41:43 graaff Exp $
+
+EAPI=4
+GCONF_DEBUG="no"
+PYTHON_DEPEND=2
+
+inherit gnome2 eutils flag-o-matic python 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 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring nls static-libs"
+
+# Build system bundles an unreleased copy of dev-libs/antlr-c 3.4 so we
+# can't depend on our own packaged version right now.
+
+CDEPEND="dev-db/sqlite:3
+	>=x11-libs/gtk+-2.6:2
+	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:2
+	>=dev-cpp/glibmm-2.14:2
+	>=dev-cpp/gtkmm-2.14:2.4
+	dev-db/libiodbc
+	dev-libs/libzip
+	>=virtual/mysql-5.1
+	dev-libs/libpcre
+	virtual/opengl
+	>=dev-lang/lua-5.1[deprecated]
+	x11-libs/pango
+	|| ( sys-libs/e2fsprogs-libs
+		dev-libs/ossp-uuid )
+	>=x11-libs/cairo-1.5.12[svg]
+	dev-python/pexpect
+	>=dev-python/paramiko-1.7.4
+	doc? ( dev-python/pysqlite:2 )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	>=sys-apps/net-tools-1.60_p20120127084908"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+pkg_setup() {
+	# Make sure we use Python 2 since the code is not compatible with 3.
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Remove hardcoded CXXFLAGS
+	sed -i -e 's/debug_flags="-ggdb3 /debug_flags="/' configure || die
+	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/Makefile.in ext/scintilla/gtk/Makefile.am || die
+
+	# Remove bundled ctemplate version to make sure we use the system
+	# version, but leave a directory to avoid confusing configure, bug
+	# 357539.
+	rm -rf ext/ctemplate || die
+	mkdir -p ext/ctemplate/ctemplate-src || die
+
+	epatch "${FILESDIR}"/${P}-my_lib.patch
+
+	# Regenerate autotools files to work around broken libtool for
+	# antlr, bug 431756.
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls i18n) \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${ED}" -name '*.la' -delete || die
+}