From da2bedb0fc21816ebaca9c5903bd20247c510567 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Thu, 21 Dec 2006 13:21:10 +0000 Subject: [PATCH] change install targets to simply subtargets, per bug #157997 Package-Manager: portage-2.1.2_rc3-r8 --- x11-libs/qt/ChangeLog | 5 ++++- x11-libs/qt/qt-4.2.2.ebuild | 9 ++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 725442e0826a..7e99ee7fa40f 100644 --- 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 qt-4.2.2.ebuild: + change install targets to simply subtargets, per bug #157997 19 Dec 2006; Caleb Tennis 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 d5139c201db5..8ec37be5dc8f 100644 --- 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 -- 2.26.2