Version bump.

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

3 files changed, 107 insertions, 5 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 0118cba90e14..85594ff8679c 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.93 2014/05/17 07:53:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.94 2014/06/30 17:59:00 graaff Exp $
+
+*mysql-workbench-6.1.7 (30 Jun 2014)
+
+  30 Jun 2014; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-6.1.7.ebuild:
+  Version bump.
 
 *mysql-workbench-6.1.6 (17 May 2014)
 
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 9c2426ec716e..94ecdf753622 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -9,6 +9,7 @@ DIST mysql-workbench-community-6.0.8-src.tar.gz 24746042 SHA256 2598077e516a2e5e
 DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c
 DIST mysql-workbench-community-6.1.4-src.tar.gz 22801235 SHA256 2e9b73d8a800341916fbc2d9d347c856408ffef4fe71bcc7786ad88d08302a2b SHA512 b3a8d5bc129228bcc0783838f36b72d97fb73a53592221672fc8b2530e9464d4ea94261e626aa0c040d277132958f6b2a3996f2a4ce4d025fbff7aa2c97875de WHIRLPOOL f93ae041cd06491c5f99cb6d16eb313429196b02190452afdb8fe9bb3196d50d36a6ee89dbb9cad6dec4fc5ca510f31a618df43d32bede55864f0f184b9732e1
 DIST mysql-workbench-community-6.1.6-src.tar.gz 24430390 SHA256 d9fb8364784f75426c0f9c10421e272fefa1fe1994ae933eca54c637a3e769de SHA512 d2955756997b3e8121f0da095ca057407337d0c0257f94ae9b096b95996d260f569f473ffb35a68908649cdc20ca4b3438b3a4b1fabd1b1cd0bb365b3b076c3f WHIRLPOOL 55eac43876e545d0bf8ac4d05f3ad46673695f49590920620e6bb4cf5662628fcce1980f875bcb30315e0823e421a49735b032cd416db5c099f6825c5a39763c
+DIST mysql-workbench-community-6.1.7-src.tar.gz 24750696 SHA256 06ac657f7f86f012f75fcf8fa59fc1d422134135485b887a4abd6c9ac2408898 SHA512 d5a4d1f6c6ade06ba775d25f40a7933ba75d87a78f19227e1f9be1c9de85d8ffbbe381161db44c05fa875b6d9f933885e542a3fb829bcedef1305190c6b60984 WHIRLPOOL 15147a2df7b64779b5955b77fe53a4c4fcef74e8d6cb3d925841892144a6256df0a8f41b2fef6c43bc4a3196beb211e393e43c057749d983883b9b857f2ac079
 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
@@ -16,12 +17,13 @@ EBUILD mysql-workbench-6.0.8.ebuild 2317 SHA256 bff73514b883b4061b2373192e6bf4c2
 EBUILD mysql-workbench-6.0.9.ebuild 2202 SHA256 877f81db2c7c14bf50216f49e18a2db889e71d5c3c53e523e080ff93f84e6921 SHA512 968fac7ac984695857f3b2bb08679f45c9ef6e765d9bf76a2ec99b5c5960e1691f0928300ec08dd7dbe7b2a4088408604818507c8b1a1d856c8f32c0319fa0b3 WHIRLPOOL 8f67b1d6d0d788cfeed4899f1e05f30c75f9c962677493055ddbf534ba4455c758ce5d379ce2026fd26cfd542a6171e9c29e9eccab87073cb3d78fd98b2df107
 EBUILD mysql-workbench-6.1.4.ebuild 2315 SHA256 076319945deb4f063345eeefc2083061a1830125ebf7fd497abbde482430e42b SHA512 2adc772388dea1412ce4272d23d2c536056361c1a39330287caa8cf90fb4ab661237d9d3dc58443586ab626a2354a109598ed1baca1fdee1923b335861b09d32 WHIRLPOOL aae20e23baff1fb38768af2a485aeec9621c69acafc905ed369135618e863572778389964ca1d6ab1a55f3158c62ba85c1eabb9ee2affdbf8a3f34b8d96cf05e
 EBUILD mysql-workbench-6.1.6.ebuild 2315 SHA256 7dc84e5b20f428c05861b5ec9cf90eaf7c5c83de3356d1f3342034a3e0c1e8e7 SHA512 b2d999d97ac5aa748734181e44113340334bfc9b589df2cfb2d87f02b31181f40325d3768d2ff7910dca25d62ea18b99c1fc180699cba646cea21a89074faee4 WHIRLPOOL 4982055444624d1c6ff9afcf1d8ce0fa1a1fba0e89ef6fb3fd7881b1376945f99afd4e59bc6ee7722b399721195eaa237f1d7515ac279699e8e30d04cdd675e8
-MISC ChangeLog 16312 SHA256 c644d172d7172af8c1f29c59bcbe92a69884edd926aa022194d73d230ceecf71 SHA512 4d03cc1b244ceae47883ae0802d8750c9bbc16c39187cce1729e85a60d5f8ed226c5fd6c6d09f634c8312bb9a27aadb600cebf5f4c9ee7d0552633186cc91458 WHIRLPOOL b1b17f0e9de4e39a86ee198b768fe0b2c7a23a4c2a36433644f71d4b2ba3da33984f8b5121eb487f232808ff3f93abf5129865ff790b0a6f8dad879939e95480
+EBUILD mysql-workbench-6.1.7.ebuild 2315 SHA256 aa8a9c0facc289ae5dac5635f6e7d8583f6e22cf4352e57251409c6d3e2b0e08 SHA512 01c4069dc01cd42457efd6ced73e49619a5d4a5247127f38c3fa0991a309ed001185af6073dc81cde59b5d54b533228cbfcb3f1ff3aacf0bea6cb062cbd895f3 WHIRLPOOL bcfe8326b6b65b12f0faf874f3570238eaff3c1b10375902dbf9bab4e822fc787832d7806c3cf83a00a2250d01ec09dd2f1f4cbca195456ef0dc55976b0be9ab
+MISC ChangeLog 16450 SHA256 af8e563938f2dfcad12d3dea56590dd8e04a0cd0228f84d543ed3571aef1d49b SHA512 88c906e3ea94dc893fa9720bf8752efb919b4081f0371d76f9e2779ab880db423a93a06aafc96f7992cc904c3e680ddc5dc04172e060554faa31d8e82a50fcc6 WHIRLPOOL fee55e02dc632d5a0282c3900d423dd83c2e2499162d32cbbe223d2eb0ee8c05870ad76d306245d2e3152a7bd3a7582bead9297aa96661d383a92bc848cf5586
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlN3FXAACgkQiIP6VqMIqNce7QD/b81V5i+TLAji7fxKBHd1TEPM
-ZIDs9WMHrK8WK8raCucA/jsM9PCUcM/e/H7UXa9a+bB59Ujffk6AVWvjzOZtliwU
-=h6z/
+iF4EAREIAAYFAlOxpWwACgkQiIP6VqMIqNfWoAD+JtB0ChnVY7wFoKWe6T7R0aPR
+OZ6plsFcfO6Zktqkc0wA/R3adHW7WLqLaw49W35wbnV0RTb5uQZu/6nnwRMvkLbh
+=sdWn
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild
new file mode 100644
index 000000000000..f2066d32359b
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 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.1.7.ebuild,v 1.1 2014/06/30 17:59:00 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring +iodbc"
+
+# 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.6: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
+		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++
+		!iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+			dev-python/pexpect
+			>=dev-python/paramiko-1.7.4
+	"
+
+RDEPEND="${CDEPEND}
+		app-admin/sudo
+		>=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+		dev-lang/swig
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_prepare() {
+	## Patch CMakeLists.txt
+	epatch "${FILESDIR}/${PN}-6.0.8-CMakeLists.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)
+		$(cmake-utils_use_use iodbc IODBC)
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Work around parallel build issues, bug 507838
+	cmake-utils_src_compile -j1
+}