Cleanup.

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

4 files changed, 9 insertions, 209 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index b4aec710ec56..bc942353a7ca 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,10 @@
 # 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.99 2014/12/20 16:10:23 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.100 2014/12/26 07:35:07 graaff Exp $
+
+  26 Dec 2014; Hans de Graaff <graaff@gentoo.org>
+  -mysql-workbench-6.1.6.ebuild, -mysql-workbench-6.1.7.ebuild:
+  Cleanup.
 
   20 Dec 2014; Chema Alonso <nimiux@gentoo.org> mysql-workbench-6.0.9.ebuild:
   Stable for amd64 wrt bug #505798
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index c93766727e79..cc1faf30a443 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -9,32 +9,18 @@ AUX mysql-workbench-6.1.7-mysql_options4.patch 1141 SHA256 443bda1345796c0545fbf
 AUX mysql-workbench-6.1.7-wbcopytables.patch 359 SHA256 a7434308630d9f1b37bc83e35dc362e04ecf6b18e15dc1f6a6a925cdcf98605f SHA512 dece825489a2a1ec6f36122ca0e624f3844d3ea9e715e9e6afba9c392631fcfaee6690c9a0e653ab87f6c52622de996f7670eaa52a0f64c9969aaa456bc438ac WHIRLPOOL de72248451b5f8bd46b33dadeabc32201cb27888a2210d37728e6c6d5452f968c3d9622832ead454476a7b71a35476df1140cdfd78013392ac0eed47257a0d7e
 AUX mysql-workbench-6.2.3-CMakeLists.patch 1455 SHA256 9587f436d73ab366e77109b19e2b21099e0b0003db88662c113a1686e847839b SHA512 8a38b0fa7be0ac982b1d501964727fcb6bd0c7ab5179e2a69a1926c1abe56e2f30c6d9a046b48cdcaaec948d5c9deadb62e14331d52cf39e91f26ee90104c812 WHIRLPOOL 89235917ab608876b916933259f1970ad2c01fd1e51c57781def880291280bd4a3095014b69ec97e07cf6d97a34b4a5cd5ae9c4e89587803f2a2f7d2159808a9
 DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c
-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-community-6.2.3-src.tar.gz 14576661 SHA256 4caba8cf1f8dc0fc57e98a6170ad4718ba44c8f6622ef2359c7a550d080b3846 SHA512 c7d4130e6aeea842347ebf137502159fa17e2baf28bf36e1cb2d39dacf07671b53cfcb54d4f6559ee01d3945d453bedf81b3e58d5f805df15e63bbf113acee27 WHIRLPOOL 15e7624e29cc1a2cf1a786a50c02c2124cbeeb7577be617dcdb3751613d7bdf1cd26a44a430cc08861d3f0416a46ef7bf82abd7d6b03052f651c6a963b858688
 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 2201 SHA256 58fb185ce2d2843baded2a74ed2935f201d861c28cfc376fa5350a6d7e8b2c9b SHA512 cfb01fd53c11cd1a796fbef6de1352660affd4677ca9e77a3164cf084b733c846f58df0f696c5ce6314575647ccb5bcc96fc9732a2d056ab5b02f7f490ba55d0 WHIRLPOOL d408cdd4370ab7fc20a944e7ccfd08a3df7ececb4013584092dad6ad3ec1037880cf753de9d498adf6f72f334955f539bd537fe961896d84d195d0044bdac304
-EBUILD mysql-workbench-6.1.6.ebuild 2315 SHA256 7dc84e5b20f428c05861b5ec9cf90eaf7c5c83de3356d1f3342034a3e0c1e8e7 SHA512 b2d999d97ac5aa748734181e44113340334bfc9b589df2cfb2d87f02b31181f40325d3768d2ff7910dca25d62ea18b99c1fc180699cba646cea21a89074faee4 WHIRLPOOL 4982055444624d1c6ff9afcf1d8ce0fa1a1fba0e89ef6fb3fd7881b1376945f99afd4e59bc6ee7722b399721195eaa237f1d7515ac279699e8e30d04cdd675e8
-EBUILD mysql-workbench-6.1.7.ebuild 2401 SHA256 0b5758c3e89d4c84e714321b042206b1faa7772b530860d84a3433c56d83c131 SHA512 5415049ea1621031f3532ff3a055eba136ba7ae6a643d43f9940b1bd17624e92049abc8b5a5f945b9ba112318965506f5cbc95f5a7bc87c2ecc63875568f57f9 WHIRLPOOL a8d0b661d5f3eb42e7b8a90c2241ed548adafe384a06c32927542b76de7bbf5f50232b835ed492df0e03d922f535fa775ffa0a3c3fab7eac1b3071a129e3c579
 EBUILD mysql-workbench-6.2.3.ebuild 2442 SHA256 eb21b8bf7b68081754dfa1e9d3a117ebe6fa1dc5ef1ab72fd8f11e50775c9446 SHA512 1c424a4db6ea74bbbf1a704d46aef8836e35640bda24d2083e08c5bd39a415a2eec512c300bf955fd7063dd0cad898cbdfbbfc749e3ab1cf092a604c5a80767f WHIRLPOOL 8b2630110eb0ebdd9790daa3f6e52b6f4a5d26fec14efa0d1725ae2f3acddd8dd98a0babd6d6db4db405ab045c7c297d3906663bdf163cf70ca2ef38312731ee
-MISC ChangeLog 17306 SHA256 12245ebcfe93ad1fda451438c9c6127ad6c43df7416241badc816b8f2c22d9c5 SHA512 e0a15fdce35813d29d279f38b08ee24eec3eb626a510471682c8fb700290f541665e242110c69c4ea503d1b8c5a7b8948438927bcd789377b62687f07ccea6ad WHIRLPOOL 7d72f1ed2bd0ba2fee66a23567d7b2dcc2f24823f1a1c609ec5b39882b7f6c05548aa5b86f6596e68ecbab3a56d8244b899229b998e34360774c2033be6bc010
+MISC ChangeLog 17433 SHA256 890ffb6b68e9acc80fb1af4be5237d843a437b7f59d22cc586f48bb1d986b871 SHA512 2a1bce4f1e2ff2837bdbf9f5230a02173692dc50d1e6ce2a285858be46ac8c6e89456d876680ac993655549a9bb037dae9107e6b3ed461e41b447331fdd1606f WHIRLPOOL af84d470e3530352ecd78ca3e95091f1e3af28a12775acb793833c618cec97631269c0b6d82a0c2c06b7f11542a9056e5ff9c68ca8d237e16245d38e1a4d7db6
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlZ/lAAoJEH/rgyzyU9sV46AP/2ZLJXbLIgo+tvsFCiL+ak3R
-qiUj9tiBh8H6sDtBF2BhPrqCv5ahceMYDaBqLxSViJBzbg+yfXudBXr55UDIBYsC
-pHmncztCzrMeiU4+al3E0WgtI0Pdp6qSD4Yxa+4NMg8krkhAfdN5WT9PctVK6nZh
-eBG8jocv2WXpUf6/v6JkWBEuialcAgEpk5J6HM/fV8cAdKFlblx+O6+Ul5exGA5E
-GrtdQYWGtzv+0EuNHCn1jL45wcDCZj7ZL1wMaSumKY8FyL2a3qoM8n/QUMt9rbfz
-Sa3pZ1xBEwV0I9fbMf/+WXRGphwHI5EoT+gw/o9bKmZ2YA7/YSBNy4KKuKwflCN1
-PjrkhiLbQag+pGWVgRAZxLu3l+HlDeeeiE9IVbBMx7fxXG0Mbyv6vEKexbq43g3F
-iCe8g9hg4XYdbbhNzrMQo6JExOQo+x7CMKSDrZ25Dt3NKWa2hX40QoHRsYhXksPU
-LsUGmWWhXoRpsXUAYflPtZD3iQ5mpueMHHb0xMDTHKJWfQCtSOu73Nq+Gja313tB
-bxQGrzjuhsJzGBTlszjalwR4etDfcHhsfnPFCXnsF0L/sqQeLk1+WiQrQxPxG+9x
-VJHmY9JPTL5Yt0ZE0lGvXw65AiRZwTbSG2HwYz6pbp0F3C0TMVQ6+8VjyoxMsLO4
-UD2GMuaaPLj2uSBNMql4
-=ZBYk
+iF4EAREIAAYFAlSdD6wACgkQiIP6VqMIqNfwpQD9GGXE/JYavW9COhcUHVRVVfQH
+vCqqmxfKe6lD/Ip06a0A/RZuRjdwk9zMPjlyeDEasPJMvXJL55gTKpxitmoQDLbs
+=M7+y
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.1.6.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.1.6.ebuild
deleted file mode 100644
index 773608cb382f..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-6.1.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.6.ebuild,v 1.1 2014/05/17 07:53:19 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
-}
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild
deleted file mode 100644
index 1b0d574b92a5..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.3 2014/08/25 19:34:11 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" \
-		"${FILESDIR}/${P}-wbcopytables.patch" \
-		"${FILESDIR}/${P}-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)
-		$(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
-}