qt: split out libphonon into qt-libphonon subpkg, revbump affected pkgs.

common/shlibs

@@ -411,7 +411,7 @@ libQt3Support.so.4		qt			qt-devel
 libQtSvg.so.4			qt			qt-devel
 libQtScript.so.4		qt			qt-devel
 libQtHelp.so.4			qt			qt-devel
-libphonon.so.4			qt			qt-devel
+libphonon.so.4			qt-libphonon		qt-devel
 libQtCore.so.4			qt			qt-devel
 libQtSql.so.4			qt			qt-devel
 libQtWebKit.so.4		qt			qt-devel

srcpkgs/qt-libphonon

@@ -0,0 +1 @@
+qt

srcpkgs/qt/depends

@@ -1,2 +1,2 @@
 abi_depends=">=4.5.3"
-api_depends="${abi_depends}"
+api_depends=">=4.8.0_1"

srcpkgs/qt/qt-demos.template

@@ -6,6 +6,7 @@ long_desc="${long_desc}
  This package contains Qt 4 examples and demos."
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
+revision=1
 
 Add_dependency run hicolor-icon-theme
 Add_dependency run qt-docs

srcpkgs/qt/qt-designer.template

@@ -1,5 +1,6 @@
 # Template file for 'qt-designer'.
 #
+revision=1
 short_desc="Qt GUI designer"
 long_desc="${long_desc}
 

srcpkgs/qt/qt-devel.template

@@ -1,31 +1,12 @@
 # Template file for 'qt-devel'.
 #
+revision=1
 short_desc="Qt development files"
 long_desc="${long_desc}
 
  This package contains the header development files and development
  programs used for runing Qt applications."
 
-
-Add_dependency run openssl-devel
-Add_dependency run dbus-devel
-Add_dependency run fontconfig-devel
-Add_dependency run freetype-devel
-Add_dependency run glib-devel
-Add_dependency run MesaLib-devel
-Add_dependency run gst-plugins-base-devel
-Add_dependency run jpeg-devel
-Add_dependency run libmng-devel
-Add_dependency run libpng-devel
-Add_dependency run tiff-devel
-Add_dependency run sqlite-devel
-Add_dependency run libxml2-devel
-Add_dependency run libICE-devel
-Add_dependency run libSM-devel
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXrender-devel
-Add_dependency run zlib-devel
 Add_dependency run qt-qmake
 
 do_install()
@@ -33,10 +14,10 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/bin
 	for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \
 		rcc uic uic3; do
-		mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin || return 1
+		mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin
 	done
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr || return 1
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib || return 1
+	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.prl ${DESTDIR}/usr/lib || return 1
+	mv ${SRCPKGDESTDIR}/usr/lib/*.prl ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib || return 1
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 }

srcpkgs/qt/qt-libphonon.rshlibs

@@ -0,0 +1,9 @@
+libpulse-mainloop-glib.so.0
+libpulse.so.0
+libQtDBus.so.4
+libQtGui.so.4
+libQtCore.so.4
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
+libc.so.6

srcpkgs/qt/qt-libphonon.template

@@ -0,0 +1,10 @@
+# Template file for 'libphonon'.
+#
+short_desc="Qt libphonon runtime libraries"
+long_desc="${long_desc}
+
+ This package contains the Qt phonon runtime libraries."
+
+do_install() {
+	vmove "usr/lib/libphonon*.so*" usr/lib
+}

srcpkgs/qt/qt-plugin-gstreamer.template

@@ -5,11 +5,9 @@ long_desc="${long_desc}
 
  This package contains a Qt phonon backend plugin for GStreamer."
 
+revision=1
 
-do_install()
+do_install() {
-{
+	vmove usr/lib/qt/plugins/phonon_backend/libphonon_gstreamer.so \
-	mkdir -p ${DESTDIR}/usr/lib/qt/plugins/phonon_backend/
+		usr/lib/qt/plugins/phonon_backend
-
-	mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/phonon_backend/libphonon_gstreamer.so \
-		${DESTDIR}/usr/lib/qt/plugins/phonon_backend
 }

srcpkgs/qt/qt-qmake.template

@@ -14,7 +14,6 @@ long_desc="${long_desc}
 
  This package contains also these platform specifications."
 
-
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/qt

srcpkgs/qt/qt-qtconfig.template

@@ -6,6 +6,7 @@ long_desc="${long_desc}
  The Qt Configuration program allows end users to configure the look
  and behavior of any Qt application."
 
+revision=1
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run hicolor-icon-theme

srcpkgs/qt/qt.rshlibs

@@ -33,6 +33,4 @@ libgstpbutils-0.10.so.0
 libgstvideo-0.10.so.0
 libgstbase-0.10.so.0
 libgstreamer-0.10.so.0
-libpulse-mainloop-glib.so.0
-libpulse.so.0
 libtiff.so.5

srcpkgs/qt/template

@@ -5,7 +5,7 @@ _distname=qt-everywhere-opensource-src
 wrksrc=${_distname}-${version}
 homepage="http://qt.nokia.com/"
 distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz"
-revision=3
+revision=4
 short_desc="A cross-platform application and UI framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-2.1"
@@ -14,8 +14,8 @@ long_desc="
  Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
  maintaining GUI (graphical user interface) applications."
 
-subpackages="qt-plugin-pgsql qt-plugin-mysql qt-plugin-sqlite qt-demos"
+subpackages="qt-libphonon qt-plugin-pgsql qt-plugin-mysql qt-plugin-sqlite"
-subpackages="${subpackages} qt-docs qt-qmake qt-qtconfig"
+subpackages="${subpackages} qt-demos qt-docs qt-qmake qt-qtconfig"
 subpackages="${subpackages} qt-designer qt-devel qt-devel-tools"
 subpackages="${subpackages} qt-plugin-gstreamer"