From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E41BB1384B4 for ; Sat, 2 Jan 2016 11:16:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7712E21C00B; Sat, 2 Jan 2016 11:16:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 113A421C00B for ; Sat, 2 Jan 2016 11:16:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C935B3405BB for ; Sat, 2 Jan 2016 11:16:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B249C89 for ; Sat, 2 Jan 2016 11:16:19 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1451733342.b4734be36946089b048b15f92cc4c6b13ed12870.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild X-VCS-Directories: dev-db/mysql-workbench/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: b4734be36946089b048b15f92cc4c6b13ed12870 X-VCS-Branch: master Date: Sat, 2 Jan 2016 11:16:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 547e39b5-3c57-4e26-86d1-2371ba926f0a X-Archives-Hash: 7c1bffab2e81097be7f5280535b98b89 commit: b4734be36946089b048b15f92cc4c6b13ed12870 Author: Hans de Graaff gentoo org> AuthorDate: Sat Jan 2 11:15:17 2016 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Jan 2 11:15:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4734be3 dev-db/mysql-workbench: use system antlr Use dev-java/antlr for building rather than downloading pre-built antlr files now that a compatible slot is available. Package-Manager: portage-2.2.24 .../mysql-workbench-6.3.4-r2.ebuild | 109 +++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild new file mode 100644 index 0000000..fa6ed5e --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +CMAKE_MIN_VERSION="2.8.11.1" + +inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils + +MY_P="${PN}-community-${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" + +# glibc: deprecated mutex functions, removed in 2.36.0 +CDEPEND="${PYTHON_DEPS} + dev-libs/glib:2 + dev-cpp/atkmm + dev-cpp/pangomm + >=dev-cpp/glibmm-2.14:2 + >=dev-cpp/gtkmm-2.14:2.4 + dev-libs/atk + x11-libs/pango + >=x11-libs/gtk+-2.20:2 + gnome-base/libglade:2.0 + >=x11-libs/cairo-1.5.12[glib,svg] + dev-libs/libsigc++:2 + >=dev-libs/boost-1.55.0[nls] + >=dev-cpp/ctemplate-0.95 + >=dev-libs/libxml2-2.6.2:2 + dev-libs/libzip + >=virtual/mysql-5.1 + dev-libs/libpcre + >=sci-libs/gdal-1.11.1-r1[-mdb] + virtual/opengl + >=dev-lang/lua-5.1:0[deprecated] + || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) + dev-libs/tinyxml[stl] + dev-db/mysql-connector-c++ + dev-db/vsqlite++ + || ( dev-db/libiodbc dev-db/unixODBC ) + gnome-keyring? ( gnome-base/libgnome-keyring ) + dev-python/pexpect + >=dev-python/paramiko-1.7.4 + " + +# lua perhaps no longer needed? Was used via libgrt only + +RDEPEND="${CDEPEND} + app-admin/sudo + >=sys-apps/net-tools-1.60_p20120127084908" + +DEPEND="${CDEPEND} + dev-java/antlr:3.5 + dev-lang/swig + virtual/jre + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +src_unpack() { + unpack ${PN}-community-${PV}-src.tar.gz +} + +src_prepare() { + ## Patch CMakeLists.txt + epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \ + "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \ + "${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \ + "${FILESDIR}/${PN}-6.3.4-cxx11.patch" + + sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \ + modules/db.mysql.sqlparser/CMakeLists.txt + + ## remove hardcoded CXXFLAGS + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die + + ## package is very fragile... + strip-flags + + cmake-utils_src_prepare +} + +src_configure() { + append-cxxflags -std=c++11 + local mycmakeargs=( + $(cmake-utils_use_use gnome-keyring GNOME_KEYRING) + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + ) + ANTLR_JAR_PATH="/usr/share/antlr-3.5/antlr-runtime.jar" cmake-utils_src_configure +} + +src_compile() { + # Work around parallel build issues, bug 507838 + cmake-utils_src_compile -j1 +}