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 18882138CF8 for ; Mon, 29 Jun 2015 00:27:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7234BE086C; Mon, 29 Jun 2015 00:27:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 087C5E086C for ; Mon, 29 Jun 2015 00:27:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03A98340885 for ; Mon, 29 Jun 2015 00:27:19 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2307) id 3F639748; Mon, 29 Jun 2015 00:27:17 +0000 (UTC) From: "Davide Pesavento (pesa)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pesa@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog qmake-utils.eclass X-VCS-Directories: eclass X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150629002717.3F639748@oystercatcher.gentoo.org> Date: Mon, 29 Jun 2015 00:27:17 +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: 0bd5c50b-802c-492a-b73d-4a5b2ed00166 X-Archives-Hash: 91f8dd8cfc7767b9c217e2156b26f0ab pesa 15/06/29 00:27:17 Modified: ChangeLog qmake-utils.eclass Log: Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc. Revision Changes Path 1.1694 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1693&r2=1.1694 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1693 retrieving revision 1.1694 diff -u -r1.1693 -r1.1694 --- ChangeLog 28 Jun 2015 13:33:48 -0000 1.1693 +++ ChangeLog 29 Jun 2015 00:27:17 -0000 1.1694 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28 13:33:48 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1694 2015/06/29 00:27:17 pesa Exp $ + + 29 Jun 2015; Davide Pesavento qmake-utils.eclass: + Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc. 28 Jun 2015; James Le Cuirot java-utils-2.eclass: The -source flag was added in 1.3 or 1.4 (not sure) and we have special code 1.12 eclass/qmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.11&r2=1.12 Index: qmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qmake-utils.eclass 22 Jun 2015 14:18:19 -0000 1.11 +++ qmake-utils.eclass 29 Jun 2015 00:27:17 -0000 1.12 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.11 2015/06/22 14:18:19 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.12 2015/06/29 00:27:17 pesa Exp $ # @ECLASS: qmake-utils.eclass # @MAINTAINER: @@ -22,6 +22,7 @@ # @FUNCTION: qt4_get_bindir # @DESCRIPTION: # Echoes the directory where Qt4 binaries are installed. +# EPREFIX is already prepended to the returned path. qt4_get_bindir() { has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= @@ -36,7 +37,6 @@ # @FUNCTION: qt4_get_headerdir # @DESCRIPTION: # Echoes the directory where Qt4 headers are installed. -# Does not take EPREFIX into account. qt4_get_headerdir() { echo /usr/include/qt4 } @@ -44,7 +44,6 @@ # @FUNCTION: qt4_get_libdir # @DESCRIPTION: # Echoes the directory where Qt4 libraries are installed. -# Does not take EPREFIX into account. qt4_get_libdir() { echo /usr/$(get_libdir)/qt4 } @@ -52,14 +51,21 @@ # @FUNCTION: qt4_get_mkspecsdir # @DESCRIPTION: # Echoes the directory where Qt4 mkspecs are installed. -# Does not take EPREFIX into account. qt4_get_mkspecsdir() { echo /usr/share/qt4/mkspecs } +# @FUNCTION: qt4_get_plugindir +# @DESCRIPTION: +# Echoes the directory where Qt4 plugins are installed. +qt4_get_plugindir() { + echo $(qt4_get_libdir)/plugins +} + # @FUNCTION: qt5_get_bindir # @DESCRIPTION: # Echoes the directory where Qt5 binaries are installed. +# EPREFIX is already prepended to the returned path. qt5_get_bindir() { has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= @@ -69,7 +75,6 @@ # @FUNCTION: qt5_get_headerdir # @DESCRIPTION: # Echoes the directory where Qt5 headers are installed. -# Does not take EPREFIX into account. qt5_get_headerdir() { echo /usr/include/qt5 } @@ -77,7 +82,6 @@ # @FUNCTION: qt5_get_libdir # @DESCRIPTION: # Echoes the directory where Qt5 libraries are installed. -# Does not take EPREFIX into account. qt5_get_libdir() { echo /usr/$(get_libdir) } @@ -85,11 +89,17 @@ # @FUNCTION: qt5_get_mkspecsdir # @DESCRIPTION: # Echoes the directory where Qt5 mkspecs are installed. -# Does not take EPREFIX into account. qt5_get_mkspecsdir() { echo $(qt5_get_libdir)/qt5/mkspecs } +# @FUNCTION: qt5_get_plugindir +# @DESCRIPTION: +# Echoes the directory where Qt5 plugins are installed. +qt5_get_plugindir() { + echo $(qt5_get_libdir)/qt5/plugins +} + # @FUNCTION: qmake-utils_find_pro_file # @RETURN: zero or one qmake .pro file names # @INTERNAL @@ -136,10 +146,10 @@ # @FUNCTION: eqmake4 # @USAGE: [project_file] [parameters to qmake] # @DESCRIPTION: -# Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will -# look for it in the current directory (${S}, non-recursively). If more -# than one project file are found, then ${PN}.pro is processed, provided -# that it exists. Otherwise eqmake4 fails. +# Wrapper for Qt4's qmake. If project_file is not specified, eqmake4 looks +# for one in the current directory (non-recursively). If multiple project +# files are found, then ${PN}.pro is used, if it exists, otherwise eqmake4 +# will not be able to continue. # # All other arguments are appended unmodified to qmake command line. #