From be6428b5242a8bbfc6c9bad468106963e2532a02 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 25 Jan 2015 13:00:06 +0100
Subject: [PATCH] qt: merge the qtconfig subpkg; there's no reason to split it.

---
 srcpkgs/qt-qtconfig |  1 -
 srcpkgs/qt/template | 16 +++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/qt-qtconfig

diff --git a/srcpkgs/qt-qtconfig b/srcpkgs/qt-qtconfig
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-qtconfig
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 417e56d3478..f4a0597d44e 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -1,7 +1,7 @@
 # Template file for 'qt'
 pkgname=qt
 version=4.8.6
-revision=10
+revision=11
 _distname=qt-everywhere-opensource-src
 patch_args="-Np1"
 wrksrc=${_distname}-${version}
@@ -21,7 +21,8 @@ makedepends="
  sqlite-devel alsa-lib-devel tiff-devel libmng-devel libxshmfence-devel
  libSM-devel gtk+-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel
  pulseaudio-devel"
-depends="qtchooser"
+depends="qtchooser hicolor-icon-theme"
+replaces="qt-qtconfig>=0"
 
 pre_configure() {
 	sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
@@ -162,14 +163,3 @@ qt-qmake_package() {
 		vmove usr/share/qt/mkspecs
 	}
 }
-qt-qtconfig_package() {
-	depends="hicolor-icon-theme"
-	short_desc+=" - configuration tool"
-	pkg_install() {
-		vmove usr/bin/qtconfig-qt4
-		vmove usr/lib/qt/bin/qtconfig
-		vmove usr/share/applications/qtconfig.desktop
-		vmove usr/share/pixmaps/qtlogo.png
-		vmove "usr/share/qt/translations/qtconfig*"
-	}
-}