Depend on dev-libs/antlr-c instead of using the bundled version, now that a new enough version is available. Drop ppc keyword because of this, bug 483246.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 118 insertions, 6 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 8178ed8c4b2a..bc56a88a2ba1 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.81 2013/03/08 06:39:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.82 2013/09/01 07:24:30 graaff Exp $
+
+  01 Sep 2013; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.47-r1.ebuild:
+  Depend on dev-libs/antlr-c instead of using the bundled version, now that a
+  new enough version is available. Drop ppc keyword because of this, bug
+  483246.
+
+*mysql-workbench-5.2.47-r1 (01 Sep 2013)
+
+  01 Sep 2013; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.47-r1.ebuild:
+  Depend on dev-libs/antlr-c instead of using the bundled version, now that a
+  new enough version is available.
 
 *mysql-workbench-5.2.47 (08 Mar 2013)
 
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 8ae1cd549615..a3ff244b8d95 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -7,13 +7,14 @@ DIST mysql-workbench-gpl-5.2.46-src.tar.gz 21885413 SHA256 b409afe822b4959c39331
 DIST mysql-workbench-gpl-5.2.47-src.tar.gz 21924533 SHA256 e6928beb157f1e0abbb8885d16544eefe4d25b05f54dc0fb75b8375d8775838c SHA512 0229c1c3e9b7082f1752cd3f95f4372d9af6bd83b89607f7e74b5460ad72b263b5c89c868ebe19e5182878122357113db0a782865042e096a1d4519733569e15 WHIRLPOOL 40455319a8001ae9365cd164702794be17aa134b254a6a79cfc15c2321a42dfbc463b59f6bb7a34d3d0252fca2b81310014928646d0d5d8e929c46b3de470cb5
 EBUILD mysql-workbench-5.2.45.ebuild 2439 SHA256 5a360b7ad4b7704d3705bf9b680cf4fb9404cc48defcae1cdbeee6924bac39a2 SHA512 f22ee60dbc1eb756a287b5109889b2955f7723a46b680d913123f3f02410ce45c5d50491645e4bcdffd5c2bfbce662a583ea8c684d045272792616e757d05a39 WHIRLPOOL 23448c387b116d0b1c445893e115e76e1b2765644f7f0b64b81ff4d905e0bb4bd8554b84a325fab9f5c9fe28cbb3634a0556cd19c067f9ca27ce1d66690223ba
 EBUILD mysql-workbench-5.2.46.ebuild 2445 SHA256 a4bdd1342d9cd93bdce959f96a3341a43f3cce20386a3ecbafcf0f5a07d7fcce SHA512 81c116e91cb5f9fc85c61ae4d9fca2c32f12e867797bbf309cea1c407a0ac253406dff872a3d4c2b30e08d9d961ece3a288e178977894cb6bdb18ac8f00a83f1 WHIRLPOOL c485f7777f310c4ec86dd2006328f8892ee8c3209c0ede62184c49049e17a0eb23953de0cd9bee2f5de4937b2b28102154ccf0b45d11111e8ccf265f71ae7fda
+EBUILD mysql-workbench-5.2.47-r1.ebuild 2564 SHA256 69d78bf403b68750fb939a3aa3f3f00041f766aaa5c1a6dd828af5440f1d0cd5 SHA512 092aedae1ed2f4396a31e8e0307edf45def30ed43d728f59c9698f6f59663cc766df752a8fdd4813186cc552936ea97b87e6bd9dcd5e0f40dd46b7bce40fd39b WHIRLPOOL 01b687df4a7ea9e612f6e2417d17ba339f00cb4a6d2edc48ac54e0b06c8bbb2d8a70cbc3efa096a125defcf3d0572ca992ce41cb05a5e3c430607dca0b221683
 EBUILD mysql-workbench-5.2.47.ebuild 2445 SHA256 a172c69c78a0cb243281e0e2e97ecf88b4c570c0961761905702e2c8275d982a SHA512 a1808271dc3e29a1b81a83155762792ebf98cfc87be58b739b8525cd436e922ab42edcbc383599ffd3336f438b5cbe8a6224becff917562fadf35e41ea88bb18 WHIRLPOOL eedb87433946db651de21e4d6f393beb158edf952690942d14469b7ae00d0122b37adf3a79c5de68d973450cc17fcf9b0623b2a55dbbf4c60174c9521d355d6e
-MISC ChangeLog 14027 SHA256 7cf9c9ffc587845139f3915896c6cabd59f44c13ae7b37af85aff882b44e1f63 SHA512 a89634dc4720e200a29fa05eba7fff717d1badd17bd7ac5632519bd4857072b75fd9f489614d62ba30e22b8eae6846376b59982df33edcb16e62d31e3b43618b WHIRLPOOL 12130904d95154980b45267f7bab653e409f9012bb89b0e2566307c5253cd3a7834f83aaf6847d5133b654acefdabc84aead9b0e97d2e8efa49c8005df1e3ce5
+MISC ChangeLog 14519 SHA256 66daab4b5fe2485942afa5835ac197497491bef0ed1b360f033dc4e4a24d3d59 SHA512 0160cca0c877c6373dce486ae2075c1aecffde60cbb0530f975cd723c1757a145c63567117dcce62ab906268a70e5e60278c971fb733bc2b1218ec5f66caddfe WHIRLPOOL fd295446bddb667b1f84be9e7c6c500599ec679d4551cefc85bea7d91a93806d785d1446cf3b8920fa48aaa3348830e1c17905d4a89e440be086b41b0570b107
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF0EAREIAAYFAlE5h58ACgkQiIP6VqMIqNccEgD2OTkCdBzJuEDr0DlQpyiG6c7w
-z/c/Z6UeuGyIGCtoUAD9HINi78J4dqhROewpCaxeTsoLGDofDsUXUOOPvxYSrRY=
-=1Sul
+iF4EAREIAAYFAlIi668ACgkQiIP6VqMIqNdzwAD+M6BSy8PEvRBwgOqKUv8+uZrN
+1qwoDG38reeAxCMcWFUA/0DJjuKzmFMMULlTieUY32j5cMOmqcOXJpNfEWUDUzkq
+=HQyO
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.47-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.47-r1.ebuild
new file mode 100644
index 000000000000..7f7be259aa67
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.47-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 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.47-r1.ebuild,v 1.1 2013/09/01 07:24:30 graaff Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+PYTHON_DEPEND=2
+
+PYTHON_USE_WITH=sqlite
+PYTHON_USE_WITH_OPT=doc
+
+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 ~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/antlr-c-3.4
+	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
+	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
+
+	# Remove antlr-runtime to ensure we use the system version.
+	rm -rf ext/antlr-runtime/* || die
+
+	epatch "${FILESDIR}"/${PN}-5.2.44-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
+}