4 files changed, 64 insertions, 65 deletions

diff --git a/multimedia/dvbcut/pkg-plist b/multimedia/dvbcut/pkg-plist
index 08808d9e528f..265217936755 100644
--- a/multimedia/dvbcut/pkg-plist
+++ b/multimedia/dvbcut/pkg-plist
@@ -1,4 +1,3 @@
-@comment %%QT_BINDIR%%/dvbcut
 bin/dvbcut
 share/applications/dvbcut.desktop
 share/mime/packages/dvbcut.xml
diff --git a/multimedia/gstreamer-qt4/pkg-plist b/multimedia/gstreamer-qt4/pkg-plist
index f099835fee04..d46d2e36df86 100644
--- a/multimedia/gstreamer-qt4/pkg-plist
+++ b/multimedia/gstreamer-qt4/pkg-plist
@@ -123,8 +123,8 @@ lib/libQtGStreamerUi-%%GST_VERSION%%.so.%%VERSION%%
 lib/libQtGStreamerUtils-%%GST_VERSION%%.so
 lib/libQtGStreamerUtils-%%GST_VERSION%%.so.0
 lib/libQtGStreamerUtils-%%GST_VERSION%%.so.%%VERSION%%
-%%QT_LIBDIR%%/imports/QtGStreamer/libQtGStreamerQuick1.so
-%%QT_LIBDIR%%/imports/QtGStreamer/qmldir
+lib/qt4/imports/QtGStreamer/libQtGStreamerQuick1.so
+lib/qt4/imports/QtGStreamer/qmldir
 libdata/pkgconfig/QtGLib-2.0.pc
 libdata/pkgconfig/QtGStreamer-%%GST_VERSION%%.pc
 libdata/pkgconfig/QtGStreamerUi-%%GST_VERSION%%.pc
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index ea28945103eb..6a7150c6611a 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -186,8 +186,8 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in
 %%QT_PREFIX%%/%%QT_INCDIR%%/Phonon
 %%QT_PREFIX%%/%%QT_INCDIR%%/phonon
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so.4
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so.4
+%%QT_PREFIX%%/lib/qt4/libphonon.so
+%%QT_PREFIX%%/lib/qt4/libphonon.so.4
+%%QT_PREFIX%%/lib/qt4/libphononexperimental.so
+%%QT_PREFIX%%/lib/qt4/libphononexperimental.so.4
 %%QT_PREFIX%%/%%QT_MKSPECDIR%%/modules/qt_phonon.pri
diff --git a/multimedia/qt4-mobility/pkg-plist b/multimedia/qt4-mobility/pkg-plist
index e387c082143e..00cb15c33a41 100644
--- a/multimedia/qt4-mobility/pkg-plist
+++ b/multimedia/qt4-mobility/pkg-plist
@@ -5,14 +5,14 @@
 %%BEARER%%%%QT_INCDIR%%/QtMobility/qlatin1constant.h
 %%BEARER%%%%QT_INCDIR%%/QtMobility/qmalgorithms.h
 %%BEARER%%%%QT_INCDIR%%/QtMobility/qmobilityglobal.h
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.prl
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1.2
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1.2.2
+%%BEARER%%lib/qt4/libQtBearer.prl
+%%BEARER%%lib/qt4/libQtBearer.so
+%%BEARER%%lib/qt4/libQtBearer.so.1
+%%BEARER%%lib/qt4/libQtBearer.so.1.2
+%%BEARER%%lib/qt4/libQtBearer.so.1.2.2
 %%BEARER%%%%QT_MKSPECDIR%%/features/mobility.prf
 %%BEARER%%%%QT_MKSPECDIR%%/features/mobilityconfig.prf
-%%CONNECTIVITY%%%%QT_BINDIR%%/ndefhandlergen
+%%CONNECTIVITY%%bin/ndefhandlergen
 %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothAddress
 %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothDeviceDiscoveryAgent
 %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothDeviceInfo
@@ -75,11 +75,11 @@
 %%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/qrfcommsocket.h
 %%CONNECTIVITY%%%%QT_IMPORTDIR%%/QtMobility/connectivity/libdeclarative_connectivity.so
 %%CONNECTIVITY%%%%QT_IMPORTDIR%%/QtMobility/connectivity/qmldir
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.prl
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1.2
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1.2.2
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.prl
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1.2
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1.2.2
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContact
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContactAbstractRequest
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContactAction
@@ -218,11 +218,11 @@
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qcontacturl.h
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qtcontacts.h
 %%CONTACTS%%%%QT_INCDIR%%/QtContacts/qtcontactsglobal.h
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.prl
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1.2
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1.2.2
+%%CONTACTS%%lib/qt4/libQtContacts.prl
+%%CONTACTS%%lib/qt4/libQtContacts.so
+%%CONTACTS%%lib/qt4/libQtContacts.so.1
+%%CONTACTS%%lib/qt4/libQtContacts.so.1.2
+%%CONTACTS%%lib/qt4/libQtContacts.so.1.2.2
 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackActuator
 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackEffect
 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackFileEffect
@@ -236,11 +236,11 @@
 %%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/qfeedbackplugininterfaces.h
 %%FEEDBACK%%%%QT_IMPORTDIR%%/QtMobility/feedback/libdeclarative_feedback.so
 %%FEEDBACK%%%%QT_IMPORTDIR%%/QtMobility/feedback/qmldir
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.prl
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1.2
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1.2.2
+%%FEEDBACK%%lib/qt4/libQtFeedback.prl
+%%FEEDBACK%%lib/qt4/libQtFeedback.so
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1.2
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1.2.2
 %%GALLERY%%%%QT_INCDIR%%/QtGallery/QAbstractGallery
 %%GALLERY%%%%QT_INCDIR%%/QtGallery/QDocumentGallery
 %%GALLERY%%%%QT_INCDIR%%/QtGallery/QGalleryAbstractRequest
@@ -270,11 +270,11 @@
 %%GALLERY%%%%QT_INCDIR%%/QtGallery/qgallerytyperequest.h
 %%GALLERY%%%%QT_IMPORTDIR%%/QtMobility/gallery/libdeclarative_gallery.so
 %%GALLERY%%%%QT_IMPORTDIR%%/QtMobility/gallery/qmldir
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.prl
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1.2
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1.2.2
+%%GALLERY%%lib/qt4/libQtGallery.prl
+%%GALLERY%%lib/qt4/libQtGallery.so
+%%GALLERY%%lib/qt4/libQtGallery.so.1
+%%GALLERY%%lib/qt4/libQtGallery.so.1.2
+%%GALLERY%%lib/qt4/libQtGallery.so.1.2.2
 %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoAddress
 %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoAreaMonitor
 %%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoBoundingArea
@@ -430,11 +430,11 @@
 %%LOCATION%%%%QT_INCDIR%%/QtLocation/qnmeapositioninfosource.h
 %%LOCATION%%%%QT_IMPORTDIR%%/QtMobility/location/libdeclarative_location.so
 %%LOCATION%%%%QT_IMPORTDIR%%/QtMobility/location/qmldir
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.prl
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1.2
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1.2.2
+%%LOCATION%%lib/qt4/libQtLocation.prl
+%%LOCATION%%lib/qt4/libQtLocation.so
+%%LOCATION%%lib/qt4/libQtLocation.so.1
+%%LOCATION%%lib/qt4/libQtLocation.so.1.2
+%%LOCATION%%lib/qt4/libQtLocation.so.1.2.2
 %%LOCATION%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_nokia.so
 %%LOCATION%%%%QT_PLUGINDIR%%/landmarks/libqtlandmarks_sqlite.so
 %%MULTIMEDIA%%%%QT_INCDIR%%/QtMultimediaKit/QAbstractAudioDeviceInfo
@@ -582,11 +582,11 @@
 %%MULTIMEDIA%%%%QT_INCDIR%%/QtMultimediaKit/qvideowindowcontrol.h
 %%MULTIMEDIA%%%%QT_IMPORTDIR%%/QtMultimediaKit/libdeclarative_multimedia.so
 %%MULTIMEDIA%%%%QT_IMPORTDIR%%/QtMultimediaKit/qmldir
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.prl
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1.2
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1.2.2
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.prl
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1.2
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1.2.2
 %%MULTIMEDIA%%%%QT_PLUGINDIR%%/audio/libqtmedia_pulse.so
 %%MULTIMEDIA%%%%QT_PLUGINDIR%%/mediaservice/libqgstengine.so
 %%MULTIMEDIA%%%%QT_PLUGINDIR%%/mediaservice/libqtmedia_v4lengine.so
@@ -730,13 +730,13 @@
 %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qorganizertodotime.h
 %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qtorganizer.h
 %%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qtorganizerglobal.h
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.prl
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1.2
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1.2.2
-%%PUBLISHSUBSCRIBE%%%%QT_BINDIR%%/qcrmlgen
-%%PUBLISHSUBSCRIBE%%%%QT_BINDIR%%/vsexplorer
+%%ORGANIZER%%lib/qt4/libQtOrganizer.prl
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1.2
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1.2.2
+%%PUBLISHSUBSCRIBE%%bin/qcrmlgen
+%%PUBLISHSUBSCRIBE%%bin/vsexplorer
 %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpace
 %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpacePublisher
 %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpaceSubscriber
@@ -745,11 +745,11 @@
 %%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/qvaluespacesubscriber.h
 %%PUBLISHSUBSCRIBE%%%%QT_IMPORTDIR%%/QtMobility/publishsubscribe/libdeclarative_publishsubscribe.so
 %%PUBLISHSUBSCRIBE%%%%QT_IMPORTDIR%%/QtMobility/publishsubscribe/qmldir
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.prl
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1.2
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1.2.2
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.prl
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1.2
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1.2.2
 %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporter
 %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporterDetailHandler
 %%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporterDetailHandlerV2
@@ -774,11 +774,11 @@
 %%VERSIT%%%%QT_INCDIR%%/QtVersit/qversitwriter.h
 %%VERSIT%%%%QT_IMPORTDIR%%/QtMobility/contacts/libdeclarative_contacts.so
 %%VERSIT%%%%QT_IMPORTDIR%%/QtMobility/contacts/qmldir
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.prl
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1.2
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1.2.2
+%%VERSIT%%lib/qt4/libQtVersit.prl
+%%VERSIT%%lib/qt4/libQtVersit.so
+%%VERSIT%%lib/qt4/libQtVersit.so.1
+%%VERSIT%%lib/qt4/libQtVersit.so.1.2
+%%VERSIT%%lib/qt4/libQtVersit.so.1.2.2
 %%VERSIT%%%%QT_PLUGINDIR%%/versit/libqtversit_backuphandler.so
 %%VERSIT%%%%QT_PLUGINDIR%%/versit/libqtversit_vcardpreserver.so
 %%VERSITORGANIZER%%%%QT_INCDIR%%/QtVersitOrganizer/QVersitOrganizerExporter
@@ -794,9 +794,9 @@
 %%VERSITORGANIZER%%%%QT_INCDIR%%/QtVersitOrganizer/qversittimezonehandler.h
 %%VERSITORGANIZER%%%%QT_IMPORTDIR%%/QtMobility/organizer/libdeclarative_organizer.so
 %%VERSITORGANIZER%%%%QT_IMPORTDIR%%/QtMobility/organizer/qmldir
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.prl
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1.2
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1.2.2
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.prl
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1.2
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1.2.2
 %%VERSITFEEDBACK%%%%QT_PLUGINDIR%%/feedback/libqtfeedback_mmk.so