Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.

2 files changed, 25 insertions, 12 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7491568a6f5e..796391514c11 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -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 <pesa@gentoo.org> qmake-utils.eclass:
+  Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
 
   28 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
   The -source flag was added in 1.3 or 1.4 (not sure) and we have special code
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 4daede66aadc..4b4057db0a91 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -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 @@ inherit eutils multilib toolchain-funcs
 # @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 @@ qt4_get_bindir() {
 # @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 @@ qt4_get_headerdir() {
 # @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 @@ qt4_get_libdir() {
 # @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 @@ qt5_get_bindir() {
 # @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 @@ qt5_get_headerdir() {
 # @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 @@ qt5_get_libdir() {
 # @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 @@ qmake-utils_find_pro_file() {
 # @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.
 #