main/qt5-qttools: fix qt4 conflict

5 files changed, 37 insertions, 32 deletions

diff --git a/main/qt5-qttools/APKBUILD b/main/qt5-qttools/APKBUILD
index 13e7776488..b668224a1c 100644
--- a/main/qt5-qttools/APKBUILD
+++ b/main/qt5-qttools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt5-qttools
 pkgver=5.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt5 - QtTool components"
 url="http://qt-project.org/"
 arch="all"
@@ -23,12 +23,13 @@ case $pkgver in
 esac
 
 source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qttools-opensource-src-$_V.tar.xz
-	assistant.desktop
-	designer.desktop
-	linguist.desktop
-	qdbusviewer.desktop
+	assistant-qt5.desktop
+	designer-qt5.desktop
+	linguist-qt5.desktop
+	qdbusviewer-qt5.desktop
 	"
 
+_qt5_prefix=/usr/lib/qt5
 _builddir="$srcdir"/qttools-opensource-src-$_V
 prepare() {
 	local i
@@ -42,13 +43,19 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	qmake && make || return 1
+	qmake-qt5 && make || return 1
 }
 
 package() {
 	cd "$_builddir"
 	make install INSTALL_ROOT="$pkgdir" || return 1
-	rm "$pkgdir"/usr/lib/*.la || return 1
+
+	# -qt5 symlinks
+	mkdir -p "$pkgdir"/usr/bin/
+	for i in "$pkgdir"/$_qt5_prefix/bin/*; do
+		ln -s ../lib/qt5/bin/${i##*/} "$pkgdir"/usr/bin/${i##*/}-qt5 || return 1
+	done
+
 	for i in $source; do
 		case $i in
 		*.desktop) install -Dm644 "$srcdir"/$i \
@@ -90,16 +97,12 @@ _mv_files() {
 dev() {
 	default_dev
 	cd "$pkgdir"
+	for i in designer lconvert linguist lrelease lupdate pixeltool \
+		qcollectiongenerator qhelpconverter qhelpgenerator; do
+
+		_mv_files $_qt5_prefix/bin/$i usr/bin/$i-qt5 || return 1
+	done
 	_mv_files \
-		usr/bin/designer \
-		usr/bin/lconvert \
-		usr/bin/linguist \
-		usr/bin/lrelease \
-		usr/bin/lupdate \
-		usr/bin/pixeltool \
-		usr/bin/qcollectiongenerator \
-		usr/bin/qhelpconverter \
-		usr/bin/qhelpgenerator \
 		usr/share/applications/designer* \
 		usr/share/applications/linguist* \
 		usr/share/icons/hicolor/*/apps/designer* \
@@ -111,6 +114,7 @@ _assistant() {
 	pkgdesc="Documentation browser for Qt5"
 	cd "$pkgdir"
 	_mv_files usr/bin/assist* \
+		$_qt5_prefix/bin/assist* \
 		usr/share/applications/*assistant* \
 		usr/share/icons/hicolor/*/apps/assistant* \
 		|| return 1
@@ -120,6 +124,7 @@ _dbusviewer() {
 	pkgdesc="D-Bus debugger and viewer"
 	cd "$pkgdir"
 	_mv_files usr/bin/qdbusviewer* \
+		$_qt5_prefix/bin/qdbusviewer* \
 		usr/share/applications/qdbusviewer* \
 		usr/share/icons/hicolor/*/apps/qdbusviewer* \
 		|| return 1
@@ -132,17 +137,17 @@ _webkit() {
 }
 
 md5sums="5b2fd42304e9294bc0f77095fdb35ad6  qttools-opensource-src-5.4.1.tar.xz
-a445c6917086d80f1cfc1e40cb6b0132  assistant.desktop
-d457f0a0ad68a3861c3cadefe3b42ded  designer.desktop
-668331d9798a0e2b94381efb7be4c513  linguist.desktop
-60f6c5d2e7551790665d35778d1640f3  qdbusviewer.desktop"
+170406f4c24e460fa66026ea1939ba99  assistant-qt5.desktop
+253c2ea204c554ac1b43ef9a1075f28e  designer-qt5.desktop
+1d95ed135d5ecd4940cc81ec97b1e2e0  linguist-qt5.desktop
+fb13f14e8ef2bb4d3b7bfc1cfd2bb6cb  qdbusviewer-qt5.desktop"
 sha256sums="11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72  qttools-opensource-src-5.4.1.tar.xz
-1094300e3d69e55eb69d87cbaac6724f68b0618938c6eb1b0ddd22ba99c7f8a2  assistant.desktop
-74c2c5d27a1c1ad08ab01122bcf333f75d0a014b4755d3ddd8764c2425f6e320  designer.desktop
-1b9ecd839c1a5dfcec87653849287c31bf2f4044300958be802ebb943e896998  linguist.desktop
-3da411f79ddc788a6b892ba1d61c0175c629e6e53fb9591a3cb12e4c6d983ac8  qdbusviewer.desktop"
+6e8c9b4ac3439cc4baf86ec113a974ba53139d31d540c420851aa4d839bff471  assistant-qt5.desktop
+7f0e06e543691a3750f9d1b9035b8e296da5ba71d1898e5491a2af03a6f001a0  designer-qt5.desktop
+278db0fa96792613337ae1a767f3cef508d137ba3749e73edb025207a4b64588  linguist-qt5.desktop
+c352b569baf6aabf18dd27ede727a1519037b5038ac3db336bbf4ebfcfbe6f33  qdbusviewer-qt5.desktop"
 sha512sums="1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8  qttools-opensource-src-5.4.1.tar.xz
-005ed6fe50b237e4541c0f30cbd87ec5425eff7e7c8d55d2b9b24ea8469e75e1fc8a3f26296841ab4cbd566517b3f1aa1fa7b36e1a9677d284cfff615fd24614  assistant.desktop
-731aae6a0d776c1be5a49dadc5480b205ba5c8e056d108e2bb96a19dd52b6c6ca22387b37505cf97a2575228cd5dd65c773d0fde1c26299e47fdc11a49f651fd  designer.desktop
-70943d9ee9ac7ff6281079be14b741095c60428b30b27bafc42a8bb1729a6f7e8e163cff3d2b5d5a66bbdab464816eea479a3f822598ff2fe068d4025652a049  linguist.desktop
-46880915dabb1d0e6bc870460cb86ec1b8f4678bda5c1001903281545e8c33752619cbda25d955436f2facedbc0890ebb1c9e71dfe2bd60f1bebfafe68085cd6  qdbusviewer.desktop"
+d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2  assistant-qt5.desktop
+72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3  designer-qt5.desktop
+b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad  linguist-qt5.desktop
+dddcc8c945dcbaf834e8aa8f42fd6df8d6e257e673a256cfd4affed7caf119502dffe6864262d353e8c2e234296cd091279f120ab9502f1b323e20ae3c3dc709  qdbusviewer-qt5.desktop"
diff --git a/main/qt5-qttools/assistant.desktop b/main/qt5-qttools/assistant-qt5.desktop
index 1b9f0a7680..05b6ef127b 100644
--- a/main/qt5-qttools/assistant.desktop
+++ b/main/qt5-qttools/assistant-qt5.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/usr/bin/assistant
+Exec=/usr/lib/qt5/bin/assistant
 Name=Qt Assistant
 GenericName=Qt Document Browser
 Icon=assistant
diff --git a/main/qt5-qttools/designer.desktop b/main/qt5-qttools/designer-qt5.desktop
index 8f362731bf..b867254d57 100644
--- a/main/qt5-qttools/designer.desktop
+++ b/main/qt5-qttools/designer-qt5.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/usr/bin/designer
+Exec=/usr/lib/qt5/bin/designer
 Name=Qt Designer
 GenericName=Interface Designer
 MimeType=application/x-designer
diff --git a/main/qt5-qttools/linguist.desktop b/main/qt5-qttools/linguist-qt5.desktop
index 94e92c1b08..0d4bb453e3 100644
--- a/main/qt5-qttools/linguist.desktop
+++ b/main/qt5-qttools/linguist-qt5.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/usr/bin/linguist
+Exec=/usr/lib/qt5/bin/linguist
 Name=Qt Linguist
 GenericName=Translation Tool
 MimeType=application/x-linguist
diff --git a/main/qt5-qttools/qdbusviewer.desktop b/main/qt5-qttools/qdbusviewer-qt5.desktop
index d6e0f0ae05..c5abc7078d 100644
--- a/main/qt5-qttools/qdbusviewer.desktop
+++ b/main/qt5-qttools/qdbusviewer-qt5.desktop
@@ -2,7 +2,7 @@
 Name=Qt5 QDbusViewer
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
-Exec=qdbusviewer-qt5
+Exec=/usr/lib/qt5/bin/qdbusviewer
 Icon=qt5-qdbusviewer
 Terminal=false
 Type=Application