summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-07-08 14:32:48 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-07-08 14:32:48 +0000
commit28de21128d3b1a4d3c108ee72183b571ccec7012 (patch)
treed1cdb6c8cf58c9ba38c0ac65571e9c2190a5a817 /dev-util
parentUse PYTHON_DEPEND instead of NEED_PYTHON. (diff)
downloadhistorical-28de21128d3b1a4d3c108ee72183b571ccec7012.tar.gz
historical-28de21128d3b1a4d3c108ee72183b571ccec7012.tar.bz2
historical-28de21128d3b1a4d3c108ee72183b571ccec7012.zip
Disable qt4projectmanager when designer use flag is disabled. Fixes bug #327477
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/qt-creator/ChangeLog7
-rw-r--r--dev-util/qt-creator/Manifest14
-rw-r--r--dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild7
3 files changed, 14 insertions, 14 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index f7092beee1df..79ba69a7ec02 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/qt-creator
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.51 2010/06/24 20:45:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.52 2010/07/08 14:32:48 hwoarang Exp $
+
+ 08 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+ qt-creator-1.3.1-r1.ebuild:
+ Disable qt4projectmanager when designer use flag is disabled. Fixes bug
+ #327477
24 Jun 2010; Pacho Ramos <pacho@gentoo.org> qt-creator-1.3.1-r1.ebuild:
stable amd64, bug 325041
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index e3a0cda15270..840fea241be5 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX docs_gen.patch 603 RMD160 9711ddb1c59e8ddd1ad17ba34f89c8e4c89b4504 SHA1 83cd745baabd1545a1079c59edef6279b254074a SHA256 7428155e6f09201d60f308c3934153aa5fa5b25296a96d86dad80354dc8e3b93
DIST qt-creator-1.2.1-src.zip 8631249 RMD160 6aea12a39bd5827422afa6e02cfcad2174dc6582 SHA1 41d10717a83d3b7de7bc5218a35a38f25408a8d6 SHA256 9b955421050c1a9dacefa1ed888a971bffa86258a18598a1a1b297e5d8d23cbf
DIST qt-creator-1.3.1-src.tar.gz 10623442 RMD160 37bebc4566cfef85d5a7901c1efd8b917b3a0584 SHA1 49b61c3e8010d94d6d595fef38d3da737b26cd80 SHA256 b738a327b64276c5d8c0a01cbb840e316a657635514bc8e41c6cfa1c77e691ed
EBUILD qt-creator-1.2.1.ebuild 2882 RMD160 cd9ceb5f6e7adf436d2f8566f3ad39381eba3edf SHA1 a3fc355b3328f7326eb7e26f67960f1f255e2bbb SHA256 a765d69a3fd244080032ab29722d1056fd03b6ae34593617d414c6fe03dae28f
-EBUILD qt-creator-1.3.1-r1.ebuild 3332 RMD160 78e2d48e86ba0a7c2c6ea84518b1757ba3e853cb SHA1 589e13163be5a71822b68f2ab7c9fea7bcc3808a SHA256 3150a234ff0c15576837a7cca13af1c79043bf1735878e17e1b2c5ecfa70c21f
-MISC ChangeLog 7401 RMD160 06dc952ca5ba5421d02089a42ce3a886730078dc SHA1 da18e5de34246792b6bc3967e07db920af7c3358 SHA256 11b0ce867beb207e2f24b240b504bfba19a9f14995a3b17e9d351160b53fbaa6
+EBUILD qt-creator-1.3.1-r1.ebuild 3519 RMD160 70857aa63fe995daca1967e6dd5313efeb2b4c73 SHA1 906f9319b8d711bb03228b2c718f42239b7de611 SHA256 7bfcdf5678668af350dfe0fd99e7d2ee8c878c36e2cc04e602c6ab298f2c8a03
+MISC ChangeLog 7572 RMD160 fc4ca7ecd7d56ed71917b85141d0780e73c38811 SHA1 ea0e60376723900b76e169e961ac5c6d76779d48 SHA256 e24ad1a019ff7f6e7ddd27bd371a52ced01204b8743531172a6724a958fde9bf
MISC metadata.xml 1034 RMD160 ff0e30c74188440729f8a7eb6ac4edb78a58261e SHA1 96e28085ccb41904e21e54ef0a3e160bf13d0acc SHA256 9fad95b6ee7de9a1136b6e780084f2185d3fe5ce111f5d605cea5e0292da7878
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwjw+IACgkQCaWpQKGI+9TOXQCdHm6QLRVKuYG5U6nTjUf4cAT/
-ULkAmwZAC7/XkgcrWAlkQ5+qXccH/Aw3
-=rxDn
------END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild b/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild
index 471db67d3565..7b5cf6c1c88f 100644
--- a/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild
+++ b/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild,v 1.3 2010/06/24 20:45:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild,v 1.4 2010/07/08 14:32:48 hwoarang Exp $
EAPI="2"
LANGS="de es fr it ja pl ru sl"
@@ -59,6 +59,11 @@ src_prepare() {
sed -i "/plugin_qmlprojectmanager/s:^:#:" src/plugins/plugins.pro \
|| die "Failed to disable qmlprojectmanager plugin"
fi
+ if [[ ${plugin} == "designer" ]]; then
+ sed -i "/plugin_qt4projectmanager/s:^:#:" \
+ src/plugins/plugins.pro \
+ || die "Failed to disable qt4projectmanager plugin"
+ fi
sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
|| die "Failed to disable ${plugin} plugin"
fi