change install targets to simply subtargets, per bug #157997

Package-Manager: portage-2.1.2_rc3-r8

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 725442e0826a4997f09c6fe6a61f83eedd794aaa..7e99ee7fa40f479c274eac5c97f7143f847e3338 100644 (file)
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.404 2006/12/19 19:11:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.405 2006/12/21 13:21:10 caleb Exp $
+
+  21 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild:
+  change install targets to simply subtargets, per bug #157997
 
   19 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.4-r2.ebuild,
   qt-4.2.1.ebuild, qt-4.2.2.ebuild:

diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild
index d5139c201db55ff694304c6c2742c99d86627d96..8ec37be5dc8f658be3ae53810db0ed8f1749c39b 100644 (file)
--- a/x11-libs/qt/qt-4.2.2.ebuild
+++ b/x11-libs/qt/qt-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.9 2006/12/19 19:11:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.10 2006/12/21 13:21:10 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -205,12 +205,7 @@ src_install() {
        export PATH="${S}/bin:${PATH}"
        export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
-       make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
-
-       if use examples; then
-               make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
-       fi
-
+       make INSTALL_ROOT=${D} install_subtargets || die
        make INSTALL_ROOT=${D} install_qmake || die
        make INSTALL_ROOT=${D} install_mkspecs || die