Add slot operator dep on icu; remove old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

5 files changed, 30 insertions, 386 deletions

diff --git a/net-libs/qmf/ChangeLog b/net-libs/qmf/ChangeLog
index 6daebbc954e1..9808efa90357 100644
--- a/net-libs/qmf/ChangeLog
+++ b/net-libs/qmf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/qmf
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/ChangeLog,v 1.4 2012/07/15 16:45:13 kensington Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/ChangeLog,v 1.5 2013/02/09 09:00:11 pesa Exp $
+
+*qmf-2.0_p201209-r1 (09 Feb 2013)
+
+  09 Feb 2013; Davide Pesavento <pesa@gentoo.org> +qmf-2.0_p201209-r1.ebuild,
+  -files/qmf-use-standard-install-paths.patch, -qmf-2.0_p201143.ebuild,
+  -qmf-2.0_p201209.ebuild:
+  Add slot operator dep on icu; remove old.
 
   15 Jul 2012; Michael Palimaka <kensington@gentoo.org> qmf-2.0_p201143.ebuild:
   Add missing slot dependencies on Qt.
diff --git a/net-libs/qmf/Manifest b/net-libs/qmf/Manifest
index f22e0649b74a..47c38beb6a3a 100644
--- a/net-libs/qmf/Manifest
+++ b/net-libs/qmf/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX qmf-tests.patch 591 SHA256 57a071c175d0cf76a6037d1d89c6d1d4b0507066299ec3db4a73e88c8357a13f SHA512 e12a935996996182e920240ac5a326ea57e17da7f7e19a0d629d8c4145c2b4320b84f2a974a5d4de51d9a7f1a31662465be8016ec848f7411c12274e3d061699 WHIRLPOOL a988ce20103f4f027e3a22d730b88afb35325702f751167406920a713219396746bac90ad9e1b2c45345c010818c47c4e82c55b73c2ca875f6d00a7e28424895
-AUX qmf-use-standard-install-paths.patch 11505 SHA256 3ed35f6d6ae0b4148c1b42bc991ec9e504bd9b60799a3d43e8187c5b0a320031 SHA512 be688d73016d600e231938daaa7bdc809a87ebc5905444eaa69bb001a67aa420a98cbeb6e18af406f242a1d7ac09c11ca6122cd6c14966b99e8be022153031d9 WHIRLPOOL 9b938abcabaca1b81eb3ca0558505336e5d89ccf81e73928e0f301324b4d22d0b1b7657d9d248af09c96dec9a8bfbabc139e8472802f681c5ee01cc0aadf41c6
-DIST qmf-2.0_p201143.tar.gz 2472955 SHA256 59defd23c2557b2f4c170198f113de88132a979b482e391160d87c68fdbc961d
-DIST qmf-2.0_p201209.tar.gz 2531787 SHA256 d0a04e7a05c5fe58a6165607b34d625099cc94bd7d1253e313042d8d08af265e
-EBUILD qmf-2.0_p201143.ebuild 2148 SHA256 9d8fed02e822c4ae628f9bd78382580ef9c9c7a6ffbb1d88ab35739ff1419dfe SHA512 0b029b775664fee93b2e81da26773ffea49c5b0df2d81975a680c9462e2574ac0cc4d52812237fc6540eba7deeebeb29cc5e4ea6de771be4d8f6c9d609445c5e WHIRLPOOL 564f29025fda3ec850c3327b407fcaf308b8732589ae430767abc1db706f71441e20584de9b3137ff52484a4f9daeeb5f09fe63c4a8d954f49ed6cb0bbff3cd5
-EBUILD qmf-2.0_p201209.ebuild 2220 SHA256 d47b6d42b58a3f860526b6bd9fa0e017a332d14365579facd21142242be10346 SHA512 5d39fabca149330bd3d6b49a81a8e0e3564674810d0eb89553001dbfd0263adf463b8c61ed975d644fe42de4134d7b4860f1053f7809ece6c127addcd64195b8 WHIRLPOOL 6ed2b810dc079473f2f04cfe058606f46d6ac94407c5c9d53d6169d5a8d1e3e7bcd053e2b52034bf5800879ddad2f014149cfce0f43cb7f5fe2ce73652b0bf46
-MISC ChangeLog 926 SHA256 c9aa9c6602efdb9ee292a4c3f902a69a7ebfdcc5d4587fded4993758ee37c00c SHA512 6b09a70a599a2f9c480cd67fe91200b2501460c720c8020c01f5820023b6e808623847088bb9d8b4004603026978e2cb4912b5ced07c270d129a6e31d9d06d8f WHIRLPOOL 36e3a94829c39cdffad65e039ffcee48f45dd8c0c50c37f9cdedef7dcc453a57674dc7bae3eb57e950344e29a0abca1fe95e469b33b39699c71ed372e0b5f64c
+DIST qmf-2.0_p201209.tar.gz 2531787 SHA256 d0a04e7a05c5fe58a6165607b34d625099cc94bd7d1253e313042d8d08af265e SHA512 8b0c6678a86c1f8a684d644895b5e9269f981291bf69af9188ddf35446ef0942acbabe816a0aca5ec2574f0365d70835bb8e1af791b6a6b7b1fe5b1800c94919 WHIRLPOOL 3fbd8edc4e634bb6a3966ae7ca77e09265bbb6a9d8ad29e3abe587b308557459affbc716d95df96a047bf9efec9f1380f1eecb75b6339fb58aa4a4a0f12e1164
+EBUILD qmf-2.0_p201209-r1.ebuild 2225 SHA256 3587ca114c1657b68ab9819d77796971c6fe423b1fa24b05a68be0a2115b4ef0 SHA512 08c327aa951644c02e088d098960a36e5c8f798f96890a2104268db368b11b7b957c67720157e4393444d88c9f3266b92d32017ec92da38f71f731ef6fe9bec2 WHIRLPOOL 370499e86a926b453333b55a1f6b843e3f66b5e161aacd8616e8ce25eabb2eef2d6607831ee7f71baabff53a5ce99ee5e6d0d3e73fdbaa7668b153d45c41b729
+MISC ChangeLog 1177 SHA256 eb89b9eaabeff7e06cf7eebd56fbcaff4cd4827b3cda7d510329e9ac14a79865 SHA512 801ff65ea77492cc9f79888e5984c0d2ec84c3834119dfa87d54d2fe8250fd25342ebfef0f01fd8b530a3ae674c70bd416c72ecb885dd5db51c6c79b3f0c48fc WHIRLPOOL aeb5920af83ee553bb3c939e857f0dab61f473a63f1274bde42fea1e512ad0d893f48a6316a84b49be85d3670ce306d7f4d23b622926c9b7463a5538e9abbf80
 MISC metadata.xml 245 SHA256 b768e8d906de53d73eb189a1aef619cf77693af566a9dfda91705bd7dd7c117c SHA512 6084a1fdcd72a4b1c84776ac880de837d17c7b14f2554ae26832d4fc7287ad8ae9651e55bc72de2a23d21fa4e1bd0ca8e98d4c5cd3ba274b35cc3d8a3a6a372b WHIRLPOOL f9587cab5f31a0340ad7da99b058e1e8c46d2476c47d4b47fc327b2f61fd06a3a5924e1e9d9b48de866a9b560d4703d475530ade11bf6562437f76f910b56a2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQAvOUAAoJEMbwO6tnXQ0sYP0H/A2Ca9ttqK+fJM0GqqgTzAF3
-htbR4+PBP1D9yDL+XwbbB+k+udydracolMlnR9C5kjnT2d9PJPtB/3fC0Zpt6U85
-McTabdaCU5tOqfUGI9pnTmse/MZjKfhXJpLJ3vfssdSyMUJ1E8NT45YwgKWx/M3R
-mBsCPgJq75MMnjZGSSfoC6qsDyTrn5D6mr0MeKbzq46AJNL16R4GeAcsDrbivTT9
-y1OJNn0gmBVmYdHxBsXN1SUfaD6/B7c4XMAHYJbGA71Sc3qeH7s3I/5RGPjRD5pA
-o/cwbHZ/ShSe7iVgBNE59R3qWY5XNNKJo3xDloLJeagrIktCX5RG6XMEZFfDMps=
-=j0ia
+iQIcBAEBCAAGBQJRFhAcAAoJENXLsxwXqFxy7gsP/idyOPaT9a+lLoSFJ4FbI2ch
+PaS53zmbO0vRtkdSxJcU4tJSDe/m5cTVmly/n7s1zllapHQoHJRFq4a/AOza2n/t
+Ix7LtuL5A6bpPI9FoWGNTNqkKSKp/OYDs1/ALnnPRbKW/3lITJbJwfHxhJCaYpnG
+l0XAbRCcV52awodT7798s/zslqLrHGB+h4zsHQDzR3owgFWcv2TP4gjDssu9V8Sl
+W0+k2efqqNDOmUNpfFviz/HR6Z97MToc6i1RM1DvzsJc5UofrjFujgLK9D/7LRsE
+D20J3k1PXL7dpwVWEyNiuxlXskHlPx0jjLA0Z35Jq1CcZIrFsfAkgEI3DrydJCQH
+xGrMQNiJGusJwT84cZKXRz8CgGHHDwNyTFrw1rhIutiIL7zD8KCsl/1NmNz9uc5T
+EI/rbsc7N8nFUMXCoivtQCP/zg3SY0KjK9japNLf3JMZ7vBfsl5knccRTf5mv488
+MR3QeRV8f/dntEnquXhNRFzc4D18TLChDQo2lYcppRwcqJ53Uwqg11sjNX/gKxeq
+2Pkpeb5813j5ZmjWI0Tnf4zG5FfbQgc3taRsUN+fp4vNoZE3xZomPt0wk09OBmQr
+UQh2ko90Bf8Fq1eZnYGB8D8wjENaTTiKUaYeaxQsFIpofEgiDEKrSrjqNaQWSgyE
+oj4v97xMscFOrZMarIvc
+=0Gld
 -----END PGP SIGNATURE-----
diff --git a/net-libs/qmf/files/qmf-use-standard-install-paths.patch b/net-libs/qmf/files/qmf-use-standard-install-paths.patch
deleted file mode 100644
index d387499f5308..000000000000
--- a/net-libs/qmf/files/qmf-use-standard-install-paths.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-diff -Naur qmf-9999.orig/benchmarks/tst_messageserver/tst_messageserver.pro qmf-9999/benchmarks/tst_messageserver/tst_messageserver.pro
---- qmf-9999.orig/benchmarks/tst_messageserver/tst_messageserver.pro	2011-10-28 00:16:42.818798066 +0200
-+++ qmf-9999/benchmarks/tst_messageserver/tst_messageserver.pro	2011-10-28 00:16:58.461602502 +0200
-@@ -3,7 +3,7 @@
- CONFIG += qmfmessageserver qmfclient
- 
- TARGET = tst_messageserver 
--target.path += $$QMF_INSTALL_ROOT/tests
-+target.path += $$[QT_INSTALL_DATA]/tests
- 
- BASE=../../
- include($$BASE/common.pri)
-diff -Naur qmf-9999.orig/examples/listfilterplugin/listfilterplugin.pro qmf-9999/examples/listfilterplugin/listfilterplugin.pro
---- qmf-9999.orig/examples/listfilterplugin/listfilterplugin.pro	2011-10-28 00:16:42.863797501 +0200
-+++ qmf-9999/examples/listfilterplugin/listfilterplugin.pro	2011-10-28 00:16:58.461602503 +0200
-@@ -3,7 +3,7 @@
- CONFIG += qmfclient plugin
- QT = core
- 
--target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers
-+target.path += $$[QT_INSTALL_PLUGINS]/contentmanagers
- 
- DEFINES += PLUGIN_INTERNAL
- 
-diff -Naur qmf-9999.orig/examples/messagingaccounts/messagingaccounts.pro qmf-9999/examples/messagingaccounts/messagingaccounts.pro
---- qmf-9999.orig/examples/messagingaccounts/messagingaccounts.pro	2011-10-28 00:16:42.907796951 +0200
-+++ qmf-9999/examples/messagingaccounts/messagingaccounts.pro	2011-10-28 00:16:58.461602503 +0200
-@@ -1,6 +1,6 @@
- TEMPLATE = app
- TARGET = messagingaccounts
--target.path += $$QMF_INSTALL_ROOT/bin
-+target.path += $$[QT_INSTALL_BINS]
- CONFIG += qmfclient qmfmessageserver
- 
- DEPENDPATH += .
-diff -Naur qmf-9999.orig/examples/qtmail/app/app.pro qmf-9999/examples/qtmail/app/app.pro
---- qmf-9999.orig/examples/qtmail/app/app.pro	2011-10-28 00:16:42.875797352 +0200
-+++ qmf-9999/examples/qtmail/app/app.pro	2011-10-28 00:16:58.461602503 +0200
-@@ -1,7 +1,7 @@
- TEMPLATE = app
- TARGET = qtmail 
- CONFIG += qmfutil qmfclient qmfmessageserver
--target.path += $$QMF_INSTALL_ROOT/bin
-+target.path += $$[QT_INSTALL_BINS]
- 
- DEPENDPATH += . 
- 
-diff -Naur qmf-9999.orig/examples/qtmail/libs/qmfutil/qmfutil.pro qmf-9999/examples/qtmail/libs/qmfutil/qmfutil.pro
---- qmf-9999.orig/examples/qtmail/libs/qmfutil/qmfutil.pro	2011-10-28 00:16:42.905796975 +0200
-+++ qmf-9999/examples/qtmail/libs/qmfutil/qmfutil.pro	2011-10-28 00:16:58.461602503 +0200
-@@ -3,7 +3,7 @@
- CONFIG += qmfclient
- TARGET = qmfutil 
- 
--target.path += $$QMF_INSTALL_ROOT/lib
-+target.path += $$[QT_INSTALL_LIBS]
- 
- DEFINES += QMFUTIL_INTERNAL
- 
-diff -Naur qmf-9999.orig/examples/qtmail/plugins/composers/email/email.pro qmf-9999/examples/qtmail/plugins/composers/email/email.pro
---- qmf-9999.orig/examples/qtmail/plugins/composers/email/email.pro	2011-10-28 00:16:42.865797477 +0200
-+++ qmf-9999/examples/qtmail/plugins/composers/email/email.pro	2011-10-28 00:16:58.462602491 +0200
-@@ -2,7 +2,7 @@
- TARGET = emailcomposer 
- CONFIG += qmfclient qmfutil plugin
- 
--target.path += $$QMF_INSTALL_ROOT/plugins/composers
-+target.path += $$[QT_INSTALL_PLUGINS]/composers
- 
- DEFINES += PLUGIN_INTERNAL
- 
-diff -Naur qmf-9999.orig/examples/qtmail/plugins/viewers/generic/generic.pro qmf-9999/examples/qtmail/plugins/viewers/generic/generic.pro
---- qmf-9999.orig/examples/qtmail/plugins/viewers/generic/generic.pro	2011-10-28 00:16:42.866797465 +0200
-+++ qmf-9999/examples/qtmail/plugins/viewers/generic/generic.pro	2011-10-28 00:16:58.462602491 +0200
-@@ -2,7 +2,7 @@
- TARGET = genericviewer 
- CONFIG += qmfclient qmfutil plugin
- 
--target.path += $$QMF_INSTALL_ROOT/plugins/viewers
-+target.path += $$[QT_INSTALL_PLUGINS]/viewers
- 
- # Use webkit to render mail if available
- contains(QT_CONFIG,webkit){
-diff -Naur qmf-9999.orig/examples/serverobserver/serverobserver.pro qmf-9999/examples/serverobserver/serverobserver.pro
---- qmf-9999.orig/examples/serverobserver/serverobserver.pro	2011-10-28 00:16:42.863797501 +0200
-+++ qmf-9999/examples/serverobserver/serverobserver.pro	2011-10-28 00:16:58.462602491 +0200
-@@ -1,6 +1,6 @@
- TEMPLATE = app
- TARGET = serverobserver
--target.path += $$QMF_INSTALL_ROOT/bin
-+target.path += $$[QT_INSTALL_BINS]
- CONFIG += qmfclient qmfmessageserver
- 
- DEPENDPATH += .
-diff -Naur qmf-9999.orig/src/libraries/qmfclient/qmfclient.pro qmf-9999/src/libraries/qmfclient/qmfclient.pro
---- qmf-9999.orig/src/libraries/qmfclient/qmfclient.pro	2011-10-28 00:16:42.839797803 +0200
-+++ qmf-9999/src/libraries/qmfclient/qmfclient.pro	2011-10-28 00:16:58.463602479 +0200
-@@ -4,8 +4,7 @@
- INSTALLS += target
- CONFIG += link_pkgconfig
- 
--simulator:macx:target.path += $$QMF_INSTALL_ROOT/Library/Frameworks
--else:target.path += $$QMF_INSTALL_ROOT/lib
-+target.path += $$[QT_INSTALL_LIBS]
- 
- DEFINES += QT_BUILD_QCOP_LIB QMF_INTERNAL
- win32: {
-@@ -221,7 +220,7 @@
-                 libqtopiamail-zh_CN.ts \
-                 libqtopiamail-zh_TW.ts
- 
--header_files.path=$$QMF_INSTALL_ROOT/include/qmfclient
-+header_files.path=$$[QT_INSTALL_HEADERS]/qmfclient
- header_files.files=$$PUBLIC_HEADERS
- 
- INSTALLS += header_files
-@@ -236,7 +235,7 @@
- 	CONFIG += create_pc create_prl
- 	QMAKE_PKGCONFIG_LIBDIR  = $$target.path
- 	QMAKE_PKGCONFIG_INCDIR  = $$header_files.path
--	QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-+	QMAKE_PKGCONFIG_DESTDIR = ../pkgconfig
-         LIBS += -licui18n -licuuc -licudata
-         PRIVATE_HEADERS += support/qcharsetdetector_p.h \
-                            support/qcharsetdetector.h
-diff -Naur qmf-9999.orig/src/libraries/qmfmessageserver/qmfmessageserver.pro qmf-9999/src/libraries/qmfmessageserver/qmfmessageserver.pro
---- qmf-9999.orig/src/libraries/qmfmessageserver/qmfmessageserver.pro	2011-10-28 00:16:42.862797514 +0200
-+++ qmf-9999/src/libraries/qmfmessageserver/qmfmessageserver.pro	2011-10-28 00:16:58.463602479 +0200
-@@ -3,7 +3,7 @@
- CONFIG += qmfclient
- TARGET = qmfmessageserver
- 
--target.path += $$QMF_INSTALL_ROOT/lib
-+target.path += $$[QT_INSTALL_LIBS]
- 
- QT = core network
- !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
-@@ -48,7 +48,7 @@
-            qmailtransport.cpp \
-            qmailheartbeattimer_qtimer.cpp # NB: There are multiple implementations
- 
--header_files.path=$$QMF_INSTALL_ROOT/include/qmfmessageserver
-+header_files.path=$$[QT_INSTALL_HEADERS]/qmfmessageserver
- header_files.files=$$PUBLIC_HEADERS
- 
- INSTALLS += header_files
-@@ -57,6 +57,6 @@
- 	CONFIG += create_pc create_prl
- 	QMAKE_PKGCONFIG_LIBDIR  = $$target.path
- 	QMAKE_PKGCONFIG_INCDIR  = $$header_files.path
--	QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-+	QMAKE_PKGCONFIG_DESTDIR = ../pkgconfig
- }
- include(../../../common.pri)
-diff -Naur qmf-9999.orig/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro qmf-9999/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
---- qmf-9999.orig/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro	2011-10-28 00:16:42.831797902 +0200
-+++ qmf-9999/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro	2011-10-28 00:16:58.463602479 +0200
-@@ -3,7 +3,7 @@
- CONFIG += qmfclient plugin
- QT = core
- 
--target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers
-+target.path += $$[QT_INSTALL_PLUGINS]/contentmanagers
- 
- DEFINES += PLUGIN_INTERNAL
- 
-diff -Naur qmf-9999.orig/src/plugins/messageservices/imap/imap.pro qmf-9999/src/plugins/messageservices/imap/imap.pro
---- qmf-9999.orig/src/plugins/messageservices/imap/imap.pro	2011-10-28 00:16:42.824797989 +0200
-+++ qmf-9999/src/plugins/messageservices/imap/imap.pro	2011-10-28 00:16:58.463602479 +0200
-@@ -2,7 +2,7 @@
- TARGET = imap 
- CONFIG += qmfmessageserver qmfclient plugin
- 
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
-+target.path += $$[QT_INSTALL_PLUGINS]/messageservices
- 
- QT += core network
- 
-diff -Naur qmf-9999.orig/src/plugins/messageservices/pop/pop.pro qmf-9999/src/plugins/messageservices/pop/pop.pro
---- qmf-9999.orig/src/plugins/messageservices/pop/pop.pro	2011-10-28 00:16:42.829797928 +0200
-+++ qmf-9999/src/plugins/messageservices/pop/pop.pro	2011-10-28 00:16:58.464602466 +0200
-@@ -2,7 +2,7 @@
- TARGET = pop 
- CONFIG += qmfclient qmfmessageserver plugin
- 
--target.path = $$QMF_INSTALL_ROOT/plugins/messageservices
-+target.path = $$[QT_INSTALL_PLUGINS]/messageservices
- 
- QT = core network
- 
-diff -Naur qmf-9999.orig/src/plugins/messageservices/qmfsettings/qmfsettings.pro qmf-9999/src/plugins/messageservices/qmfsettings/qmfsettings.pro
---- qmf-9999.orig/src/plugins/messageservices/qmfsettings/qmfsettings.pro	2011-10-28 00:16:42.827797953 +0200
-+++ qmf-9999/src/plugins/messageservices/qmfsettings/qmfsettings.pro	2011-10-28 00:16:58.464602466 +0200
-@@ -2,7 +2,7 @@
- TARGET = qmfsettings
- CONFIG += qmfclient qmfmessageserver plugin
- 
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
-+target.path += $$[QT_INSTALL_PLUGINS]/messageservices
- 
- QT = core network
- 
-diff -Naur qmf-9999.orig/src/plugins/messageservices/smtp/smtp.pro qmf-9999/src/plugins/messageservices/smtp/smtp.pro
---- qmf-9999.orig/src/plugins/messageservices/smtp/smtp.pro	2011-10-28 00:16:42.826797965 +0200
-+++ qmf-9999/src/plugins/messageservices/smtp/smtp.pro	2011-10-28 00:16:58.464602466 +0200
-@@ -3,7 +3,7 @@
- 
- CONFIG += qmfclient qmfmessageserver plugin
- 
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
-+target.path += $$[QT_INSTALL_PLUGINS]/messageservices
- 
- QT = core network
- 
-diff -Naur qmf-9999.orig/src/tools/messageserver/messageserver.pro qmf-9999/src/tools/messageserver/messageserver.pro
---- qmf-9999.orig/src/tools/messageserver/messageserver.pro	2011-10-28 00:16:42.832797889 +0200
-+++ qmf-9999/src/tools/messageserver/messageserver.pro	2011-10-28 00:16:58.464602466 +0200
-@@ -14,7 +14,7 @@
- QT = core
- !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
- 
--target.path += $$QMF_INSTALL_ROOT/bin
-+target.path += $$[QT_INSTALL_BINS]
- 
- DEPENDPATH += . 
- 
-diff -Naur qmf-9999.orig/tests/tests.pri qmf-9999/tests/tests.pri
---- qmf-9999.orig/tests/tests.pri	2011-10-28 00:16:42.804798239 +0200
-+++ qmf-9999/tests/tests.pri	2011-10-28 00:17:11.873434831 +0200
-@@ -4,14 +4,14 @@
-     QMAKE_MACOSX_DEPLOYMENT_TARGET=10.5
- }
- 
--target.path+=$$QMF_INSTALL_ROOT/tests
-+target.path+=$$[QT_INSTALL_DATA]/tests
- 
- QMFPATH=../../src/libraries/qmfclient
- DEPENDPATH += .
- INCLUDEPATH += . $$QMFPATH $$QMFPATH/support
- LIBS += -L$$QMFPATH/build
- macx:LIBS += -F$$QMFPATH/build
--!symbian:QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH
-+!symbian:QMAKE_LFLAGS += -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build
- 
- symbian {
-     TARGET.CAPABILITY = ReadUserData WriteUserData ReadDeviceData WriteDeviceData
-@@ -19,3 +19,5 @@
- 
- include(../common.pri)
- 
-+DESTDIR =
-+
-diff -Naur qmf-9999.orig/tests/tests.pro qmf-9999/tests/tests.pro
---- qmf-9999.orig/tests/tests.pro	2011-10-28 00:16:42.807798203 +0200
-+++ qmf-9999/tests/tests.pro	2011-10-28 00:16:58.465602453 +0200
-@@ -31,6 +31,6 @@
- 
- # Install test file description
- test_description.files = tests.xml
--test_description.path  = $$QMF_INSTALL_ROOT/tests
-+test_description.path  = $$[QT_INSTALL_DATA]/tests
- 
- INSTALLS += test_description
-diff -Naur qmf-9999.orig/tests/tst_python_email/tst_python_email.pro qmf-9999/tests/tst_python_email/tst_python_email.pro
---- qmf-9999.orig/tests/tst_python_email/tst_python_email.pro	2011-10-28 00:16:42.812798139 +0200
-+++ qmf-9999/tests/tst_python_email/tst_python_email.pro	2011-10-28 00:16:58.476602315 +0200
-@@ -5,7 +5,7 @@
- !symbian {
-     DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\"
- 
--    testdata.path = $$QMF_INSTALL_ROOT/tests/testdata
-+    testdata.path = $$[QT_INSTALL_DATA]/tests/testdata
-     testdata.files = testdata/*
- 
-     INSTALLS += testdata
diff --git a/net-libs/qmf/qmf-2.0_p201143.ebuild b/net-libs/qmf/qmf-2.0_p201143.ebuild
deleted file mode 100644
index b4c40c78d5b4..000000000000
--- a/net-libs/qmf/qmf-2.0_p201143.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/qmf-2.0_p201143.ebuild,v 1.3 2012/07/15 16:45:13 kensington Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="git://gitorious.org/qt-labs/messagingframework.git
-		https://git.gitorious.org/qt-labs/messagingframework.git"
-	SCM_ECLASS="git-2"
-	SRC_URI=
-else
-	YYYYWW="${PV#*_p}"
-	TAG="${YYYYWW:0:4}W${YYYYWW:4:2}"
-	SRC_URI="http://qt.gitorious.org/qt-labs/messagingframework/archive-tarball/${TAG} -> ${P}.tar.gz"
-	S="${WORKDIR}/qt-labs-messagingframework"
-fi
-
-inherit qt4-r2 ${SCM_ECLASS}
-
-DESCRIPTION="The Qt Messaging Framework"
-HOMEPAGE="http://qt.gitorious.org/qt-labs/messagingframework"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples test"
-
-RDEPEND="
-	dev-libs/icu
-	sys-libs/zlib
-	>=x11-libs/qt-gui-4.6.0:4
-	>=x11-libs/qt-sql-4.6.0:4
-	examples? ( >=x11-libs/qt-webkit-4.6.0:4 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=x11-libs/qt-test-4.6.0:4 )
-"
-
-DOCS="CHANGES"
-PATCHES=(
-	# http://bugreports.qt.nokia.com/browse/QTMOBILITY-374
-	"${FILESDIR}/${PN}-use-standard-install-paths.patch"
-)
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	sed -i	-e '/benchmarks/d' \
-		-e '/tests/d' \
-		messagingframework.pro || die
-
-	if ! use examples; then
-		sed -i -e '/examples/d' messagingframework.pro || die
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
-	cd "${S}"/tests
-
-	einfo "Building tests"
-	eqmake4 && emake
-
-	einfo "Running tests"
-	export QMF_DATA="${T}"
-	local fail=false test=
-	for test in locks longstream longstring python_email qlogsystem \
-			qmailaddress qmailcodec qmaillog qmailmessage \
-			qmailmessagebody qmailmessageheader qmailmessagepart \
-			qmailnamespace qprivateimplementation; do
-		if ! LC_ALL=C ./tst_${test}/tst_${test}; then
-			eerror "'${test}' test failed!"
-			fail=true
-		fi
-		echo
-	done
-	${fail} && die "some tests have failed!"
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	if use doc; then
-		dohtml -r doc/html/*
-		emake qch_docs
-		dodoc doc/html/qmf.qch
-		docompress -x /usr/share/doc/${PF}/qmf.qch
-	fi
-}
diff --git a/net-libs/qmf/qmf-2.0_p201209.ebuild b/net-libs/qmf/qmf-2.0_p201209-r1.ebuild
index c759ade60ec2..688f6f26b36f 100644
--- a/net-libs/qmf/qmf-2.0_p201209.ebuild
+++ b/net-libs/qmf/qmf-2.0_p201209-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/qmf-2.0_p201209.ebuild,v 1.2 2012/05/03 13:19:57 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/qmf-2.0_p201209-r1.ebuild,v 1.1 2013/02/09 09:00:11 pesa Exp $
 
-EAPI=4
+EAPI=5
 
 inherit qt4-r2
 
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug doc examples test"
 
 RDEPEND="
-	dev-libs/icu
+	dev-libs/icu:=
 	sys-libs/zlib
 	>=x11-libs/qt-core-4.6.0:4
 	>=x11-libs/qt-gui-4.6.0:4