diff options
Diffstat (limited to 'dev-db/mysql-workbench')
| -rw-r--r-- | dev-db/mysql-workbench/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/Manifest | 11 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch | 21 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/mysql-workbench-5.2.31.ebuild | 76 |
4 files changed, 112 insertions, 5 deletions
diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index 656597cc667a..b915f7d9e3bb 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.30 2010/12/15 18:01:03 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.31 2010/12/15 18:37:00 graaff Exp $ + +*mysql-workbench-5.2.31 (15 Dec 2010) + + 15 Dec 2010; Hans de Graaff <graaff@gentoo.org> + +mysql-workbench-5.2.31.ebuild, + +files/mysql-workbench-5.2.31-python-libs.patch: + Version bump. 15 Dec 2010; Hans de Graaff <graaff@gentoo.org> -mysql-workbench-5.2.28.ebuild, -mysql-workbench-5.2.29-r1.ebuild: diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 4a86da03074f..7a3d1509b6a3 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -3,16 +3,19 @@ Hash: SHA256 AUX mysql-workbench-5.2.17-as-needed-modules.patch 817 RMD160 07a91a62a364ead59597317738df334a8773338a SHA1 60c17b4337adef0257e3c9dc9facefcc5b6364fe SHA256 2b2503059228381ff16135bb6bf9987807661215b8b45f91acb7c6c156c5d7da AUX mysql-workbench-5.2.17-python-libs.patch 853 RMD160 b2ca54f9342c082395c5b5cac92e6247362531b9 SHA1 405a46f1d15f8d428dc3e6f0eada4d36cc00bb93 SHA256 8625ec48e17d3871d37dce559118868edc840a235a0010b47ea4f1afb277872b +AUX mysql-workbench-5.2.31-python-libs.patch 873 RMD160 f1af6477590b37ec78894dca991f8ede3fcf0bac SHA1 2bf2317c32fb365fc82e3346d3b4773426e0275d SHA256 7ddeb3cfd33c0a1460b3271f2fb3eb7b8cfa40496994b9288009bedb2cc3740a DIST mysql-workbench-gpl-5.2.30-src.tar.gz 21085933 RMD160 186600341e475619249f3ab2686adab3ee07fbed SHA1 28316b3a401903055a44982bce56bbfe39a8f34c SHA256 e1e0599ab70527be9396144033f89709a82e93fb70a8d3407d8c897d0fb69036 +DIST mysql-workbench-gpl-5.2.31-src.tar.gz 17971254 RMD160 14d9377eb34a26b2f0331be810ff9cb90d43e6cb SHA1 34682612b6f67391774e9ba20b09f3af899a002b SHA256 520cc9301dda288a574284d25c2bda007aff91d86a0f5c828bab179bc488ad85 DIST mysql-workbench-oss-5.2.19.tar.gz 15934534 RMD160 ede7829c1b58cde7f3acf5cd03a35c722c5c1363 SHA1 ad464ba60cea282e921c5964f51e7fea9154f8af SHA256 81700fb09cccf5f6e7fbda349f126dc321ddedff802ba5ee094d275cd3eb8920 EBUILD mysql-workbench-5.2.19.ebuild 1452 RMD160 14fdff36696839f64a36996af8fd9441720ae27c SHA1 0d02cef7b9ce1db808e157fc8d1192acc0999d75 SHA256 9a0dbfb6c82fdae7e4fbab236583037d08c4874a3a0ae9a7091c25a5b6d9e5f5 EBUILD mysql-workbench-5.2.30.ebuild 1866 RMD160 7b9d4945dea60c5bc0116ee04090d1a2a6a448ad SHA1 c9bbf2b8cd9a56c29dec1264c0790d7c5d5e2151 SHA256 fbf0f380dc59c93f27cc70c7482566a862e652cb3ee9f808f29ae068d753c46c -MISC ChangeLog 6046 RMD160 7e05513dafdf1d104877d8db0a5fa94c59bd61a7 SHA1 d999e78895ff3058ed36e53b5df21cf921fdf256 SHA256 f495191dcb0b297bbb3d219de5bf3fd5273dfe22eea3045d400f7635d68c357a +EBUILD mysql-workbench-5.2.31.ebuild 1866 RMD160 76611c6f49c8be8c812420bfc535d1d35f357868 SHA1 faf67969579424cf8397cb2e8bbbd7a43eecb9c9 SHA256 74d0f1ed4240e3c706a86adbcdda6d0556b6d8dc2ba4fb72ad97422588839c0e +MISC ChangeLog 6237 RMD160 08e4d30dbb2ef2a2b3f1c15ee6b31b0e673cfff1 SHA1 82c40c6f51e4206de28218d259a3828f8d7414b0 SHA256 93d77765d26ca04d5ce1320547bfe7ede18288b6b606b927044e0d8700603d30 MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iF4EAREIAAYFAk0JAmsACgkQppaJjIURYXLQmAD/UMysCppcki+Anb/TuChdIO76 -2FRSqHKU3/gVD2rSUDAA/jfwapHZF+sTbmhE7ubNEjWLSvJQDpANFnQP+0QWxcgX -=33wz +iF4EAREIAAYFAk0JCtIACgkQppaJjIURYXLrdAEAmJCm/hbLjrB3F2THxkTtUlXJ +RbFTzHHZP91DLWitbVcA/0zenQxMgr8B7G3/rg3SL8wU9+Wu+YdCcKg5pb22pJi5 +=YUfJ -----END PGP SIGNATURE----- diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch new file mode 100644 index 000000000000..5e78761cd8a5 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch @@ -0,0 +1,21 @@ +Use a simpler check for Python's libs that returns an actual linker +invocation (e.g. -lpython2.6) instead of the .so file. This fixes the +case with forced as-needed where the .so gets re-ordered to the front +during link. + +--- configure.in.~1~ 2010-12-08 03:20:38.000000000 +0100 ++++ configure.in 2010-12-15 19:10:11.716940123 +0100 +@@ -280,12 +280,7 @@ + AC_CHECK_PROG(PYTHON27, python2.7, [yes]) + # Python headers + AC_MSG_CHECKING(for Python libraries) +-PYTHON_LIBS=[$(python -c "from distutils import sysconfig +-import os +-cfg=sysconfig.get_config_vars() +-lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY']) +-if os.path.exists(lib): +- print lib")] ++PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')] + PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig + print sysconfig.get_python_inc()")] + PYTHON_CFLAGS="-I$PYTHON_CFLAGS" diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.31.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.31.ebuild new file mode 100644 index 000000000000..d7b43116ce0f --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-5.2.31.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2010 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.31.ebuild,v 1.1 2010/12/15 18:37:00 graaff Exp $ + +EAPI="3" +GCONF_DEBUG="no" + +inherit gnome2 eutils flag-o-matic 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 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc nls readline static-libs" + +CDEPEND="dev-db/sqlite:3 + >=x11-libs/gtk+-2.6 + 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 + >=dev-cpp/glibmm-2.14 + >=dev-cpp/gtkmm-2.14 + dev-libs/libzip + >=virtual/mysql-5.1 + dev-libs/libpcre + virtual/opengl + >=dev-lang/lua-5.1[deprecated] + gnome-base/libgnome + x11-libs/pango + || ( sys-libs/e2fsprogs-libs + dev-libs/ossp-uuid ) + >=x11-libs/cairo-1.5.12[svg] + dev-python/pexpect + dev-python/paramiko + doc? ( dev-python/pysqlite:2 ) + nls? ( sys-devel/gettext ) + readline? ( sys-libs/readline )" +RDEPEND="${CDEPEND} + app-admin/sudo + sys-apps/net-tools" +DEPEND="${CDEPEND} + dev-util/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +src_prepare() { + # ifconfig isn't in the normal path + sed -i -e 's:ifconfig:/sbin/ifconfig:' plugins/wb.admin/backend/wb_server_control.py || die + + epatch "${FILESDIR}/${PN}-5.2.31-python-libs.patch" + eautoreconf + + # Remove bundled ctemplate version to make sure we use the system version. + rm -rf ext/ctemplate || die +} + +src_configure() { + econf \ + $(use_enable nls i18n) \ + $(use_enable readline readline) \ + $(use_enable debug) \ + $(use_enable static-libs static) +} + +src_install() { + emake install DESTDIR="${D}" || die + find "${ED}" -name '*.la' -delete || die +} |