From: Hans de Graaff Date: Sat, 7 Mar 2015 08:00:34 +0000 (+0000) Subject: Version bump. Fixes bug 531114. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=72bb7d488654495243dcd08c1d03fcb6950585cc;p=gentoo.git Version bump. Fixes bug 531114. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7! --- diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index 2c9e72b636eb..32134062653d 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-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.104 2015/03/02 09:27:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.105 2015/03/07 08:00:33 graaff Exp $ + +*mysql-workbench-6.2.5 (07 Mar 2015) + + 07 Mar 2015; Hans de Graaff + +mysql-workbench-6.2.5.ebuild, + +files/mysql-workbench-6.2.5-wbcopytables.patch: + Version bump. Fixes bug 531114. 02 Mar 2015; Agostino Sarubbo mysql-workbench-6.0.9.ebuild: Stable for ppc, wrt bug #505798 diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 2237bff6841b..d4ab9b90d711 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -11,30 +11,24 @@ AUX mysql-workbench-6.2.3-CMakeLists.patch 1455 SHA256 9587f436d73ab366e77109b19 AUX mysql-workbench-6.2.3-ctemplate.patch 1253 SHA256 87e4dd4878b2cabee0534c25cececdc918e503fa0f66bf9f85eab3fc53b8c80f SHA512 edb165e46822b5c6a7b854c70f6a89831f3b4cc17c4d7b652a36ee9ed9ed8c92f6472ad9e4fa62148ff0cb87dd03bbfdd7aa84c526b8ef5d26f7600731c4c0e3 WHIRLPOOL 60280f1d9962c53df9d420a0506f12dc3658b3a48976ee2f821621d27d6879f1e4e72f1e8ac3633c0199667477504971c18ad90822d8c90335b1b9a6766ad557 AUX mysql-workbench-6.2.3-glib.patch 1814 SHA256 48c265c32cb4647d5d1ac1bd278a2767c5d1300f7b5e4b71a4c29e6c0232cdbf SHA512 504c069bdf4a797b5a0c46cb901abba3f69d83049802e5ca5350bffa47ae4f032de4c60092df5d3d8db99f344418ed22491e0803f90bcc308b95991fd8a194d0 WHIRLPOOL 6bd2e776020837d7683f135c16a81c1664d81ce4edb47028517a0c7d711c84ab8066c99d79160127b4d9af3b58c39c5ae946fc690f1a2e2406fd75fdd05a167c AUX mysql-workbench-6.2.3-paramiko.patch 2119 SHA256 bba8601d15bc2d7d462c156598d1d70b9f0c9374a77c7d3a1c98288aa71b3935 SHA512 66d9da29c936e575638db3b4f21118e4e11b0f6918226224ca69eef37cad3557ee631502e82b2c2fcd66b785e1d256846622470c44462669e7e96c1e14962112 WHIRLPOOL 5e82e35e6f54ead7c393ccc5cf5c4ca22a9d42fb16c4cbae8a3bf97e69111b63f0a3c23499c0c75b88120b5eed0573138a51d61d90e9b58236047bbb88383f04 +AUX mysql-workbench-6.2.5-wbcopytables.patch 492 SHA256 6e78fcaf5d46897ed98e55bb7924445c553349936a537eb71b665dca06b66e62 SHA512 e6e56e259a6037730b7940a6fe22a49f434c01a331f4fdd3d865fd25bd1effaf88e00d5b3f76c847cab1adb38d7764ff705ded5693f51ce9005bc9a1b672fde3 WHIRLPOOL 4fd19f924f9e78d7053195b313ad56c3189cbf5d8dce82f68cbf449f89047d7535559138fa5a5345df0b2347ecddb3b5d60fe46e9874414d52291fad027e7f3f +DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0 DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c DIST mysql-workbench-community-6.2.3-src.tar.gz 14576661 SHA256 4caba8cf1f8dc0fc57e98a6170ad4718ba44c8f6622ef2359c7a550d080b3846 SHA512 c7d4130e6aeea842347ebf137502159fa17e2baf28bf36e1cb2d39dacf07671b53cfcb54d4f6559ee01d3945d453bedf81b3e58d5f805df15e63bbf113acee27 WHIRLPOOL 15e7624e29cc1a2cf1a786a50c02c2124cbeeb7577be617dcdb3751613d7bdf1cd26a44a430cc08861d3f0416a46ef7bf82abd7d6b03052f651c6a963b858688 +DIST mysql-workbench-community-6.2.5-src.tar.gz 13037465 SHA256 40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e SHA512 6cc9ba91a9fd4d19bdec157084fd5b510cc274e2851b54855441ad97dd042009064a00aa330a5689c18ed70a0996bf23411be475339ee96ba2ff5252c49d7839 WHIRLPOOL 74de61140edd91ee85c222338c02d3672869a0231bb25eb5f37c43a9cad2e280db521261a4ec6557e237c3f48cab84e92838a100949835fe85db924b5a382cba DIST mysql-workbench-gpl-5.2.47-src.tar.gz 21924533 SHA256 e6928beb157f1e0abbb8885d16544eefe4d25b05f54dc0fb75b8375d8775838c SHA512 0229c1c3e9b7082f1752cd3f95f4372d9af6bd83b89607f7e74b5460ad72b263b5c89c868ebe19e5182878122357113db0a782865042e096a1d4519733569e15 WHIRLPOOL 40455319a8001ae9365cd164702794be17aa134b254a6a79cfc15c2321a42dfbc463b59f6bb7a34d3d0252fca2b81310014928646d0d5d8e929c46b3de470cb5 EBUILD mysql-workbench-5.2.47-r1.ebuild 2566 SHA256 1b38c5c6c0e1668a10babd8eeb5907c90cd2ceed9f137376291cd41277929b8d SHA512 8a5a6d73e44e27c959c536ad78a32210720eb4c11630af1710d77b28e3cfffbd4aaed42155d8ab5fdf47dfc52dd993eeac81d9c2882fbfc6b2144f157d79cf48 WHIRLPOOL 68c6980a22b83dd056502657e3ca766cbd235744de63147c99c8ca09a9fab5d3f2718ff540e4aa976e7eb51ea537e171cae5035900fa142185d4b95034f636de EBUILD mysql-workbench-5.2.47.ebuild 2439 SHA256 e91ee188f56a775c8e21eb08b91cdd8eab524d389cc203816fd2dd7c237cebfa SHA512 4bbacf5419c9c64dd950f55ee1be777d6ed80574667d96e87a069bcb9873dfbb1e2c18c3e416c278c7ffe42a74c5a5f25884656596ae5d6584868df6e17ec044 WHIRLPOOL 8905c429eb645643f0fe84bca269c79f5dd54a160c4e3ed105f1c0c42e8571aea872a7077f729079f0626d96abb83f62149d3cb14209c2a56f49cd525ae7a281 EBUILD mysql-workbench-6.0.9.ebuild 2202 SHA256 e99c7657c57a8622a070a3371b330418810f8fb7aef117530eca4443eb69606d SHA512 69e9e62f29d966ce4834aba225f52f69e111f308e9a40aa0cd17e53b80f3f8ae2da329ba03e8ae925cc2ace597540367cd230fa2f42a944954cf04a3b7eff019 WHIRLPOOL ae85393cb5849d208c88008e0708520c55262b31922191b12fa477f4b224ac9e4d177a228b2e6eebfb2b6e20a4fef1083b8de551d3d1e858c37c7905287a79e2 EBUILD mysql-workbench-6.2.3-r1.ebuild 2583 SHA256 c66dafab74b38c9c23a40cd27d6588522a9457246c3f75477ca7c43e2c97b2c6 SHA512 959ee577defa956548eac7ded7c0f76e9cfd7ea85b9491f570d98181e09f8d56d9bfb6c661de0a4c5ce29dbaca46fdcfc949f822a2b56a5d837a0d0433ae86ea WHIRLPOOL c2805526c6728c7650d94d9bdb44f7f35831b76c13e5190a771b0b12a208c73d2d60b1fa8ad512c3c6d3cb95b113a1301803dd98dcd2344d0ef8937cf8eedfa2 EBUILD mysql-workbench-6.2.3.ebuild 2494 SHA256 b677db484e1b595649e49d471fdd70f36c9295d3355c0b82a9414fb61f8f472a SHA512 83ecdab2971e10752b22a94594634b7876f12b4a9bcff4a266ffa8e865614183110d1f01a6e63decd2a9b5f407caa26feddef7e489bc5e62f47d2123c304ca09 WHIRLPOOL 5d2eeeb9378422008547ebce8cd781c579251086d83c3db74ab4006bc36616a45c9923b4a50023f8c8d1e0b4bfdbea0b929b5a74de041ce19a5edb809b2f5a15 -MISC ChangeLog 18244 SHA256 ef2ea04debc6b26221b329a40783e1fa536a243a3ef3b618a5ee1ac959858e59 SHA512 2acb5e307a077814067468b342311367cb9c7c8a25af1e4abdac4d528cf3d00995311bdcce1edb2d5f0de2b329260af7d73bbeed66d410fc02df41491ff9f249 WHIRLPOOL 28922c0234c07db1ef278316b41435baea5d8880db2f4f29ed0082a9426a4e2a1c52b3b1c165b47aad7857c448603c1bb75ca5964b3352f6db565a92cbbf203b +EBUILD mysql-workbench-6.2.5.ebuild 2679 SHA256 314fce43a4a2e763ae50594f4ff3dedc33c4b2ca75c5994c31c1e72da3c288dd SHA512 74d0d15c441b5f6522a30cfd9f17aae1cd98f905ba6b2e807d58fb73151c2cf6a378e98e504ebe98ba27130172670d0dd5376182443f21394734045e098df036 WHIRLPOOL 1197f7395f3fd173801f5dba678567fbd1b7af86aa838d631b86fcc0aff050720abf08f34e54eda4874534517ed5b1a78cda68b3891312588e1185450c31d12c +MISC ChangeLog 18454 SHA256 f2431c9265b4e8c44aaa036484371d85564933576dfa244c14617fa9d7ba20e2 SHA512 8a795efff83f85966cfb626e2dff2367d781d9f823b456c353d838c7fc487ccc1be926fa95586db9ed268c15036fe69701dfef2b84e734f2856b619c597ee2d5 WHIRLPOOL 658fa98ee1ce1e8ae9942eb3266af001eaafa213cfa22e6ed8d08172ac24f79d63bae5c0bf6add070ae3cd6bc55ce17e1d12b526474028fa58bb7646ca782644 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU9C0SAAoJELp701BxlEWfw18QAL5IVXClJ2MvV6z19TXzlkQp -hk89fBMZbywwjs9xaglxRhRM39RNwO6J8vBxwVs9X4hxFYzSC/2ALkEbLcZOK2dB -wtkdWKaSWRXVcny3niLIRqESXwzlwNVI5rpAH3o4nD+Mqv879YlsUaMitgiXfRap -2mCs2hdGZUuKMRctVGvc9cPGQzrZ/bnjw6M8EKWFe7kJbgANOauFUU2GUIxg3Ynz -Hhr/6c3K99aLDXjP4+btkl+vwRvhNJC/myOkeZySPtRZzsV5qvQtcWXkWN++Pkfn -Mys3p0N3dsaNT33OTJ/x34ZG+Bo2MgTuTfP+0Grn8ESYqdUC+DUsz2k7h7gpCzXe -OKTsKzoHn52JFK4DN7r2fWz35MpXnZzA+lhL1ambi9kJMkxubia6AvCONRnW8nu/ -PWqJheekaLhDixOBfl3818jZvOmZ1jGhnzHQYtbdchfYP257JroZM/AZRq2UM6Eq -PchJeqtAgSWWYywScXcznqrYPDtHaXd70ib6HPM/E3bUvHBAZ/w+ATcPsqdpqC2Z -RxAESJ/zg7a35fuK6GphQik+9X/9bka8DFMBC0KbhuJ3cyN4VRvCqn5mCh86ZiXX -AYauTgFWaZYBiTfleIyqCu/71/YdPul4jHgtQ3Ww4NXhTXp3n3Xvc6M2k2Zdmv7l -kyVOXzdcUt138xWOj54P -=O98S +iF4EAREIAAYFAlT6sCIACgkQiIP6VqMIqNfKsAD+OaOesdx8w+WIzoC2nHrSZ+gk +ORcF7CrG2z1VBw2OnEMA/A0l8VaC2Naz2JY8x87ukHnX67lt3SSqj04oMCIZQLtm +=T9lu -----END PGP SIGNATURE----- diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch new file mode 100644 index 000000000000..0fcc837fef01 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch @@ -0,0 +1,12 @@ +--- plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.000000000 +0100 ++++ plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100 +@@ -10,7 +10,8 @@ + if (UNIX) + configure_file(wbcopytables.in wbcopytables) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/wbcopytables DESTINATION ${WB_INSTALL_BIN_DIR}) +- ++ ++ SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}") + add_executable(wbcopytables-bin + copytable/copytable.cpp + copytable/python_copy_data_source.cpp diff --git a/dev-db/mysql-workbench/mysql-workbench-6.2.5.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.2.5.ebuild new file mode 100644 index 000000000000..4d988a67ac83 --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-6.2.5.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.2.5.ebuild,v 1.1 2015/03/07 08:00:33 graaff Exp $ + +EAPI=5 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python{2_6,2_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 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" + +# 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 + >=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[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/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.1.7-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 +}