Address compile problems introduced by cmake reconfiguration, which was

  added for gnome USE-flag implementation.  Out-of-tree cmake build seems to be
  broken, so force in-tree cmake build (bug #234725).
Package-Manager: portage-2.1.4.4

3 files changed, 13 insertions, 7 deletions

diff --git a/x11-themes/gtk-engines-qt/ChangeLog b/x11-themes/gtk-engines-qt/ChangeLog
index 9085e93304a3..462bcce7d135 100644
--- a/x11-themes/gtk-engines-qt/ChangeLog
+++ b/x11-themes/gtk-engines-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/gtk-engines-qt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.39 2008/08/14 06:53:44 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.40 2008/08/23 19:41:56 wormo Exp $
+
+  23 Aug 2008; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  gtk-engines-qt-0.8-r3.ebuild:
+  Address compile problems introduced by cmake reconfiguration (which was
+  added for gnome USE-flag implementation): out-of-tree cmake build seems 
+  to be broken, so force in-tree cmake build (bug #234725).
 
 *gtk-engines-qt-0.8-r3 (14 Aug 2008)
 
diff --git a/x11-themes/gtk-engines-qt/Manifest b/x11-themes/gtk-engines-qt/Manifest
index 806f6093ea52..e88e031d6a70 100644
--- a/x11-themes/gtk-engines-qt/Manifest
+++ b/x11-themes/gtk-engines-qt/Manifest
@@ -3,7 +3,7 @@ AUX gtk-engines-qt-0.8-optional-bonobo.patch 1628 RMD160 17f7add642d7220d69ee5fe
 DIST gtk-qt-engine-0.8.tar.bz2 59472 RMD160 05a825ff51180ee70a85338a970d40509aae16eb SHA1 0d22143068dda220fd6f4c98a3f750114f282803 SHA256 6658bdbd3f2120d34f5c59b5bc3cfed5ef83a2aa8572d775483aa304396b0d45
 EBUILD gtk-engines-qt-0.8-r1.ebuild 953 RMD160 1ac58225a521df48eb9bd2d9be6ad5a8f6d62a06 SHA1 0dae1deb2f8c732245bb6b007f720479a17b9571 SHA256 2cb89ac95d306a0c000f51fbcb317b88f99346844fda2b8a1cffcdbfebdf2af4
 EBUILD gtk-engines-qt-0.8-r2.ebuild 1287 RMD160 231f0b4b42c9d476ad2859576ec4e63b5b17b8f5 SHA1 dfbcd5b6eee59138217ff199b0522d15c5682b9f SHA256 bb615f93872c44dd0f70eb2ec67de0c15e69e26804408fd032e21cfb9e930a5c
-EBUILD gtk-engines-qt-0.8-r3.ebuild 1613 RMD160 ecd7d71edee36347da366ca4782f52e9b3340765 SHA1 b00a2a2b146a5c1008c61b97f1d238dfdbab047f SHA256 15a0b73bec90ae01b21b39e5e2ba1cf81dda9313af8b230d7514eab66a0faa33
+EBUILD gtk-engines-qt-0.8-r3.ebuild 1585 RMD160 b0128ed2b4030a1fe32a0c6264a63f5f3f97d16f SHA1 6fb9d325930c4f0c792dc60140972ad8667b5303 SHA256 e857874576286ee7a328e7eb5d5d60bee5a9d385a65b42f485c5a50a5b6c4740
 EBUILD gtk-engines-qt-0.8.ebuild 830 RMD160 e71e19ea22858f20b52964860ebf940085b91bef SHA1 e8793af15aa7af33cb0531716e8390ea0ecf5733 SHA256 0288af99afe667994898d24fbb238376de3c57eacb5374582eef4c18b0e83804
-MISC ChangeLog 8133 RMD160 7e84c0ba5879a71e6775aec8f912c647ac398a1b SHA1 006b642f96fd164b5b9ad858fc7b18ae38f8632b SHA256 f46ffffcc8ce4e37e987b1b2532799a0ae8ac5c9735088b989e05c71ff719c72
+MISC ChangeLog 8435 RMD160 31f647f45a6739185fe34527719059ffc62ab4c9 SHA1 991b42015378264373c570eb0d15de3f6d6f8205 SHA256 5a735230b63c599b82b2ec4e32fbe5a4f69b527f3ad6558926e4cf6997316b65
 MISC metadata.xml 358 RMD160 a974be69f21b6c4707abe47979f6035f78c470b4 SHA1 1ee15b2388687d2961afaa4f48a272e0bc12cc60 SHA256 cf8354c730ec7b5365cbfbd8e16c07fca083bec021d68e56acb32c2ca389a2fe
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild
index 5e9d4e7ae1c9..028a010a8e13 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild,v 1.1 2008/08/14 06:53:44 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild,v 1.2 2008/08/23 19:41:56 wormo Exp $
 
 ARTS_REQUIRED="never"
 
@@ -41,18 +41,18 @@ src_compile() {
 	# enable or disable bonobo support based on gnome useflag (bug #206568)
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_enable gnome BONOBO)"
+	CMAKE_IN_SOURCE_BUILD=1
 	cmake-utils_src_compile
 }
 
 src_install() {
 	kde_src_install
-	mv "${D}"/usr/local/share/applications "${D}"/usr/share/ || die
 
 	# only install requested translations (bug #205940)
 	strip-linguas ${LANGS}
+	mv "${D}"/usr/share/locale "${T}"/all-locales || die
 	dodir /usr/share/locale
 	for lang in ${LINGUAS}; do
-		mv "${D}"/usr/local/share/locale/$lang "${D}"/usr/share/locale || die
+		mv "${T}"/all-locales/$lang "${D}"/usr/share/locale || die
 	done
-	rm -rf "${D}"/usr/local/share
 }