From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 86AFC1381F3 for ; Mon, 12 Nov 2012 04:08:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 306F021C0AE; Mon, 12 Nov 2012 04:07:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AE1F21C0AC for ; Mon, 12 Nov 2012 04:07:45 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6067833D9D4 for ; Mon, 12 Nov 2012 04:07:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 974B4E5449 for ; Mon, 12 Nov 2012 04:07:41 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1352693089.fb25240775cb349ff6ea3a11e6a5bb8767acad26.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: fb25240775cb349ff6ea3a11e6a5bb8767acad26 X-VCS-Branch: master Date: Mon, 12 Nov 2012 04:07:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a129a5d0-39fd-4b6b-9028-5156a6ea90bb X-Archives-Hash: 3b1e9aec709318bece527a9472084d61 commit: fb25240775cb349ff6ea3a11e6a5bb8767acad26 Author: Davide Pesavento gmail com> AuthorDate: Mon Nov 12 04:04:49 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Nov 12 04:04:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fb252407 [qt5-build.eclass] Define archdatadir and put bindir under it. Move libs to /usr/lib{,64}. --- eclass/qt5-build.eclass | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 9c52415..95ae1e7 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -292,12 +292,6 @@ qt5-build_src_install() { "${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \ "${D}${QT5_HEADERDIR}"/Qt/qconfig.h \ || die "sed failed (qconfig.h)" - - # install env.d file for custom LDPATH - cat <<-EOF > "${T}"/55qt5 - LDPATH="${QT5_LIBDIR}" - EOF - doenvd "${T}"/55qt5 fi qt5_install_module_qconfigs @@ -344,11 +338,12 @@ qt_use() { qt5_prepare_env() { # setup installation directories QT5_PREFIX=${EPREFIX}/usr - QT5_BINDIR=${QT5_PREFIX}/qt5/bin # FIXME QT5_HEADERDIR=${QT5_PREFIX}/include/qt5 - QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)/qt5 - QT5_PLUGINDIR=${QT5_LIBDIR}/plugins - QT5_IMPORTDIR=${QT5_LIBDIR}/imports + QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir) + QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5 + QT5_BINDIR=${QT5_ARCHDATADIR}/bin + QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins + QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports QT5_DATADIR=${QT5_PREFIX}/share/qt5 QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations @@ -384,6 +379,7 @@ qt5_base_configure() { -bindir "${QT5_BINDIR}" -headerdir "${QT5_HEADERDIR}" -libdir "${QT5_LIBDIR}" + -archdatadir "${QT5_ARCHDATADIR}" -plugindir "${QT5_PLUGINDIR}" -importdir "${QT5_IMPORTDIR}" -datadir "${QT5_DATADIR}"