main/qt5-qttools: add -qt5 suffix to exec files

to avoid collision with qt4

5 files changed, 33 insertions, 29 deletions

diff --git a/main/qt5-qttools/APKBUILD b/main/qt5-qttools/APKBUILD
index 6b4b4d843..3e5265c01 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=0
+pkgrel=1
 pkgdesc="Qt5 - QtTool components"
 url="http://qt-project.org/"
 arch="all"
@@ -23,10 +23,10 @@ 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
 	"
 
 _builddir="$srcdir"/qttools-opensource-src-$_V
@@ -48,7 +48,11 @@ build() {
 package() {
 	cd "$_builddir"
 	make install INSTALL_ROOT="$pkgdir" || return 1
+	for i in "$pkgdir"/usr/bin/*; do
+		mv "$i" "$i"-qt5 || return 1
+	done
 	rm "$pkgdir"/usr/lib/*.la || return 1
+
 	for i in $source; do
 		case $i in
 		*.desktop) install -Dm644 "$srcdir"/$i \
@@ -91,15 +95,15 @@ dev() {
 	default_dev
 	cd "$pkgdir"
 	_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/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* \
@@ -132,17 +136,17 @@ _webkit() {
 }
 
 md5sums="5b2fd42304e9294bc0f77095fdb35ad6  qttools-opensource-src-5.4.1.tar.xz
-a445c6917086d80f1cfc1e40cb6b0132  assistant.desktop
-d457f0a0ad68a3861c3cadefe3b42ded  designer.desktop
-668331d9798a0e2b94381efb7be4c513  linguist.desktop
-60f6c5d2e7551790665d35778d1640f3  qdbusviewer.desktop"
+1602e806145f2cf4706f41734e87a94b  assistant-qt5.desktop
+e9bfbc254af53ac4cbb053d2ed6996c2  designer-qt5.desktop
+f28a94bfbe652967ded250fc22981e2c  linguist-qt5.desktop
+60f6c5d2e7551790665d35778d1640f3  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"
+2cd278b569e444950377e4688f6791668d2a6a85c89576b7a499f5c62f8a1ea9  assistant-qt5.desktop
+05775eb804ac5890255a1a0cb5aa565d3f947b48ace85d74548b40d24dbdd834  designer-qt5.desktop
+3a6b5e903ac93b78a165bcc389e6395615635097175bc4519bcef9f1d31ff3f4  linguist-qt5.desktop
+3da411f79ddc788a6b892ba1d61c0175c629e6e53fb9591a3cb12e4c6d983ac8  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"
+e2ef53ba0a77a0c803d93aac611f3f7578bc472908723b6e968ee8362216ec6151352ea2a87ab9a2407af0af602412da22bda2bb7687eaeb1e35be591f948d0b  assistant-qt5.desktop
+2de99409c44bb95ab703130946c17687d9087dd51a9d49125ffcc384cd1c20fce7d277cbfdac8226b3b2f340610e55a2372679bae0079560a955b2fcb08d261f  designer-qt5.desktop
+0c9df4bb3fa3e93d43a3b4b3985ca81b933a002c1b4247ae836ae5e0a9d1015832b6ee68ad291cacbc2032e4e3fede1af56271dbd967ce5e39cf8ca170f3a6e2  linguist-qt5.desktop
+46880915dabb1d0e6bc870460cb86ec1b8f4678bda5c1001903281545e8c33752619cbda25d955436f2facedbc0890ebb1c9e71dfe2bd60f1bebfafe68085cd6  qdbusviewer-qt5.desktop"
diff --git a/main/qt5-qttools/assistant.desktop b/main/qt5-qttools/assistant-qt5.desktop
index 1b9f0a768..0662a8085 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/bin/assistant-qt5
 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 8f362731b..f76a855b6 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/bin/designer-qt5
 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 94e92c1b0..e7b5e3f36 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/bin/linguist-qt5
 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 d6e0f0ae0..d6e0f0ae0 100644
--- a/main/qt5-qttools/qdbusviewer.desktop
+++ b/main/qt5-qttools/qdbusviewer-qt5.desktop