From ea2e4d5e33f582e1509af5f04a8e4edf820b1f26 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <pesa@gentoo.org>
Date: Sun, 10 May 2015 15:48:13 +0000
Subject: Use qmake-utils helper functions.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!
---
 dev-qt/qtlockedfile/ChangeLog                      |  6 +++-
 dev-qt/qtlockedfile/Manifest                       | 32 +++++++++++-----------
 .../qtlockedfile-2.4.1_p20130904-r2.ebuild         | 27 +++++++-----------
 3 files changed, 31 insertions(+), 34 deletions(-)

(limited to 'dev-qt')

diff --git a/dev-qt/qtlockedfile/ChangeLog b/dev-qt/qtlockedfile/ChangeLog
index 1db6d4fe0f8a..68d2c6ce791b 100644
--- a/dev-qt/qtlockedfile/ChangeLog
+++ b/dev-qt/qtlockedfile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtlockedfile
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.16 2015/05/10 13:54:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.17 2015/05/10 15:48:12 pesa Exp $
+
+  10 May 2015; Davide Pesavento <pesa@gentoo.org>
+  qtlockedfile-2.4.1_p20130904-r2.ebuild:
+  Use qmake-utils helper functions.
 
 *qtlockedfile-2.4.1_p20130904-r2 (10 May 2015)
 
diff --git a/dev-qt/qtlockedfile/Manifest b/dev-qt/qtlockedfile/Manifest
index 64e0d41b1e8c..b41d06da2270 100644
--- a/dev-qt/qtlockedfile/Manifest
+++ b/dev-qt/qtlockedfile/Manifest
@@ -3,26 +3,26 @@ Hash: SHA256
 
 AUX qtlockedfile.prf 190 SHA256 04a45f27023aad55d51372bd5c6adb1c8090ea32e408f993dd1b9d7bf6fc0572 SHA512 efd51aa88a40ad5615d3ae9122a360997a3d32e3f212e7d9c1c2cf9e42984a1e4b9ccff02c6ddc1e8926104527004536ad848c5ef24bc28a93eb556d99235696 WHIRLPOOL 9e5aa3cdb12730a30438c755c2e98b62f884162acf45fc4b88a95d623df659561de32583ad86cfc743422c6b30c8dfb099449a24cfaf4a7b4733c5100535b301
 DIST qt-solutions-20130904.tar.xz 751536 SHA256 fc27b49883269a21ced2d3cb543eb78e79223afe5933bbc7d3194146f72f8884 SHA512 9e50d0a7d9fee08a72a3c6dee1d3fe45d04ae0930a967d81eff457f6c0ff53ac8449ef1d8241a5ce75ca2dcf9f4a2fe27b899647748d11060c3ab5767c3d0e75 WHIRLPOOL b933a301de905cffab8393a7adf055ed2f5198f1572657f5993e016746340d9862017982308ac11310add272ae1cd5c3435054dce2dd9d7ee5a9c92baf1878c2
-EBUILD qtlockedfile-2.4.1_p20130904-r2.ebuild 1957 SHA256 f7fa92c719a10eb63e29edb52b820b493c278c8cc6438bd6b86f7237042af64a SHA512 2b36a6140f507527274a206f3badfce88954faf1d243642de549d5901e972c864530f147fb832260add15d03913ceb51abdea0d6c7d16ed0c9386501e7737f02 WHIRLPOOL b8d99fbf5071db5fe9ef73589d63ba5df522ad9fefa3c3707605be4fe0d1bd31ea718343c90a2b4089f2bc2f4adc333288d8e348fb8cb60fdc967b4d86d02e75
+EBUILD qtlockedfile-2.4.1_p20130904-r2.ebuild 1762 SHA256 5e3a0c41a98aca54f1c1cd52f9f395395d478689c4eae9f67e7695c818b46410 SHA512 d4497bb59745ea4898e7f2d3a693d8791c2d5cb2a4ebad6b98dcf8007e686c9f84144b3351bd1a1bd835221e2745f70a3133d9c6e106959b5a91f31c1ef58b14 WHIRLPOOL 236e363fd320ed934827461dc49f21971c88a2f2a12314a8b7665b39d0a86f4b8e55f9e6613e26912a81384fa70168b5cf9940c85e23aca330bb916265abd6a9
 EBUILD qtlockedfile-2.4.1_p20130904.ebuild 1136 SHA256 a2c4f80af175a8a7922325cebd41c1ceffb054f63d58cf33a73fcd3cc8752198 SHA512 697e2ab7a7932e6f48940063f2b114e4ec1d11554a9a94f74fa0e338b68b24940cddf0ced7ff27d624a2aca0966bb2ae681764f5143d340c80e21656890843f5 WHIRLPOOL babd786e7906a8c58ce714b8521ec387b3ef9f336f784252214eb6503fcc79ef63bd43460b5fa33cc3d9bf50e2399e9994afebff89dad301e76c03ad654e09f4
-MISC ChangeLog 2651 SHA256 a892663d08c7c9a92f6f5d58f0b5e3ad1ff3c85c87e150142a2553f54064ca73 SHA512 74e6843f5db9358503d4198f0763574ed677848d0921b511e6d1433b898fb32d6c9f0fa56950924dc550260ead40b269e7a899e0e9c1c972f9a0071e5a0b6c3c WHIRLPOOL 2575a601fd5b98802c65f7ee6e11ca812bd7fe48d9822d8fde742416d6df5b178255058647a6ff41514a30c97af73307375d32b6a191314b520ebdebf5a4b1d7
+MISC ChangeLog 2780 SHA256 9fc9a7ff64948fb78739ddf3fb3cbbc0e831bfd2286103a50d7df38367e85c95 SHA512 f6d8f46ed77d05a434141e4738a1751c85aac1973aa80410274c9a51b0dab365e54a516619cdcc0d4f31683af3cd380457bcf9a5db38f04fe8bb4559daeaa5ae WHIRLPOOL 893f8967682b85c64c7e641afb6177355e3b6b4eebd0bea7499b49eea97610398fffe4402aa50dc4ff365a84ab716d523b2c90aa503d6ff850b1bbacdfea8c20
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVT2MwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVT329XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9lPMP/3DyxBftOvjGLo7wCqEw73w0
-+9M/iQE3VOIu/Pn1Qn7L+OBTtq1VwEtlYLulVUgHYTiipHxVAenufJuGPkvf9iyE
-2aEXaW6JW4CiUnivU/qNOZnRsEJuTg4ktQ7gMbZBUlY8tPvdXa/s+dLYuUE3anu0
-+EFwQ2P16txN70knsC5s9Q3KmLJWUkKVoMJ4B/36nbPXHMSpKKsAK+RnX+32rjwA
-ChiQttix/gdyO//ds2+UG+54e4Tkb/D2BsxBa7L2mbMsa7gpYaC3wBgk/hfneDvf
-zsMUMtYBjLWxMUE6ZKOst268PobM/JQxXGbHm5ZhXTVihMf6JKnAtneIQmiJ9pm3
-iAcJNBPWPMefiZSgZCfFeo6SyVwsgxgVM/6oNNI/sTAbw86HGscpmDhrRdlLjreh
-3RNF+7gZrD9Ti4aHvWbFPadJX8nArqWqUOtaFxGCKxrgM6xfL6njow1tk9ebwmpD
-ps9Jsvtx4kQEDPDmzIX6pIaR3u89eSjEm/5N6vgowaOIMBpcw8locNycv3Zjd+Le
-mhwCiYxychTH2wOGEd1Ccncr5wSkY6NECDNQJfKqcvW+XfxuISVMZ5HTngU6EOtF
-NvHcqhJgYyq+CE5tvvstySQ4a2gs09vIwJwwzNAFyf/qmi8WbJpUOEDY6iQDfVcy
-nAujKL62EpwKM8OI2Urv
-=a/4a
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9IVcQAKp3tLko4NpQMsUZUz2Uzl1/
+0hlQxZfynsjAoAJnNjMivMZkKkDcdWe3IBqXoK3vf9SliLrVgozMoQfv+zrZXt+s
+pQiBxjLwwFCuS81wEOoyAj6I4Ez+B73HCdiXabgqKVgr+NPyECEMfqF7LuGWjmoE
+tGaBOdZUEvaWXUsn88j/lCfInkOsk3Rw5S4GYtZnP7S9Q1cTEska1V4iegJGKqn3
+Odyg16LY/z45AmdTLoJivPPhEdKFsDFTDz6fPGyszNS7d/I3dZvgDn9houKyXgNQ
+AxgtP2C1icavsA0npgAv1sjw/EhFzBCAVL9HvT4vQAnFnhRguk5txD6DUZ709gYL
+SV1GSheQq0oZTjv045opFUCskxl4k5tjkRpGXc9uT6vZYP16JZkc0Jh3vL64zbYR
+vjHC1r0ekq27Ke7zAVMSXNOkHUnQsuchJpM9dG2N3QCLa4TNW7i0w2h1Tek6gybl
+vgfVpqK0ehX7IPPeAaS0H+0JNvzsuTa+chgeyhAE3vcMRElwxnDjXMMJzuu+ykZw
+LQBn0Cb4ov9ZpqnRVxhMJ46BpoehUKpxLqP6mnPUMkWgphw6KBpw46Sa11XptFVe
+UljR3JDqw7O6R9ijmEQ0H60PqT0yNK1+V11KqNuGPMTjLsVtyVrBIUfTMOSXyZyg
+YdpZNi14mroGMUQdS33A
+=/oQC
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild
index 405cf3f2e2f5..b96309a89dd5 100644
--- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild,v 1.1 2015/05/10 13:54:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild,v 1.2 2015/05/10 15:48:12 pesa Exp $
 
 EAPI=5
 
-inherit multibuild multilib qmake-utils
+inherit multibuild qmake-utils
 
 MY_P=qt-solutions-${PV#*_p}
 
@@ -63,23 +63,16 @@ src_install() {
 	use doc && dodoc -r doc/html
 
 	myinstall() {
-		if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
-			insinto /usr/include/qt4/QtSolutions
-			doins src/QtLockedFile src/${PN}.h
-
-			insinto /usr/share/qt4/mkspecs/features
-			doins "${FILESDIR}"/${PN}.prf
-		fi
-
-		if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
-			insinto /usr/include/qt5/QtSolutions
-			doins src/QtLockedFile src/${PN}.h
+		# libraries
+		dolib.so lib/*
 
-			insinto /usr/$(get_libdir)/qt5/mkspecs/features
-			doins "${FILESDIR}"/${PN}.prf
-		fi
+		# headers
+		insinto "$(${MULTIBUILD_VARIANT}_get_headerdir)"/QtSolutions
+		doins src/QtLockedFile src/${PN}.h
 
-		dolib.so lib/*
+		# .prf files
+		insinto "$(${MULTIBUILD_VARIANT}_get_mkspecsdir)"/features
+		doins "${FILESDIR}"/${PN}.prf
 	}
 
 	multibuild_foreach_variant run_in_build_dir myinstall
-- 
cgit v1.2.3-65-gdbad