From 11cce0a6f2a0396d3e28d6cd33f49abc0c509714 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Mon, 26 Nov 2012 20:41:44 +0000 Subject: Fix linker error thanks to flameeyes and idl0r. Depend on new enough net-tools and remove our ifconfig hack. Package-Manager: portage-2.1.11.31/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7! --- dev-db/mysql-workbench/ChangeLog | 10 ++- dev-db/mysql-workbench/Manifest | 14 +++- .../files/mysql-workbench-5.2.44-my_lib.patch | 12 +++ .../mysql-workbench-5.2.44-r1.ebuild | 92 ++++++++++++++++++++++ 4 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch create mode 100644 dev-db/mysql-workbench/mysql-workbench-5.2.44-r1.ebuild (limited to 'dev-db') diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index 51da643a1c5f..4adc2e9006d1 100644 --- a/dev-db/mysql-workbench/ChangeLog +++ b/dev-db/mysql-workbench/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-db/mysql-workbench # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.69 2012/11/20 20:48:15 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.70 2012/11/26 20:41:42 graaff Exp $ + +*mysql-workbench-5.2.44-r1 (26 Nov 2012) + + 26 Nov 2012; Hans de Graaff + +mysql-workbench-5.2.44-r1.ebuild, + +files/mysql-workbench-5.2.44-my_lib.patch: + Fix linker error thanks to flameeyes and idl0r. Depend on new enough + net-tools and remove our ifconfig hack. 20 Nov 2012; Agostino Sarubbo mysql-workbench-5.2.44.ebuild: Stable for x86, wrt bug #441142 diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 799d392e6e31..ee7907a2fb73 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -1,11 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX mysql-workbench-5.2.31-python-libs.patch 873 SHA256 7ddeb3cfd33c0a1460b3271f2fb3eb7b8cfa40496994b9288009bedb2cc3740a SHA512 dbb20af36521f1d89292728fae0d38f9d7728b81438c4f4b9e5feca4d748d8aa002a222d92c494977a36a725e2d252fd369b2fe6570de5c56b319a16583ba462 WHIRLPOOL 71ae6fc8ad014738a96f298dd344b6dca8ea07fdb00bb0ed65c205f61f9707d5720f9ebf4bebc6ad0e8aeeb09df68f6e337cd62effb3762b88388135810d0e86 AUX mysql-workbench-5.2.34-gcc46.patch 617 SHA256 6d0d9302e0f3682a6b9cb91c42955eacf60389881f3b531f65526b2b099baebd SHA512 913e256ec9f328c810a701ebdff9a8ce8df77490c30e747104ed1bfc6286f4c07bd53f5f4064f815c2edfebf7173cba752b8c4fbc6f58ff3f1b73afa33a7f242 WHIRLPOOL 5a0791de80472c5d2f3b4c453bacf70ad3b0b2563b41c6a1754bf9a7e5c3a91a5d684a3b2ac6bfe55cac5f5b18e6d9c56df98fcfd91c88b5206be39c03468d92 AUX mysql-workbench-5.2.39-glib-2.32.patch 2882 SHA256 28d2d13813a1ac3c071ba58eec7658fca04cf2886091e2cec06ae70946d35c65 SHA512 9f1266dca5a615062142fe9e2f01122e364de8d3bb73c110524793033517ebc237a9262f632518d7cf848e47fbff636d0d690cb52168f405b117dc04afc74fec WHIRLPOOL 9568463d4fa2834b5532a59e2ded9a081b8cdaa6d6c8f320f29937a5a388bec27df11b03554f1e6e91a3bc26bd04f9f99add54cea3ec0630d4eb1ae5c9ffdacc +AUX mysql-workbench-5.2.44-my_lib.patch 780 SHA256 77d54c50e8112ac1ee716fd10232c492c14e16047eeb54c7fbad159a97aa7cfc SHA512 456c79cb2c955b4265f51a9b5579391a91cb8a3ac033e9cb3f887e5ab3875a7d9e84a5ff6d6fbb237e086a7bcdbc339cc23cf1dd0e4079e005e9ab9434ceef65 WHIRLPOOL 492f641dd539ee3d8cdf1f67a13d132178b7befa49ab2167d7cc753e6f9ed82fb1f105fa7d50b95397c1c3e5d15e0df6dc439a53cc4f242d4e3dae9d274a2e15 DIST mysql-workbench-gpl-5.2.35-src.tar.gz 17874329 SHA256 3681351af061637ce54dcc1b490325e9a4a0b42127e642e60220845fcfc2cbaa SHA512 1b7e94811b39204761dfd9308a51fb78068e2f2cfd141b8add52fdb1eecb51daafe903adcd5ff20066c22606060a672bde479705da7b7bde88719a8d3f12974f WHIRLPOOL 0e1d9d3297eb7fa414804714045db47bc64b4d3888c4de26b8d0a091ddd0b83f88f306c0906e3ac0e598b0f1976f94f58b0b6a42b2db98b173cb2e95519db7ac DIST mysql-workbench-gpl-5.2.40-src.tar.gz 18902330 SHA256 782be704afd7f2348bab98479c1ace807f83811f24aa268d5853486909c356ed SHA512 adbf5a6ded8f38bbbe3ce91fc0bb8fd7914d8287446302d1b3fca892b5a332883b71c23a481f7f0ebd04f4bfb6275f6a58c5913d6f4bb89a6be9741bd3320495 WHIRLPOOL d36f0ecd8697acf81db43054990b7b74e0df9e51dcdc8ca4329ae26d64292d5011fda776e1790063a4118b02660b471a0fbad5b301188e288180c8cd45ebf5d0 DIST mysql-workbench-gpl-5.2.44-src.tar.gz 30799313 SHA256 f78a393e0f8bbc51b6be761ac3e0988c21d774a35efa081ef204d8c47ab841e0 SHA512 1a7939b34b1d50c0cdca37b6b007f2bb0aab299b2ba851e2f3c3095dcacc9056994337a79efa0022a5f2a6a760362ac9e9f4fdf7be6b1a7d9c12993b499bf403 WHIRLPOOL c59b0e555e98ae9b552e05cf3aa6ab9791e81784590e24b52c499844ce20ed34e093d5102fdbd9273a0465dd46c285aa57a1392b64122e135ded50fd46f286d5 EBUILD mysql-workbench-5.2.35.ebuild 2128 SHA256 3bff17dadee3c35ee5181313105ca778442447e183bcd3f417f76f4a24ffebfb SHA512 d74e63721a230794d22ea6caeead1a25edd86504730a05e547f17a489204e2da69369c52f4ad1e80078074567d1ede75e981aaafd520703a94226efb7d34ec89 WHIRLPOOL 7bce962f1d56fda0fdf3472da89933d2c7ce6094bf80a146ed8229b53977bd6295ba270b384d0678783966123006501304663abc4c37df138e559c8ae950e7f7 EBUILD mysql-workbench-5.2.40.ebuild 2229 SHA256 d4c715498c9af10293a7c7011364413a23c80dc2140c5ec571f5dce9ab6bc73d SHA512 e174506d0637cdefff55bc910d6e1af9fabc9afcae1327798c1df627d40ef87061eb22a543a0d93248c3c036274d54b0d3e440a14f3d548bf93b2423e7eb599f WHIRLPOOL bf58ac76033464480bcde442731842ff57e2f957abef5f613bd987c07027d4ef58aff0ec8f18457b55549acc6be6ad0a0823ff29076e4b8f544f6a3e034cf9b2 +EBUILD mysql-workbench-5.2.44-r1.ebuild 2424 SHA256 1000837617b431367a791bf36b2e8e6abebbb09ebc81002cdf23016b32104fc8 SHA512 fd8391b5e3a77bd279d2e383b1fd6b87a376cb664cc5cee28e53bbd28dedbfc5c77edffd93420b0759c0eff1d2a61601e38f0571821d74a1a09fdb7f0bece529 WHIRLPOOL 51f45ca47cab09ae46306ce02eb0c68f2098780ba0ad56204cc9a9871d5b694a638d5b08fdd26ecd2d4f0eadc918166d56208875041ee17d1640ef154cf7c95f EBUILD mysql-workbench-5.2.44.ebuild 2483 SHA256 a67ffdf78ff20175bc5cfcf5b10932e41533ad178bee9bf0bd139ad331062239 SHA512 2936b9f51d3410a7e5a30656b12a29ffb5b18d23b6ab5fb62ee6937588e18da72b46eaaad6e500bc6ce0b15450a262c7a1163e4bbf210e8c2a8ea3b77563d633 WHIRLPOOL da4bfde9b0409f7e7eb9ba9ad58e88904256c5878b943f8645b27d6326cccbf6f38b7e256e747d1d59e4af940c41cdc4bcb20a19ad831e21493da96e6f2a6024 -MISC ChangeLog 12139 SHA256 f088aed811c6ab886b9c00a2f058ba1a920d706fb8b97911aaa53ae1a6abcd29 SHA512 1cce44a5b86687283642065dc85d40eccc3928038ab236999af894ab33a1c0b2505b00441fb6559c24b7b87d55cf800434ba0efffd19b59cd0b52f37a80bf13f WHIRLPOOL b471a158fc06bba8968a714f5f15e923a32cdd6099ebeaabb05b79927a2e7f297ef054fc618a4c5fef15adc4582e2ba407b8ade09eb53df0e6a410162c2e9032 +MISC ChangeLog 12431 SHA256 bcf14ab0f1e80297f18e7c8d0c9ae01b6ed339a82096012b8859b225b2fb02ab SHA512 5ba97b119df9f4a9afd6d8c72c25d8261b39e057d949e449d5ba9e6638ccec5e624dd2ff39cbfe5980f56b8e08a2f0166162c4ed3bd939ee508da63516c14468 WHIRLPOOL 9b6b23d10c2ba56b2c2efdb2c402a5e8cc9f8ce2b564164094f67d15c8a3254189622147aa2621d98a602873e0554b82b13d582bfe6a5054d5ca1a621f5e6556 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iF4EAREIAAYFAlCz1AgACgkQiIP6VqMIqNcbCAD/R5dhSEas39OsJ/H9KAZJKg6j +b8fkPZPiNgRTqu0oImsA/1Wsq75DDS/Bu9pCFFOBrNs/kyQ6cf3Yatd1aiZVx5ma +=4TWH +-----END PGP SIGNATURE----- diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch new file mode 100644 index 000000000000..2805ff03a864 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch @@ -0,0 +1,12 @@ +Index: mysql-workbench-gpl-5.2.44-src/modules/db.mysql.sqlparser/Makefile.am +=================================================================== +--- mysql-workbench-gpl-5.2.44-src.orig/modules/db.mysql.sqlparser/Makefile.am ++++ mysql-workbench-gpl-5.2.44-src/modules/db.mysql.sqlparser/Makefile.am +@@ -64,6 +64,7 @@ db_mysql_sqlparser_grt_la_SOURCES=\ + $(top_srcdir)/library/sql-parser/source/myx_statement_parser.cpp\ + $(top_srcdir)/library/sql-parser/source/myx_unicode_scanner.cpp\ + $(top_srcdir)/library/sql-parser/source/sql_parser_symbols.cpp\ ++ $(top_srcdir)/library/sql-parser/source/my_lib.cpp\ + $(top_srcdir)/library/sql-parser/source/my_messnc.cpp\ + $(top_srcdir)/library/sql-parser/source/my_static.cpp\ + $(top_srcdir)/library/sql-parser/source/my_strtoll10.cpp\ \ No newline at end of file diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.44-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.44-r1.ebuild new file mode 100644 index 000000000000..f55794faea03 --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-5.2.44-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.44-r1.ebuild,v 1.1 2012/11/26 20:41:43 graaff Exp $ + +EAPI=4 +GCONF_DEBUG="no" +PYTHON_DEPEND=2 + +inherit gnome2 eutils flag-o-matic python autotools + +MY_P="${PN}-gpl-${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 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc gnome-keyring nls static-libs" + +# Build system bundles an unreleased copy of dev-libs/antlr-c 3.4 so we +# can't depend on our own packaged version right now. + +CDEPEND="dev-db/sqlite:3 + >=x11-libs/gtk+-2.6:2 + dev-libs/glib:2 + gnome-base/libglade:2.0 + dev-libs/libsigc++:2 + dev-libs/boost + >=dev-cpp/ctemplate-0.95 + >=dev-libs/libxml2-2.6.2:2 + >=dev-cpp/glibmm-2.14:2 + >=dev-cpp/gtkmm-2.14:2.4 + dev-db/libiodbc + dev-libs/libzip + >=virtual/mysql-5.1 + dev-libs/libpcre + virtual/opengl + >=dev-lang/lua-5.1[deprecated] + x11-libs/pango + || ( sys-libs/e2fsprogs-libs + dev-libs/ossp-uuid ) + >=x11-libs/cairo-1.5.12[svg] + dev-python/pexpect + >=dev-python/paramiko-1.7.4 + doc? ( dev-python/pysqlite:2 ) + gnome-keyring? ( gnome-base/libgnome-keyring ) + nls? ( sys-devel/gettext )" +RDEPEND="${CDEPEND} + app-admin/sudo + >=sys-apps/net-tools-1.60_p20120127084908" +DEPEND="${CDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +pkg_setup() { + # Make sure we use Python 2 since the code is not compatible with 3. + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + # Remove hardcoded CXXFLAGS + sed -i -e 's/debug_flags="-ggdb3 /debug_flags="/' configure || die + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/Makefile.in ext/scintilla/gtk/Makefile.am || die + + # Remove bundled ctemplate version to make sure we use the system + # version, but leave a directory to avoid confusing configure, bug + # 357539. + rm -rf ext/ctemplate || die + mkdir -p ext/ctemplate/ctemplate-src || die + + epatch "${FILESDIR}"/${P}-my_lib.patch + + # Regenerate autotools files to work around broken libtool for + # antlr, bug 431756. + eautoreconf +} + +src_configure() { + econf \ + $(use_enable nls i18n) \ + $(use_enable debug) \ + $(use_enable static-libs static) +} + +src_install() { + emake install DESTDIR="${D}" || die + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad