| 1 |
commit: 709e1d8a0bdf31d4711e00b3c4a17fe083ce1da6 |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Apr 4 10:45:55 2012 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 4 10:45:55 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=709e1d8a |
| 7 |
|
| 8 |
[net-libs/qmf] Update patch and change installation paths to follow upstream. |
| 9 |
|
| 10 |
--- |
| 11 |
net-libs/qmf/files/qmf-tests.patch | 18 ++ |
| 12 |
.../qmf/files/qmf-use-standard-install-paths.patch | 275 -------------------- |
| 13 |
net-libs/qmf/qmf-9999.ebuild | 47 ++-- |
| 14 |
3 files changed, 46 insertions(+), 294 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-libs/qmf/files/qmf-tests.patch b/net-libs/qmf/files/qmf-tests.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..6262d19 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-libs/qmf/files/qmf-tests.patch |
| 21 |
@@ -0,0 +1,18 @@ |
| 22 |
+diff -Naur qmf-9999.orig/tests/tests.pri qmf-9999/tests/tests.pri |
| 23 |
+--- qmf-9999.orig/tests/tests.pri 2012-04-04 01:56:41.220535387 +0200 |
| 24 |
++++ qmf-9999/tests/tests.pri 2012-04-04 01:57:11.031162699 +0200 |
| 25 |
+@@ -11,7 +11,7 @@ |
| 26 |
+ INCLUDEPATH += . $$QMFPATH $$QMFPATH/support |
| 27 |
+ LIBS += -L$$QMFPATH/build |
| 28 |
+ macx:LIBS += -F$$QMFPATH/build |
| 29 |
+-!symbian:QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH |
| 30 |
++!symbian:QMAKE_LFLAGS += -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build |
| 31 |
+ |
| 32 |
+ symbian { |
| 33 |
+ TARGET.CAPABILITY = ReadUserData WriteUserData ReadDeviceData WriteDeviceData |
| 34 |
+@@ -19,3 +19,5 @@ |
| 35 |
+ |
| 36 |
+ include(../common.pri) |
| 37 |
+ |
| 38 |
++DESTDIR = |
| 39 |
++ |
| 40 |
|
| 41 |
diff --git a/net-libs/qmf/files/qmf-use-standard-install-paths.patch b/net-libs/qmf/files/qmf-use-standard-install-paths.patch |
| 42 |
deleted file mode 100644 |
| 43 |
index d387499..0000000 |
| 44 |
--- a/net-libs/qmf/files/qmf-use-standard-install-paths.patch |
| 45 |
+++ /dev/null |
| 46 |
@@ -1,275 +0,0 @@ |
| 47 |
-diff -Naur qmf-9999.orig/benchmarks/tst_messageserver/tst_messageserver.pro qmf-9999/benchmarks/tst_messageserver/tst_messageserver.pro |
| 48 |
---- qmf-9999.orig/benchmarks/tst_messageserver/tst_messageserver.pro 2011-10-28 00:16:42.818798066 +0200 |
| 49 |
-+++ qmf-9999/benchmarks/tst_messageserver/tst_messageserver.pro 2011-10-28 00:16:58.461602502 +0200 |
| 50 |
-@@ -3,7 +3,7 @@ |
| 51 |
- CONFIG += qmfmessageserver qmfclient |
| 52 |
- |
| 53 |
- TARGET = tst_messageserver |
| 54 |
--target.path += $$QMF_INSTALL_ROOT/tests |
| 55 |
-+target.path += $$[QT_INSTALL_DATA]/tests |
| 56 |
- |
| 57 |
- BASE=../../ |
| 58 |
- include($$BASE/common.pri) |
| 59 |
-diff -Naur qmf-9999.orig/examples/listfilterplugin/listfilterplugin.pro qmf-9999/examples/listfilterplugin/listfilterplugin.pro |
| 60 |
---- qmf-9999.orig/examples/listfilterplugin/listfilterplugin.pro 2011-10-28 00:16:42.863797501 +0200 |
| 61 |
-+++ qmf-9999/examples/listfilterplugin/listfilterplugin.pro 2011-10-28 00:16:58.461602503 +0200 |
| 62 |
-@@ -3,7 +3,7 @@ |
| 63 |
- CONFIG += qmfclient plugin |
| 64 |
- QT = core |
| 65 |
- |
| 66 |
--target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers |
| 67 |
-+target.path += $$[QT_INSTALL_PLUGINS]/contentmanagers |
| 68 |
- |
| 69 |
- DEFINES += PLUGIN_INTERNAL |
| 70 |
- |
| 71 |
-diff -Naur qmf-9999.orig/examples/messagingaccounts/messagingaccounts.pro qmf-9999/examples/messagingaccounts/messagingaccounts.pro |
| 72 |
---- qmf-9999.orig/examples/messagingaccounts/messagingaccounts.pro 2011-10-28 00:16:42.907796951 +0200 |
| 73 |
-+++ qmf-9999/examples/messagingaccounts/messagingaccounts.pro 2011-10-28 00:16:58.461602503 +0200 |
| 74 |
-@@ -1,6 +1,6 @@ |
| 75 |
- TEMPLATE = app |
| 76 |
- TARGET = messagingaccounts |
| 77 |
--target.path += $$QMF_INSTALL_ROOT/bin |
| 78 |
-+target.path += $$[QT_INSTALL_BINS] |
| 79 |
- CONFIG += qmfclient qmfmessageserver |
| 80 |
- |
| 81 |
- DEPENDPATH += . |
| 82 |
-diff -Naur qmf-9999.orig/examples/qtmail/app/app.pro qmf-9999/examples/qtmail/app/app.pro |
| 83 |
---- qmf-9999.orig/examples/qtmail/app/app.pro 2011-10-28 00:16:42.875797352 +0200 |
| 84 |
-+++ qmf-9999/examples/qtmail/app/app.pro 2011-10-28 00:16:58.461602503 +0200 |
| 85 |
-@@ -1,7 +1,7 @@ |
| 86 |
- TEMPLATE = app |
| 87 |
- TARGET = qtmail |
| 88 |
- CONFIG += qmfutil qmfclient qmfmessageserver |
| 89 |
--target.path += $$QMF_INSTALL_ROOT/bin |
| 90 |
-+target.path += $$[QT_INSTALL_BINS] |
| 91 |
- |
| 92 |
- DEPENDPATH += . |
| 93 |
- |
| 94 |
-diff -Naur qmf-9999.orig/examples/qtmail/libs/qmfutil/qmfutil.pro qmf-9999/examples/qtmail/libs/qmfutil/qmfutil.pro |
| 95 |
---- qmf-9999.orig/examples/qtmail/libs/qmfutil/qmfutil.pro 2011-10-28 00:16:42.905796975 +0200 |
| 96 |
-+++ qmf-9999/examples/qtmail/libs/qmfutil/qmfutil.pro 2011-10-28 00:16:58.461602503 +0200 |
| 97 |
-@@ -3,7 +3,7 @@ |
| 98 |
- CONFIG += qmfclient |
| 99 |
- TARGET = qmfutil |
| 100 |
- |
| 101 |
--target.path += $$QMF_INSTALL_ROOT/lib |
| 102 |
-+target.path += $$[QT_INSTALL_LIBS] |
| 103 |
- |
| 104 |
- DEFINES += QMFUTIL_INTERNAL |
| 105 |
- |
| 106 |
-diff -Naur qmf-9999.orig/examples/qtmail/plugins/composers/email/email.pro qmf-9999/examples/qtmail/plugins/composers/email/email.pro |
| 107 |
---- qmf-9999.orig/examples/qtmail/plugins/composers/email/email.pro 2011-10-28 00:16:42.865797477 +0200 |
| 108 |
-+++ qmf-9999/examples/qtmail/plugins/composers/email/email.pro 2011-10-28 00:16:58.462602491 +0200 |
| 109 |
-@@ -2,7 +2,7 @@ |
| 110 |
- TARGET = emailcomposer |
| 111 |
- CONFIG += qmfclient qmfutil plugin |
| 112 |
- |
| 113 |
--target.path += $$QMF_INSTALL_ROOT/plugins/composers |
| 114 |
-+target.path += $$[QT_INSTALL_PLUGINS]/composers |
| 115 |
- |
| 116 |
- DEFINES += PLUGIN_INTERNAL |
| 117 |
- |
| 118 |
-diff -Naur qmf-9999.orig/examples/qtmail/plugins/viewers/generic/generic.pro qmf-9999/examples/qtmail/plugins/viewers/generic/generic.pro |
| 119 |
---- qmf-9999.orig/examples/qtmail/plugins/viewers/generic/generic.pro 2011-10-28 00:16:42.866797465 +0200 |
| 120 |
-+++ qmf-9999/examples/qtmail/plugins/viewers/generic/generic.pro 2011-10-28 00:16:58.462602491 +0200 |
| 121 |
-@@ -2,7 +2,7 @@ |
| 122 |
- TARGET = genericviewer |
| 123 |
- CONFIG += qmfclient qmfutil plugin |
| 124 |
- |
| 125 |
--target.path += $$QMF_INSTALL_ROOT/plugins/viewers |
| 126 |
-+target.path += $$[QT_INSTALL_PLUGINS]/viewers |
| 127 |
- |
| 128 |
- # Use webkit to render mail if available |
| 129 |
- contains(QT_CONFIG,webkit){ |
| 130 |
-diff -Naur qmf-9999.orig/examples/serverobserver/serverobserver.pro qmf-9999/examples/serverobserver/serverobserver.pro |
| 131 |
---- qmf-9999.orig/examples/serverobserver/serverobserver.pro 2011-10-28 00:16:42.863797501 +0200 |
| 132 |
-+++ qmf-9999/examples/serverobserver/serverobserver.pro 2011-10-28 00:16:58.462602491 +0200 |
| 133 |
-@@ -1,6 +1,6 @@ |
| 134 |
- TEMPLATE = app |
| 135 |
- TARGET = serverobserver |
| 136 |
--target.path += $$QMF_INSTALL_ROOT/bin |
| 137 |
-+target.path += $$[QT_INSTALL_BINS] |
| 138 |
- CONFIG += qmfclient qmfmessageserver |
| 139 |
- |
| 140 |
- DEPENDPATH += . |
| 141 |
-diff -Naur qmf-9999.orig/src/libraries/qmfclient/qmfclient.pro qmf-9999/src/libraries/qmfclient/qmfclient.pro |
| 142 |
---- qmf-9999.orig/src/libraries/qmfclient/qmfclient.pro 2011-10-28 00:16:42.839797803 +0200 |
| 143 |
-+++ qmf-9999/src/libraries/qmfclient/qmfclient.pro 2011-10-28 00:16:58.463602479 +0200 |
| 144 |
-@@ -4,8 +4,7 @@ |
| 145 |
- INSTALLS += target |
| 146 |
- CONFIG += link_pkgconfig |
| 147 |
- |
| 148 |
--simulator:macx:target.path += $$QMF_INSTALL_ROOT/Library/Frameworks |
| 149 |
--else:target.path += $$QMF_INSTALL_ROOT/lib |
| 150 |
-+target.path += $$[QT_INSTALL_LIBS] |
| 151 |
- |
| 152 |
- DEFINES += QT_BUILD_QCOP_LIB QMF_INTERNAL |
| 153 |
- win32: { |
| 154 |
-@@ -221,7 +220,7 @@ |
| 155 |
- libqtopiamail-zh_CN.ts \ |
| 156 |
- libqtopiamail-zh_TW.ts |
| 157 |
- |
| 158 |
--header_files.path=$$QMF_INSTALL_ROOT/include/qmfclient |
| 159 |
-+header_files.path=$$[QT_INSTALL_HEADERS]/qmfclient |
| 160 |
- header_files.files=$$PUBLIC_HEADERS |
| 161 |
- |
| 162 |
- INSTALLS += header_files |
| 163 |
-@@ -236,7 +235,7 @@ |
| 164 |
- CONFIG += create_pc create_prl |
| 165 |
- QMAKE_PKGCONFIG_LIBDIR = $$target.path |
| 166 |
- QMAKE_PKGCONFIG_INCDIR = $$header_files.path |
| 167 |
-- QMAKE_PKGCONFIG_DESTDIR = pkgconfig |
| 168 |
-+ QMAKE_PKGCONFIG_DESTDIR = ../pkgconfig |
| 169 |
- LIBS += -licui18n -licuuc -licudata |
| 170 |
- PRIVATE_HEADERS += support/qcharsetdetector_p.h \ |
| 171 |
- support/qcharsetdetector.h |
| 172 |
-diff -Naur qmf-9999.orig/src/libraries/qmfmessageserver/qmfmessageserver.pro qmf-9999/src/libraries/qmfmessageserver/qmfmessageserver.pro |
| 173 |
---- qmf-9999.orig/src/libraries/qmfmessageserver/qmfmessageserver.pro 2011-10-28 00:16:42.862797514 +0200 |
| 174 |
-+++ qmf-9999/src/libraries/qmfmessageserver/qmfmessageserver.pro 2011-10-28 00:16:58.463602479 +0200 |
| 175 |
-@@ -3,7 +3,7 @@ |
| 176 |
- CONFIG += qmfclient |
| 177 |
- TARGET = qmfmessageserver |
| 178 |
- |
| 179 |
--target.path += $$QMF_INSTALL_ROOT/lib |
| 180 |
-+target.path += $$[QT_INSTALL_LIBS] |
| 181 |
- |
| 182 |
- QT = core network |
| 183 |
- !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui |
| 184 |
-@@ -48,7 +48,7 @@ |
| 185 |
- qmailtransport.cpp \ |
| 186 |
- qmailheartbeattimer_qtimer.cpp # NB: There are multiple implementations |
| 187 |
- |
| 188 |
--header_files.path=$$QMF_INSTALL_ROOT/include/qmfmessageserver |
| 189 |
-+header_files.path=$$[QT_INSTALL_HEADERS]/qmfmessageserver |
| 190 |
- header_files.files=$$PUBLIC_HEADERS |
| 191 |
- |
| 192 |
- INSTALLS += header_files |
| 193 |
-@@ -57,6 +57,6 @@ |
| 194 |
- CONFIG += create_pc create_prl |
| 195 |
- QMAKE_PKGCONFIG_LIBDIR = $$target.path |
| 196 |
- QMAKE_PKGCONFIG_INCDIR = $$header_files.path |
| 197 |
-- QMAKE_PKGCONFIG_DESTDIR = pkgconfig |
| 198 |
-+ QMAKE_PKGCONFIG_DESTDIR = ../pkgconfig |
| 199 |
- } |
| 200 |
- include(../../../common.pri) |
| 201 |
-diff -Naur qmf-9999.orig/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro qmf-9999/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro |
| 202 |
---- qmf-9999.orig/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro 2011-10-28 00:16:42.831797902 +0200 |
| 203 |
-+++ qmf-9999/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro 2011-10-28 00:16:58.463602479 +0200 |
| 204 |
-@@ -3,7 +3,7 @@ |
| 205 |
- CONFIG += qmfclient plugin |
| 206 |
- QT = core |
| 207 |
- |
| 208 |
--target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers |
| 209 |
-+target.path += $$[QT_INSTALL_PLUGINS]/contentmanagers |
| 210 |
- |
| 211 |
- DEFINES += PLUGIN_INTERNAL |
| 212 |
- |
| 213 |
-diff -Naur qmf-9999.orig/src/plugins/messageservices/imap/imap.pro qmf-9999/src/plugins/messageservices/imap/imap.pro |
| 214 |
---- qmf-9999.orig/src/plugins/messageservices/imap/imap.pro 2011-10-28 00:16:42.824797989 +0200 |
| 215 |
-+++ qmf-9999/src/plugins/messageservices/imap/imap.pro 2011-10-28 00:16:58.463602479 +0200 |
| 216 |
-@@ -2,7 +2,7 @@ |
| 217 |
- TARGET = imap |
| 218 |
- CONFIG += qmfmessageserver qmfclient plugin |
| 219 |
- |
| 220 |
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices |
| 221 |
-+target.path += $$[QT_INSTALL_PLUGINS]/messageservices |
| 222 |
- |
| 223 |
- QT += core network |
| 224 |
- |
| 225 |
-diff -Naur qmf-9999.orig/src/plugins/messageservices/pop/pop.pro qmf-9999/src/plugins/messageservices/pop/pop.pro |
| 226 |
---- qmf-9999.orig/src/plugins/messageservices/pop/pop.pro 2011-10-28 00:16:42.829797928 +0200 |
| 227 |
-+++ qmf-9999/src/plugins/messageservices/pop/pop.pro 2011-10-28 00:16:58.464602466 +0200 |
| 228 |
-@@ -2,7 +2,7 @@ |
| 229 |
- TARGET = pop |
| 230 |
- CONFIG += qmfclient qmfmessageserver plugin |
| 231 |
- |
| 232 |
--target.path = $$QMF_INSTALL_ROOT/plugins/messageservices |
| 233 |
-+target.path = $$[QT_INSTALL_PLUGINS]/messageservices |
| 234 |
- |
| 235 |
- QT = core network |
| 236 |
- |
| 237 |
-diff -Naur qmf-9999.orig/src/plugins/messageservices/qmfsettings/qmfsettings.pro qmf-9999/src/plugins/messageservices/qmfsettings/qmfsettings.pro |
| 238 |
---- qmf-9999.orig/src/plugins/messageservices/qmfsettings/qmfsettings.pro 2011-10-28 00:16:42.827797953 +0200 |
| 239 |
-+++ qmf-9999/src/plugins/messageservices/qmfsettings/qmfsettings.pro 2011-10-28 00:16:58.464602466 +0200 |
| 240 |
-@@ -2,7 +2,7 @@ |
| 241 |
- TARGET = qmfsettings |
| 242 |
- CONFIG += qmfclient qmfmessageserver plugin |
| 243 |
- |
| 244 |
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices |
| 245 |
-+target.path += $$[QT_INSTALL_PLUGINS]/messageservices |
| 246 |
- |
| 247 |
- QT = core network |
| 248 |
- |
| 249 |
-diff -Naur qmf-9999.orig/src/plugins/messageservices/smtp/smtp.pro qmf-9999/src/plugins/messageservices/smtp/smtp.pro |
| 250 |
---- qmf-9999.orig/src/plugins/messageservices/smtp/smtp.pro 2011-10-28 00:16:42.826797965 +0200 |
| 251 |
-+++ qmf-9999/src/plugins/messageservices/smtp/smtp.pro 2011-10-28 00:16:58.464602466 +0200 |
| 252 |
-@@ -3,7 +3,7 @@ |
| 253 |
- |
| 254 |
- CONFIG += qmfclient qmfmessageserver plugin |
| 255 |
- |
| 256 |
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices |
| 257 |
-+target.path += $$[QT_INSTALL_PLUGINS]/messageservices |
| 258 |
- |
| 259 |
- QT = core network |
| 260 |
- |
| 261 |
-diff -Naur qmf-9999.orig/src/tools/messageserver/messageserver.pro qmf-9999/src/tools/messageserver/messageserver.pro |
| 262 |
---- qmf-9999.orig/src/tools/messageserver/messageserver.pro 2011-10-28 00:16:42.832797889 +0200 |
| 263 |
-+++ qmf-9999/src/tools/messageserver/messageserver.pro 2011-10-28 00:16:58.464602466 +0200 |
| 264 |
-@@ -14,7 +14,7 @@ |
| 265 |
- QT = core |
| 266 |
- !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui |
| 267 |
- |
| 268 |
--target.path += $$QMF_INSTALL_ROOT/bin |
| 269 |
-+target.path += $$[QT_INSTALL_BINS] |
| 270 |
- |
| 271 |
- DEPENDPATH += . |
| 272 |
- |
| 273 |
-diff -Naur qmf-9999.orig/tests/tests.pri qmf-9999/tests/tests.pri |
| 274 |
---- qmf-9999.orig/tests/tests.pri 2011-10-28 00:16:42.804798239 +0200 |
| 275 |
-+++ qmf-9999/tests/tests.pri 2011-10-28 00:17:11.873434831 +0200 |
| 276 |
-@@ -4,14 +4,14 @@ |
| 277 |
- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.5 |
| 278 |
- } |
| 279 |
- |
| 280 |
--target.path+=$$QMF_INSTALL_ROOT/tests |
| 281 |
-+target.path+=$$[QT_INSTALL_DATA]/tests |
| 282 |
- |
| 283 |
- QMFPATH=../../src/libraries/qmfclient |
| 284 |
- DEPENDPATH += . |
| 285 |
- INCLUDEPATH += . $$QMFPATH $$QMFPATH/support |
| 286 |
- LIBS += -L$$QMFPATH/build |
| 287 |
- macx:LIBS += -F$$QMFPATH/build |
| 288 |
--!symbian:QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH |
| 289 |
-+!symbian:QMAKE_LFLAGS += -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build |
| 290 |
- |
| 291 |
- symbian { |
| 292 |
- TARGET.CAPABILITY = ReadUserData WriteUserData ReadDeviceData WriteDeviceData |
| 293 |
-@@ -19,3 +19,5 @@ |
| 294 |
- |
| 295 |
- include(../common.pri) |
| 296 |
- |
| 297 |
-+DESTDIR = |
| 298 |
-+ |
| 299 |
-diff -Naur qmf-9999.orig/tests/tests.pro qmf-9999/tests/tests.pro |
| 300 |
---- qmf-9999.orig/tests/tests.pro 2011-10-28 00:16:42.807798203 +0200 |
| 301 |
-+++ qmf-9999/tests/tests.pro 2011-10-28 00:16:58.465602453 +0200 |
| 302 |
-@@ -31,6 +31,6 @@ |
| 303 |
- |
| 304 |
- # Install test file description |
| 305 |
- test_description.files = tests.xml |
| 306 |
--test_description.path = $$QMF_INSTALL_ROOT/tests |
| 307 |
-+test_description.path = $$[QT_INSTALL_DATA]/tests |
| 308 |
- |
| 309 |
- INSTALLS += test_description |
| 310 |
-diff -Naur qmf-9999.orig/tests/tst_python_email/tst_python_email.pro qmf-9999/tests/tst_python_email/tst_python_email.pro |
| 311 |
---- qmf-9999.orig/tests/tst_python_email/tst_python_email.pro 2011-10-28 00:16:42.812798139 +0200 |
| 312 |
-+++ qmf-9999/tests/tst_python_email/tst_python_email.pro 2011-10-28 00:16:58.476602315 +0200 |
| 313 |
-@@ -5,7 +5,7 @@ |
| 314 |
- !symbian { |
| 315 |
- DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\" |
| 316 |
- |
| 317 |
-- testdata.path = $$QMF_INSTALL_ROOT/tests/testdata |
| 318 |
-+ testdata.path = $$[QT_INSTALL_DATA]/tests/testdata |
| 319 |
- testdata.files = testdata/* |
| 320 |
- |
| 321 |
- INSTALLS += testdata |
| 322 |
|
| 323 |
diff --git a/net-libs/qmf/qmf-9999.ebuild b/net-libs/qmf/qmf-9999.ebuild |
| 324 |
index 7bfa02c..5323bc3 100644 |
| 325 |
--- a/net-libs/qmf/qmf-9999.ebuild |
| 326 |
+++ b/net-libs/qmf/qmf-9999.ebuild |
| 327 |
@@ -1,23 +1,20 @@ |
| 328 |
-# Copyright 1999-2011 Gentoo Foundation |
| 329 |
+# Copyright 1999-2012 Gentoo Foundation |
| 330 |
# Distributed under the terms of the GNU General Public License v2 |
| 331 |
# $Header: $ |
| 332 |
|
| 333 |
EAPI=4 |
| 334 |
|
| 335 |
-if [[ ${PV} == *9999 ]]; then |
| 336 |
+inherit qt4-r2 |
| 337 |
+ |
| 338 |
+if [[ ${PV} == *9999* ]]; then |
| 339 |
+ inherit git-2 |
| 340 |
EGIT_REPO_URI="git://gitorious.org/qt-labs/messagingframework.git |
| 341 |
https://git.gitorious.org/qt-labs/messagingframework.git" |
| 342 |
- SCM_ECLASS="git-2" |
| 343 |
- SRC_URI= |
| 344 |
else |
| 345 |
- YYYYWW="${PV#*_p}" |
| 346 |
- TAG="${YYYYWW:0:4}W${YYYYWW:4:2}" |
| 347 |
- SRC_URI="http://qt.gitorious.org/qt-labs/messagingframework/archive-tarball/${TAG} -> ${P}.tar.gz" |
| 348 |
- S="${WORKDIR}/qt-labs-messagingframework" |
| 349 |
+ SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.gz" |
| 350 |
+ S=${WORKDIR}/qt-labs-messagingframework |
| 351 |
fi |
| 352 |
|
| 353 |
-inherit qt4-r2 ${SCM_ECLASS} |
| 354 |
- |
| 355 |
DESCRIPTION="The Qt Messaging Framework" |
| 356 |
HOMEPAGE="http://qt.gitorious.org/qt-labs/messagingframework" |
| 357 |
|
| 358 |
@@ -29,24 +26,30 @@ IUSE="debug doc examples test" |
| 359 |
RDEPEND=" |
| 360 |
dev-libs/icu |
| 361 |
sys-libs/zlib |
| 362 |
- >=x11-libs/qt-gui-4.6.0 |
| 363 |
- >=x11-libs/qt-sql-4.6.0 |
| 364 |
- examples? ( >=x11-libs/qt-webkit-4.6.0 ) |
| 365 |
+ >=x11-libs/qt-core-4.6.0:4 |
| 366 |
+ >=x11-libs/qt-gui-4.6.0:4 |
| 367 |
+ >=x11-libs/qt-sql-4.6.0:4 |
| 368 |
+ examples? ( >=x11-libs/qt-webkit-4.6.0:4 ) |
| 369 |
" |
| 370 |
DEPEND="${RDEPEND} |
| 371 |
dev-util/pkgconfig |
| 372 |
- test? ( >=x11-libs/qt-test-4.6.0 ) |
| 373 |
+ test? ( >=x11-libs/qt-test-4.6.0:4 ) |
| 374 |
+ !!<net-libs/qmf-2.0_p201209 |
| 375 |
" |
| 376 |
|
| 377 |
DOCS="CHANGES" |
| 378 |
+ |
| 379 |
PATCHES=( |
| 380 |
- # http://bugreports.qt.nokia.com/browse/QTMOBILITY-374 |
| 381 |
- "${FILESDIR}/${PN}-use-standard-install-paths.patch" |
| 382 |
+ "${FILESDIR}/${PN}-tests.patch" |
| 383 |
) |
| 384 |
|
| 385 |
src_prepare() { |
| 386 |
qt4-r2_src_prepare |
| 387 |
|
| 388 |
+ # fix libdir |
| 389 |
+ find "${S}" -name '*.pro' -type f -print0 | xargs -0 \ |
| 390 |
+ sed -i -re "s:/lib(/|$):/$(get_libdir)\1:" || die |
| 391 |
+ |
| 392 |
sed -i -e '/benchmarks/d' \ |
| 393 |
-e '/tests/d' \ |
| 394 |
messagingframework.pro || die |
| 395 |
@@ -56,17 +59,22 @@ src_prepare() { |
| 396 |
fi |
| 397 |
} |
| 398 |
|
| 399 |
+src_configure() { |
| 400 |
+ eqmake4 QMF_INSTALL_ROOT="${EPREFIX}/usr" |
| 401 |
+} |
| 402 |
+ |
| 403 |
src_test() { |
| 404 |
echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}" |
| 405 |
cd "${S}"/tests |
| 406 |
|
| 407 |
einfo "Building tests" |
| 408 |
- eqmake4 && emake |
| 409 |
+ eqmake4 QMF_INSTALL_ROOT="${EPREFIX}/usr" |
| 410 |
+ emake |
| 411 |
|
| 412 |
einfo "Running tests" |
| 413 |
export QMF_DATA="${T}" |
| 414 |
local fail=false test= |
| 415 |
- for test in locks longstream longstring python_email qlogsystem \ |
| 416 |
+ for test in locks longstream longstring python_email qcop qlogsystem \ |
| 417 |
qmailaddress qmailcodec qmaillog qmailmessage \ |
| 418 |
qmailmessagebody qmailmessageheader qmailmessagepart \ |
| 419 |
qmailnamespace qprivateimplementation; do |
| 420 |
@@ -83,8 +91,9 @@ src_install() { |
| 421 |
qt4-r2_src_install |
| 422 |
|
| 423 |
if use doc; then |
| 424 |
+ emake docs |
| 425 |
+ |
| 426 |
dohtml -r doc/html/* |
| 427 |
- emake qch_docs |
| 428 |
dodoc doc/html/qmf.qch |
| 429 |
docompress -x /usr/share/doc/${PF}/qmf.qch |
| 430 |
fi |
Archives