[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtcore/, dev-qt/qtscript/, eclass/, dev-qt/qtdeclarative/

[Davide Pesavento]

commit:     108588c553f5cf84809626d8f104a1846e379059
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 00:24:24 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 00:24:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=108588c5

[Qt4] Handle installation of private headers in qt4-build-multilib.eclass

---
 dev-qt/qtcore/qtcore-4.8.9999.ebuild               |  8 ++------
 dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 14 --------------
 dev-qt/qtgui/qtgui-4.8.9999.ebuild                 | 13 -------------
 dev-qt/qtscript/qtscript-4.8.9999.ebuild           | 12 +-----------
 eclass/qt4-build-multilib.eclass                   | 12 +++++++++++-
 5 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index cbb48a3..5353b1a 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -99,14 +99,10 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
-
-	# install private headers
-	insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtCore/private
-	find "${S}"/src/corelib -type f -name "*_p.h" -exec doins '{}' +
-
 	qt4-build-multilib_src_install
 
+	emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
+
 	# List all the multilib libdirs
 	local libdirs=
 	for libdir in $(get_all_libdirs); do

diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index 8b1c7b1..38e3027 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -60,17 +60,3 @@ src_configure() {
 		$(qt_use webkit)"
 	qt4-build-multilib_src_configure
 }
-
-src_install() {
-	qt4-build-multilib_src_install
-
-	# install private headers
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		insinto "${QT4_LIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
-		# ran for the 2nd time, need it for the updated headers
-		fix_includes
-	else
-		insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDeclarative/private
-	fi
-	find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins '{}' +
-}

diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 2f90936..2f8209c 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -163,19 +163,6 @@ src_install() {
 
 	qt4-build-multilib_src_install
 
-	# install private headers
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		insinto "${QT4_LIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
-	else
-		insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtGui/private
-	fi
-	find "${S}"/src/gui -type f -name '*_p.h' -exec doins '{}' +
-
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		# rerun to get links to headers right
-		fix_includes
-	fi
-
 	# touch the available graphics systems
 	dodir /usr/share/qt4/graphicssystems
 	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die

diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
index f6796ce..33ef722 100644
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
@@ -21,9 +21,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT4_TARGET_DIRECTORIES="
-	src/script"
-
+QT4_TARGET_DIRECTORIES="src/script"
 QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 	include/Qt
 	include/QtCore
@@ -47,11 +45,3 @@ src_configure() {
 
 	qt4-build-multilib_src_configure
 }
-
-src_install() {
-	qt4-build-multilib_src_install
-
-	# install private headers
-	insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtScript/private
-	find "${S}"/src/script -type f -name "*_p.h" -exec doins '{}' +
-}

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index dd919f9..659b369 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -313,7 +313,7 @@ qt4-build-multilib_src_configure() {
 		-shared -fast -largefile -stl -verbose
 		-nomake examples -nomake demos"
 
-	# Convert tc-arch to the values supported by Qt
+	# convert tc-arch to the values supported by Qt
 	case $(tc-arch) in
 		amd64|x64-*)		  conf+=" -arch x86_64" ;;
 		ppc*-macos)		  conf+=" -arch ppc" ;;
@@ -438,6 +438,16 @@ qt4-build-multilib_src_install() {
 		popd >/dev/null || die
 	done
 
+	# install private headers of a few modules
+	if has ${PN} qtcore qtdeclarative qtgui qtscript; then
+		local moduledir=${PN#qt}
+		local modulename=Qt$(tr 'a-z' 'A-Z' <<< ${moduledir:0:1})${moduledir:1}
+		[[ ${moduledir} == core ]] && moduledir=corelib
+
+		insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private
+		find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die
+	fi
+
 	install_qconfigs
 	fix_library_files
 	fix_includes