summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-03-18 13:34:49 +0000
committerHans de Graaff <graaff@gentoo.org>2011-03-18 13:34:49 +0000
commit09b86dd1f508869de14d5ebef4195fdbd25fb1ec (patch)
tree3b51c237debcad8389ff8e8dc63c27604ab29bf9 /dev-db
parentx86 stable per bug 356489 (diff)
downloadhistorical-09b86dd1f508869de14d5ebef4195fdbd25fb1ec.tar.gz
historical-09b86dd1f508869de14d5ebef4195fdbd25fb1ec.tar.bz2
historical-09b86dd1f508869de14d5ebef4195fdbd25fb1ec.zip
Tweak ctemplate removal to avoid endless configure loops, bug 357539.
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql-workbench/ChangeLog6
-rw-r--r--dev-db/mysql-workbench/Manifest10
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild7
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index e6b25860e477..54c7e425ac6b 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.34 2011/03/14 18:22:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.35 2011/03/18 13:34:49 graaff Exp $
+
+ 18 Mar 2011; Hans de Graaff <graaff@gentoo.org>
+ mysql-workbench-5.2.33.ebuild:
+ Tweak ctemplate removal to avoid endless configure loops, bug 357539.
*mysql-workbench-5.2.33 (14 Mar 2011)
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 34ce000a54d0..bd6bc7456b82 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -8,13 +8,13 @@ AUX mysql-workbench-5.2.33-cpp.patch 544 RMD160 f8c824dae64e1dd205e4c34b7ece25f9
DIST mysql-workbench-gpl-5.2.31-src.tar.gz 17971254 RMD160 14d9377eb34a26b2f0331be810ff9cb90d43e6cb SHA1 34682612b6f67391774e9ba20b09f3af899a002b SHA256 520cc9301dda288a574284d25c2bda007aff91d86a0f5c828bab179bc488ad85
DIST mysql-workbench-gpl-5.2.33-src.tar.gz 17875492 RMD160 37d00323e72c1bd552470a03d39689daeb2b1746 SHA1 5448be93a39a062777385ecd09c8ce3f2f000214 SHA256 acd1b79e6fc90642c7d58a2d80f525c311b470749d45f7d5f6a33a0efe8c71a4
EBUILD mysql-workbench-5.2.31.ebuild 1868 RMD160 507968846f4baf2e22d8d718e7d706718f8e560a SHA1 8e968884c93f4010b71bad953a66b8f6cbe1c712 SHA256 e2b23a643c88c88c0e2e769c120f729203bd9f98664c0698bbf6e7ea7535d883
-EBUILD mysql-workbench-5.2.33.ebuild 1905 RMD160 1217c346bf0e3513618079f62afa9f9836c0ffbb SHA1 966a1b557f5146535a1d308034e74be007b4b266 SHA256 5be012cc1e9ad1e4eaf3ec563a0a4b7cf918c1e8022f51fa3de2424481aff62a
-MISC ChangeLog 6673 RMD160 0e25da04ee5929ec15c15a23b1612ba18f64931d SHA1 d6122ab6e3cd015003c266c6d3d7363d97fa7b14 SHA256 c6e2293f88151bb729839469bc4f6550de3c211b99debe32d87aa23ba232bc8e
+EBUILD mysql-workbench-5.2.33.ebuild 2020 RMD160 c4d68adca6f34414880b7e455acdc50f917c86a9 SHA1 df8c498fe280a7df5576ae259d2868072e395703 SHA256 31a1bd6a7f4d59ec2060836147f3afd91a7b27cdf66f2b2e14b5f4c77100638c
+MISC ChangeLog 6829 RMD160 60dad6c65d8d63447414bd2cf8dc6dc41ed0fefd SHA1 6b17055475992438fe55825af23fb81f927c19cb SHA256 c8282b5c9f9335451958125d54c21962355ce5767eee9609071d6e9921700ff2
MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk1+XOMACgkQrnu0mw69JkoikQD/YjYgs3dUDq0MRqcVg0lfWzTC
-TWSSLZDjGztLlFUx/70A/3IlbCUmLXLp7Sq6b2so2edLDWdbWaW5eLNFhZoEqXvR
-=QwYD
+iF4EAREIAAYFAk2DX4QACgkQrnu0mw69Jkp9UgD+PsFa5oveumoltdihxsESojuy
+1YkV7M/RF7tKp9zJtNAA/3z38Pb/8HAVg8+VlqQd94GJow8a1dWJWP6O3ei/3xBE
+=1AiV
-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild
index 95b56972a452..a57daf0714c0 100644
--- a/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.33.ebuild,v 1.1 2011/03/14 18:22:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild,v 1.2 2011/03/18 13:34:49 graaff Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -59,8 +59,11 @@ src_prepare() {
epatch "${FILESDIR}/${P}-cpp.patch"
eautoreconf
- # Remove bundled ctemplate version to make sure we use the system version.
+ # 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
}
src_configure() {