From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79F00139695 for ; Sun, 21 May 2017 06:03:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA2A121C075; Sun, 21 May 2017 06:03:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8565F21C075 for ; Sun, 21 May 2017 06:03:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FE7A3416ED for ; Sun, 21 May 2017 06:03:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB7F9743E for ; Sun, 21 May 2017 06:03:04 +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: <1495346284.9875e41be66aaf9ee0c5bb2d874855cff6a64544.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/Manifest dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild X-VCS-Directories: dev-db/mysql-workbench/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 9875e41be66aaf9ee0c5bb2d874855cff6a64544 X-VCS-Branch: master Date: Sun, 21 May 2017 06:03:04 +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: 7f08687b-0e4c-4b24-bceb-7fd3d0a19b15 X-Archives-Hash: 277fb13346c333ac165619a9448a315e commit: 9875e41be66aaf9ee0c5bb2d874855cff6a64544 Author: Hans de Graaff gentoo org> AuthorDate: Sun May 21 05:58:04 2017 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun May 21 05:58:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9875e41b dev-db/mysql-workbench: cleanup Package-Manager: Portage-2.3.5, Repoman-2.3.1 dev-db/mysql-workbench/Manifest | 1 - .../mysql-workbench/mysql-workbench-6.3.3.ebuild | 101 -------------------- .../mysql-workbench/mysql-workbench-6.3.4.ebuild | 104 --------------------- 3 files changed, 206 deletions(-) diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 28b7d1c7b14..6854db6f8bc 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -1,3 +1,2 @@ DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0 -DIST mysql-workbench-community-6.3.3-src.tar.gz 14892631 SHA256 4511d63145b2a979310d84c9f0ca61b7460af2c87b81787b2f2404fd5095f419 SHA512 9736ed4f896b2819d5cde76a000a56b6ce36606262a83b5a0ba8dfc8760476eb43bcda08f258d856297924f3ddca2d89aadf0139fb156beb345f2a6fe5b0bc45 WHIRLPOOL 9e1054b8c18e854918133da62f67cc109f212812cd2509edfc775d4ebbc91b402a7b88b530e540eb67dadba6f6fd3d901b3f7a30b7a03a5a33537c677bbd0024 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f WHIRLPOOL 9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5 diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild deleted file mode 100644 index d657dd0565f..00000000000 --- a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="no" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -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 https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="debug doc gnome-keyring" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# 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[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-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" - - ## 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() { - 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="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure -} - -src_compile() { - # Work around parallel build issues, bug 507838 - cmake-utils_src_compile -j1 -} diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild deleted file mode 100644 index 3dfef640e2a..00000000000 --- a/dev-db/mysql-workbench/mysql-workbench-6.3.4.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="no" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -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 https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug doc gnome-keyring" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# 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-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" - - 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() { - 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="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure -} - -src_compile() { - # Work around parallel build issues, bug 507838 - cmake-utils_src_compile -j1 -}