Revision bump. Fix nls support, bug #167867. Enable MySQL Workbench, bug #159957...

Package-Manager: portage-2.1.2.2

diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index 7ef487bf1e851ed5dc9b5ab9b926c95fa12b8f1d..c4e9d30aaab36304ea554c741c5f7d3d2e4596fe 100644 (file)
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-gui-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.9 2007/03/02 20:57:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.10 2007/03/10 23:32:48 swegener Exp $
+
+*mysql-gui-tools-5.0_p10-r1 (10 Mar 2007)
+
+  10 Mar 2007; Sven Wegener <swegener@gentoo.org>
+  +mysql-gui-tools-5.0_p10-r1.ebuild:
+  Revision bump. Fix nls support, bug #167867. Enable MySQL Workbench, bug
+  #159957. Add local USE flags for all components.
 
 *mysql-gui-tools-5.0_p10 (02 Mar 2007)
 

diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest
index 5e495bed9ff5f059075426568303b6e4f145429e..efb5c93b573bdaeb8740aba3d54ea4a8b95a16b0 100644 (file)
--- a/dev-db/mysql-gui-tools/Manifest
+++ b/dev-db/mysql-gui-tools/Manifest
@@ -21,6 +21,10 @@ DIST mysql-gui-tools-5.0r10.tar.gz 25277034 RMD160 93f9b54b2993f1c93999f97974474
 DIST mysql-gui-tools-5.0r6.tar.gz 22832216 RMD160 27a899d4c4b8a5fcea088d78bf50d1ac1f6a7080 SHA1 69c02a327d80274ebb1a55f8aa81fe6e0d1362e2 SHA256 d3da7654de5d9966659b4de94267342c8590c86c667d9ac95275129886cdabd6
 DIST mysql-gui-tools-5.0r8.tar.gz 22898529 RMD160 bef06aa437345708cefe56b07adb027e16ff3c31 SHA1 0a845bc22d9b269081fa7b26c5762e8a6b07191c SHA256 aa3d46fe6e892673a63834ecb30c359167f2c1ad3ba14c3e58cf2a0865388901
 DIST mysql-gui-tools-5.0r9.tar.gz 23754076 RMD160 de8bc4b540a270b76282f664c0ce32d385d2d7fd SHA1 b00ed02505281203f30bdc0a5faf1c41a47873d2 SHA256 46724ae665447c757c7d2b2aef0d066e03387bde4198d119658e732619fc4c8b
+EBUILD mysql-gui-tools-5.0_p10-r1.ebuild 2719 RMD160 85ddd8b1596ad374bf8eb642c4f594721e3ea0a2 SHA1 db5699c79d75ab992a32b2314b7dafdd3aba61d4 SHA256 0a4c298b3a326135bf179b8f7d39ad7d2b546b67b2e2f97b9c9f1eef869b22d2
+MD5 93f450766413fb06d0ab51ce25bc3de6 mysql-gui-tools-5.0_p10-r1.ebuild 2719
+RMD160 85ddd8b1596ad374bf8eb642c4f594721e3ea0a2 mysql-gui-tools-5.0_p10-r1.ebuild 2719
+SHA256 0a4c298b3a326135bf179b8f7d39ad7d2b546b67b2e2f97b9c9f1eef869b22d2 mysql-gui-tools-5.0_p10-r1.ebuild 2719
 EBUILD mysql-gui-tools-5.0_p10.ebuild 1714 RMD160 85daf40777c5accb7e7ab461157d62812096476d SHA1 820378c81e80156f5f01c03e0d889b5fb5b85b8d SHA256 bf0ebe9b81bf9b9b421b9f1a138bfd880ecb90800d15e176647a7bcb1a60777e
 MD5 44be74ff387139af68b5e19b984b95ca mysql-gui-tools-5.0_p10.ebuild 1714
 RMD160 85daf40777c5accb7e7ab461157d62812096476d mysql-gui-tools-5.0_p10.ebuild 1714
@@ -37,10 +41,10 @@ EBUILD mysql-gui-tools-5.0_p9.ebuild 1713 RMD160 2990b34742bc2e676ea6394ae855edf
 MD5 59312591c0292c4bcc57822f3f0afb6b mysql-gui-tools-5.0_p9.ebuild 1713
 RMD160 2990b34742bc2e676ea6394ae855edf10c5b3519 mysql-gui-tools-5.0_p9.ebuild 1713
 SHA256 51e3748056a106b63d6661a5218b6dcc6435de25575fd78f6abb469979937a50 mysql-gui-tools-5.0_p9.ebuild 1713
-MISC ChangeLog 1878 RMD160 f0b213c0cf08b986ed3d63c3d4b3c3b93619f9ab SHA1 a118687833fb5c477456df3d3f13d181d49362ea SHA256 76bd39b4a66d33b03fdc46d78c32057d85587e905987cc19349b88aa823ab3d3
-MD5 e500476d619454b8c66871fa04da14e9 ChangeLog 1878
-RMD160 f0b213c0cf08b986ed3d63c3d4b3c3b93619f9ab ChangeLog 1878
-SHA256 76bd39b4a66d33b03fdc46d78c32057d85587e905987cc19349b88aa823ab3d3 ChangeLog 1878
+MISC ChangeLog 2137 RMD160 8fa5337bb4591a2fca7bbeb8eef02e601c708fcb SHA1 7d8a93924d503b230b2b1a7fa76cf09077a0c9fd SHA256 939a59e380bf6b40bbca80667e5992c0e56bafccd2bd6e0d4a1f255a05701370
+MD5 a51fa250c85c6e9e991177a451b26ce1 ChangeLog 2137
+RMD160 8fa5337bb4591a2fca7bbeb8eef02e601c708fcb ChangeLog 2137
+SHA256 939a59e380bf6b40bbca80667e5992c0e56bafccd2bd6e0d4a1f255a05701370 ChangeLog 2137
 MISC metadata.xml 272 RMD160 a64205312656df8afaa21bdbf37e15aaec949ced SHA1 7701e9d8d21b6250ae0664d90bebabaa231e908e SHA256 6968e5eb7b4a6b2de487f8942f82c8941a8714f6220f36c72082374ae66baeb4
 MD5 a7f4f1fdfeaf295779bf8da23d2732b7 metadata.xml 272
 RMD160 a64205312656df8afaa21bdbf37e15aaec949ced metadata.xml 272
@@ -48,6 +52,9 @@ SHA256 6968e5eb7b4a6b2de487f8942f82c8941a8714f6220f36c72082374ae66baeb4 metadata
 MD5 3286b091c166153ec621d84a19b971e7 files/digest-mysql-gui-tools-5.0_p10 274
 RMD160 c720cfbd2bfb8dfba9670cf180cf4d45d118f86b files/digest-mysql-gui-tools-5.0_p10 274
 SHA256 32d43694d2ad1fa72e265480092243a7c0c6ee58fc1e43cbbd092dd1644677f5 files/digest-mysql-gui-tools-5.0_p10 274
+MD5 3286b091c166153ec621d84a19b971e7 files/digest-mysql-gui-tools-5.0_p10-r1 274
+RMD160 c720cfbd2bfb8dfba9670cf180cf4d45d118f86b files/digest-mysql-gui-tools-5.0_p10-r1 274
+SHA256 32d43694d2ad1fa72e265480092243a7c0c6ee58fc1e43cbbd092dd1644677f5 files/digest-mysql-gui-tools-5.0_p10-r1 274
 MD5 3352477bd6b608ec257ac8da026e668a files/digest-mysql-gui-tools-5.0_p6 271
 RMD160 fbcc02966f9e246a270a58b253d4813e27080b63 files/digest-mysql-gui-tools-5.0_p6 271
 SHA256 c7edb0bcd156c9239f770a5438adde7ab3995be464447357491cd40ea5240ca2 files/digest-mysql-gui-tools-5.0_p6 271
@@ -58,9 +65,9 @@ MD5 5464decc45d3411ab6f5110242d1ce58 files/digest-mysql-gui-tools-5.0_p9 271
 RMD160 3d7620abec1b6005b79b222e678e60d155b82807 files/digest-mysql-gui-tools-5.0_p9 271
 SHA256 4889c2278e89882e1ff8fa6998897db3dce204484c48a93d8cd3e8f7f825769a files/digest-mysql-gui-tools-5.0_p9 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF6I+5I1lqEGTUzyQRAs3gAJ4iM5iw7Kpe3OawY7U+L7LwgVQTEACgwjuN
-Ye1mWqBZwl/cO7a9J0DPBYw=
-=G0Kk
+iD8DBQFF80A0I1lqEGTUzyQRAoulAJ0QSdi0RI/1FyHfXLeJZR/uFDnzOwCdH6cE
+q52iN9rmgC3G0f+4yOe3VIk=
+=PrSo
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p10-r1 b/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p10-r1
new file mode 100644 (file)
index 0000000..aeca60b
--- /dev/null
+++ b/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p10-r1
@@ -0,0 +1,3 @@
+MD5 6b67906f4c0ab70213f4a3064c7bfafd mysql-gui-tools-5.0r10.tar.gz 25277034
+RMD160 93f9b54b2993f1c93999f979744745ce9cfebd41 mysql-gui-tools-5.0r10.tar.gz 25277034
+SHA256 754e4373eb873b9f0402e67711ef5ed5c59c3db0738c182aa01b76214f96e1bd mysql-gui-tools-5.0r10.tar.gz 25277034

diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p10-r1.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p10-r1.ebuild
new file mode 100644 (file)
index 0000000..708d2db
--- /dev/null
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p10-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p10-r1.ebuild,v 1.1 2007/03/10 23:32:48 swegener Exp $
+
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils flag-o-matic
+
+MY_P="${P/_p/r}"
+
+DESCRIPTION="MySQL GUI Tools"
+HOMEPAGE="http://www.mysql.com/products/tools/"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="nls administrator query-browser workbench"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+       >=dev-libs/glib-2.6
+       >=gnome-base/libglade-2.5
+       >=dev-libs/libsigc++-2.0
+       >=dev-libs/libpcre-4.4
+       >=dev-libs/libxml2-2.6.2
+       =dev-cpp/glibmm-2.12*
+       =dev-cpp/gtkmm-2.10*
+       =gnome-extra/gtkhtml-3.12*
+       >=virtual/mysql-5.0
+       workbench? (
+               =dev-lang/lua-5.0*
+               virtual/opengl
+       )"
+DEPEND="${RDEPEND}
+       >=dev-util/pkgconfig-0.15
+       >=app-text/scrollkeeper-0.3.11"
+RDEPEND="${RDEPEND}
+       !dev-db/mysql-administrator
+       !dev-db/mysql-query-browser"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+       if ! use administrator && ! use query-browser && ! use workbench
+       then
+               elog "Please activate at least one of the following USE flags:"
+               elog "- administrator for MySQL Administrator"
+               elog "- query-browser for MySQL Query Browser"
+               elog "- workbench for MySQL Workbench"
+               die "Please activate at least one of the following USE flags: administrator, query-browser, workbench"
+       fi
+}
+
+src_unpack() {
+       gnome2_src_unpack
+       cd "${S}"
+
+       epatch "${FILESDIR}"/mysql-gui-tools-5.0_p8-i18n-fix.patch
+       epatch "${FILESDIR}"/mysql-gui-tools-5.0_p8-lua-modules.patch
+}
+
+src_compile() {
+       # mysql has -fno-exceptions, but we need exceptions
+       append-flags -fexceptions
+
+       cd "${S}"/mysql-gui-common
+       use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
+       gnome2_src_compile \
+               --enable-grt \
+               --enable-canvas \
+               $(use_enable nls i18n) \
+
+       if use administrator
+       then
+               cd "${S}"/mysql-administrator
+               use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
+               gnome2_src_compile $(use_enable nls i18n)
+       fi
+
+       if use query-browser
+       then
+               cd "${S}"/mysql-query-browser
+               use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
+               gnome2_src_compile --with-gtkhtml=libgtkhtml-3.8
+       fi
+
+       if use workbench
+       then
+               cd "${S}"/mysql-workbench
+               use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
+               gnome2_src_compile
+       fi
+}
+
+src_install() {
+       cd "${S}"/mysql-gui-common
+       gnome2_src_install
+
+       if use administrator
+       then
+               cd "${S}"/mysql-administrator
+               gnome2_src_install
+       fi
+
+       if use query-browser
+       then
+               cd "${S}"/mysql-query-browser
+               gnome2_src_install
+       fi
+
+       if use workbench
+       then
+               cd "${S}"/mysql-workbench
+               gnome2_src_install
+       fi
+}