summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-02-02 15:37:39 +0000
committerJohannes Huber <johu@gentoo.org>2012-02-02 15:37:39 +0000
commite00e84ac282284354a03f768329f0aefbd5957b9 (patch)
tree23dcefd0fd1faecd0d30bf1763f4d794dbb369ea /dev-util/qdevelop
parentppc64 stable wrt #393553 (diff)
downloadhistorical-e00e84ac282284354a03f768329f0aefbd5957b9.tar.gz
historical-e00e84ac282284354a03f768329f0aefbd5957b9.tar.bz2
historical-e00e84ac282284354a03f768329f0aefbd5957b9.zip
Fix build with multilib-strictm thanks ago.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'dev-util/qdevelop')
-rw-r--r--dev-util/qdevelop/ChangeLog5
-rw-r--r--dev-util/qdevelop/Manifest18
-rw-r--r--dev-util/qdevelop/qdevelop-0.28.ebuild7
3 files changed, 19 insertions, 11 deletions
diff --git a/dev-util/qdevelop/ChangeLog b/dev-util/qdevelop/ChangeLog
index beb647444efa..7a34a672a3a2 100644
--- a/dev-util/qdevelop/ChangeLog
+++ b/dev-util/qdevelop/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/qdevelop
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/ChangeLog,v 1.11 2012/02/02 14:12:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/ChangeLog,v 1.12 2012/02/02 15:37:39 johu Exp $
+
+ 02 Feb 2012; Johannes Huber <johu@gentoo.org> qdevelop-0.28.ebuild:
+ Fix build with multilib-strictm thanks ago.
02 Feb 2012; Johannes Huber <johu@gentoo.org> qdevelop-0.28.ebuild:
EAPI 4
diff --git a/dev-util/qdevelop/Manifest b/dev-util/qdevelop/Manifest
index 7dfd866b9c5c..1b45e8bd387d 100644
--- a/dev-util/qdevelop/Manifest
+++ b/dev-util/qdevelop/Manifest
@@ -7,17 +7,17 @@ AUX qdevelop.desktop 335 RMD160 3b503ed6b08fa16249d1db396fefecb3fbde11c4 SHA1 ae
DIST qdevelop-v0.28.tar.gz 1660363 RMD160 43fe7cf315291ae2061ca5e4b542e5259e6dbc4a SHA1 1980ed021770e4f976dd20ac5e85b7c8dde6fee0 SHA256 d9772358078f62edb6591d3d7ca7515c52f256eb6becf82cc5fcde4228ac7d9e
DIST qdevelop_0.25.zip 1094821 RMD160 b90eef791dd5ac5934fe12ee96073852a4a4aca2 SHA1 1a7186f8836aa8183dbed409ba8f282e8cf34835 SHA256 76a954e01a981066a4d680b831761284bb588a50f7cb18c6cf21680b5c5a2ecd
EBUILD qdevelop-0.25-r1.ebuild 900 RMD160 e72473545af2155c0e04e9c84f30f10830fd4296 SHA1 10aba7b771f5d0a858f98aa390b8a0f99a5e218b SHA256 163518f3c40e3d6fabcc72670f1b1cb1290287e7cc817e92a53a75f7d3362cd7
-EBUILD qdevelop-0.28.ebuild 1116 RMD160 77c12bf169c097536b4d735d089667a0b25b1d95 SHA1 0bc0dff781116490792937ffd27f315edfd1fbe7 SHA256 998d837c6a436afb0f16050c93bd303c606f21d0ebfc013d5cfb7fb4ae1ac469
-MISC ChangeLog 3037 RMD160 3961e78c43a2933e25ef757038fae5c98182da62 SHA1 a11e5b9d1240cefd65b264a9091df4ea35e338d7 SHA256 50c1e4dd5d4988891d62f1d29e02bca25a48cadfec9b898b6d5ab5558f8af486
+EBUILD qdevelop-0.28.ebuild 1286 RMD160 d07582b74158003a320d46015adf1c7d189a8e1c SHA1 311c8fa41ea11e9885e20a6b955308a78969da31 SHA256 6ab0d007a4ae3b8e4c61a41f53c817c53f52ec6876f663d4273694c9da8aff76
+MISC ChangeLog 3154 RMD160 6dd61a1094ea1b0bbe9a1de8275fa582784f94ac SHA1 19b4b4e9a637dd1d90f1478251f4cb13fe2f5100 SHA256 56581de45a2c831c9e6573343f5301a43ebdbee908e80893894e9f6608c34cc4
MISC metadata.xml 329 RMD160 2d2115e9a62c19f8a380c0b9f1316ef30a7a55fe SHA1 af99357b707b0763f662ef973a39bcbd30053e54 SHA256 9d06e2da332a6a08982c67199e34d05699de9b3b30d6537d40e015caa00c320c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPKpmWAAoJEO+t9ga+3I3agn0H/AkbwHF/DyB40xWujEGZNC0E
-aqBdas6dWte1//X43dXsqqjB0UzBtYvQ5h/cHlSFjuqb/b5M/x7c4uBfOnBnOwXm
-K00gmCh5h6GUO53cMtwypWpcT2+xOkYYi9X40CoBHu57YpXQr0fQj4NqetWrqNnW
-bq5smjXI6Oa5BoI49K0CFrGMV9NoeqXfdNGqK97KLlR3B16G9d+uq/zHBEHTTY7s
-IafNKtzxjblCofbG5Rn9mydROm50DAfNO4VIBwz1MntXxfkkbU+j6yyyTQdF2gvJ
-WbKcLI2Q4RNChqwxahcrGBNW0zkuJqe60Nd8DQye33MXiyhk/RrNrB5WUsZDr0E=
-=uEnb
+iQEcBAEBCgAGBQJPKq2HAAoJEO+t9ga+3I3aIlMH/1VpNTzPFIWerqgUItgyYq3V
+f29tdCNW3sItKSeLHMQs4w+xE3d0MR+qDl7NtgI97zaIVVRJfMUxh0cnenhvz9UC
+JrtQHKbjfoUASw0IsL8BD0/keHTJj+jVmVLrUjRIYXyu27yGFSTSkisGp1Q3ww4G
+PaDCDqfOkjIz0Xnxdqh6wu2c5xqalYCcooEns/Mwbn0SKorxLUaOC7HGcw0lW1gh
+oyZVNY8JTykHDNn2jdZMt7oje5DvZMf7NZFlexPmHpdgJG0r+HTFsS3wHQ9dgdha
+z8oM9stUvoVp92J/dYRDQDKfkMe8Ehutvs7k+svcbSziDoAlH2HNr6Zmu3n8OF8=
+=Bd+H
-----END PGP SIGNATURE-----
diff --git a/dev-util/qdevelop/qdevelop-0.28.ebuild b/dev-util/qdevelop/qdevelop-0.28.ebuild
index e1f02e0a3714..798eaa0a548b 100644
--- a/dev-util/qdevelop/qdevelop-0.28.ebuild
+++ b/dev-util/qdevelop/qdevelop-0.28.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.28.ebuild,v 1.3 2012/02/02 14:12:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qdevelop/qdevelop-0.28.ebuild,v 1.4 2012/02/02 15:37:39 johu Exp $
EAPI=4
@@ -26,6 +26,11 @@ PATCHES=( "${FILESDIR}"/${P}-qt-4.7_fix.patch )
src_configure() {
mycmakeargs=( "-DAUTOPLUGINS=$(use plugins && echo 1 || echo 0)" )
+
+ sed -e "s#/lib/pkgconfig#/$(get_libdir)/pkgconfig#" \
+ -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
+ -i CMakeLists.txt || die "sed fixing multilib failed"
+
cmake-utils_src_configure
}