[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/

[Davide Pesavento]

commit:     242e23f1f5e8139c644fa60ef100f98a8d8f47d7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 18:14:17 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 23 18:14:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=242e23f1

[dev-qt/qtcore:4] Use eclass's src_install rather than internal functions.

So that installation paths are respected.

Package-Manager: portage-2.2.10

---
 dev-qt/qtcore/qtcore-4.8.9999.ebuild | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 4c4f5a3..85a3a37 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -105,29 +105,13 @@ src_configure() {
 }
 
 src_install() {
-	dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
-
-	install_directories src/{corelib,xml,network,plugins/codecs}
-
-	emake INSTALL_ROOT="${D}" install_mkspecs
+	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 '{}' +
 
-	# use freshly built libraries
-	local DYLD_FPATH=
-	[[ -d "${S}"/lib/QtCore.framework ]] \
-		&& DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
-	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
-		LD_LIBRARY_PATH="${S}/lib" \
-		"${S}"/bin/lrelease translations/*.ts \
-		|| die "generating translations failed"
-	insinto "${QT4_TRANSLATIONDIR#${EPREFIX}}"
-	doins translations/*.qm
-
-	setqtenv
-	fix_library_files
+	qt4-build-multilib_src_install
 
 	# List all the multilib libdirs
 	local libdirs=
@@ -157,13 +141,17 @@ src_install() {
 			|| die "sed for qconfig.h failed"
 	fi
 
-	install_qconfigs
-
-	# remove .la files
-	prune_libtool_files
+	# use freshly built libraries
+	local DYLD_FPATH=
+	[[ -d "${S}"/lib/QtCore.framework ]] \
+		&& DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
+	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
+		LD_LIBRARY_PATH="${S}/lib" \
+		"${S}"/bin/lrelease translations/*.ts \
+		|| die "generating translations failed"
 
-	# framework magic
-	fix_includes
+	insinto "${QT4_TRANSLATIONDIR#${EPREFIX}}"
+	doins translations/*.qm
 
 	keepdir "${QT4_SYSCONFDIR#${EPREFIX}}"
 }