Version bump.

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

5 files changed, 31 insertions, 131 deletions

diff --git a/net-libs/qmf/ChangeLog b/net-libs/qmf/ChangeLog
index dc7f728ec4c6..6ae249a2adc1 100644
--- a/net-libs/qmf/ChangeLog
+++ b/net-libs/qmf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/qmf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/ChangeLog,v 1.9 2013/08/01 08:29:51 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/ChangeLog,v 1.10 2013/08/11 23:35:42 pesa Exp $
+
+*qmf-4.0.3 (11 Aug 2013)
+
+  11 Aug 2013; Davide Pesavento <pesa@gentoo.org> +qmf-4.0.3.ebuild,
+  -files/qmf-4.0.2-include.patch, -files/qmf-4.0.2-visibility.patch,
+  -qmf-4.0.2.ebuild:
+  Version bump.
 
   01 Aug 2013; Davide Pesavento <pesa@gentoo.org> -files/qmf-tests.patch,
   -qmf-2.0_p201209-r1.ebuild:
diff --git a/net-libs/qmf/Manifest b/net-libs/qmf/Manifest
index 4a2dd44ed4ae..8701778b9bdb 100644
--- a/net-libs/qmf/Manifest
+++ b/net-libs/qmf/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX qmf-4.0.2-include.patch 1194 SHA256 75671b5f53d32b8e43d939b2693b59040b4d095fb8e47135e9e96bc73b8cbab2 SHA512 1a6c2cdd6e61e05c9b624b4d7782d70ecdfe5c94e88ce8dab6341ab730148b6665d4f88cd425d9deb524c978907c863df7dae3346ac4bc0fea18596dfdb41272 WHIRLPOOL 3ea30c7a0bd928a601097ebfaf1adaae032db931ecdd72240a720fb96c9018eee197460f506fb0a68a88bafeddb9c0c0adf27f9c5d9e723bc7e91b7312f559c1
 AUX qmf-4.0.2-tests.patch 457 SHA256 c2c453898565a55e49cb35f745c86ac61d640344febf6a329f303dafcc90bfdd SHA512 862b4d667e5e61551521b41c8c0e092ad5d0833c779b6a9531a802df7cc8c32b9504974a84e5f2ffc4d416aa69819c22726dd9ae4ccec0b60890482a3e207632 WHIRLPOOL 9d8b2e0932db8d45f3bdcb369adb6bd84e0a86f7ddba6d975233cddb98f964ab224bdce41b9b880e7437cea01f138d15b0f3fde65b3307fc02cc11dcb6be1a40
-AUX qmf-4.0.2-visibility.patch 2257 SHA256 e9c813462cfd4291f33449af192f193fccaf2bb6f6dd0720849527435411a371 SHA512 332ede30e8e1fbc8c9c757b7e2e3d9de9c81ba9770732bcdea45c30e99545892c5408bde14454adc85edcd1c3d55b08fc47fe26682f4f8be6f1e35adbb89e207 WHIRLPOOL 7a36d4aa0438529a4b0b3a9b6be2a1d6953a45021973f036d9c824a98ac8fd7376a57417617af0bfb9e54dd295c17689f86cae0793e22d6a6c9558f036ab3b2e
-DIST qmf-4.0.2.tar.gz 2098216 SHA256 04dc987b2ce7bc8390133956e86972839c226190f410337fa66e952743559df1 SHA512 dc642f4e0f5005d1a93002cfff6d424cd0c49ce3c2369b55c18b5a8866335f2c6b309eaff81a8e3f88056aa35dbe995a10a7340d6aea3b23a0487abc38591889 WHIRLPOOL 41452cbb3af2558fc68edb39b958ec533cbe57600ddfd103cad1ff278132c4304e7fc66b2c5125e306784a86603e91265acbc6f3dd17862dd4127acc22bbe804
-EBUILD qmf-4.0.2.ebuild 2568 SHA256 1afa3416788486d211cc33d15b32d810bba75973ff31de657e8a85fbbe145867 SHA512 9433031f06be295a0262649766871a9dcb6b6d413ada22ccce35ea4d3617a037784488641466d5690b20b3b7bcb9178e0f303bfbb83bb3f66381caf4d5ca33c3 WHIRLPOOL f6b5d4a3cba4e7b83f13846078da9a588e02b6fbb64b9f4508c0771b907c20533fb35cfed2710b0d5069fa381f905933d30ba14e13101c41f74efd91a35bc34e
-MISC ChangeLog 1781 SHA256 9310a6170209be9c84d55c089b5d7cc111e6e5c9c4a30e97aadbb695babb55c6 SHA512 ba438e77f534fb632c25a9983dfccc6396109b22eeef1769545c522078c26017eca6eee3dad7d7a5ad144c77ad7cea5d1be245f089126beb0b230725510d57bd WHIRLPOOL 69441fa40b46705f067802977f96002fbb715571513e800b5a5263037fa4713671ffdd7b5bc8c92557d5273358815b11526f36a3d4457a5c94a6e3b29073769e
+DIST qmf-4.0.3.tar.gz 2099647 SHA256 0de3f27a49d5c7d67db3266ba62b61e260a850ea88420efb03db00502e45e39a SHA512 2df508ccc5d14bd1f0e68c2e07bded8b89c0c970302a130975c1ae3e49935ff46e77741a5c63580394c423fc56e526d3ac7738c740fc29f5d2eaec7fe2c8005d WHIRLPOOL 907315c32a900c60dd4b4a2122fef97454f5c922936b6c9ea269ec4c0d4d74ccea4f2d2248f348bb691057f4cbf36ddf11a2f3ab2192ff886db81873bcec60d3
+EBUILD qmf-4.0.3.ebuild 2495 SHA256 acc81f37b33accd7357b58020ba2aa1ddfab89c75571bf444f5516b6fcb7ab0e SHA512 f3f6e6f3875073c43e3418303c4f4f3d1281e6ad85036046d89bbe4798b6b17a92e5cfceb64e14890d42a4b273aaf6adb1154f764df5b0f5b54f0ac1a4faaaf5 WHIRLPOOL f63e666e57c4b8a56278c40f3f3a851c112e0e5b28688d1712d9931c18b7acf8f8bd4165a5f43bec05803c66ce6aec6185e5336c318ac3431d83a4a41fa3c25a
+MISC ChangeLog 1984 SHA256 cbf197d9d7f4ba2672ce3a72b5317046cecd1b111b07bc7301da18ec808c7f7a SHA512 434b957ea93bd2966df487c587e83375580929ed7393d0f49205a2b92df211945083422ba7e42909e1396e0d1847bd3e9b3bf20d2c395a90c961cd6a130f1df5 WHIRLPOOL ab870a238f4fcf9a70af2d54ec0cf695eaa96b1f6930d4ffe171b345d63e615b1bd177b294a0cd210833946c86a57fa30b6100e724c41acecaeab3b37fa04943
 MISC metadata.xml 245 SHA256 b768e8d906de53d73eb189a1aef619cf77693af566a9dfda91705bd7dd7c117c SHA512 6084a1fdcd72a4b1c84776ac880de837d17c7b14f2554ae26832d4fc7287ad8ae9651e55bc72de2a23d21fa4e1bd0ca8e98d4c5cd3ba274b35cc3d8a3a6a372b WHIRLPOOL f9587cab5f31a0340ad7da99b058e1e8c46d2476c47d4b47fc327b2f61fd06a3a5924e1e9d9b48de866a9b560d4703d475530ade11bf6562437f76f910b56a2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR+hyeAAoJENXLsxwXqFxyf0EP/1G0QaVR/EHqVHQFdOozsJt/
-WNjGu5ngbLTDtDC8PxBTbynmEAMwT41ztUKExhbQavHhqQw3wRx9FgauvKvHjP8/
-XSa5gRJ1jmjIBw5IliEG09PR9ndIJa3VLiY8nARJfKz8TQheu7yz4kp1DuMxGCux
-kK0uSfah6oUlovYn3fOQHNX35Jl/KZtn9mEIWgOjt1cE953oOyiqZ+9y5R2Luft8
-FxYRcxFmh7qGGhFTs5ox5eOsv51JXbTAk2y4qAbidW2wTPJn1CArXSkiu48f2eyT
-awHrP6zrIHCkZTvSuF/dGo8LElifma6Nei30BbfPXxrn1HK2hLPk0faTnzfHUlSu
-AvmBYVFEVYNDBes4dymHvaQOsJDv1wMNLXAIpO03Fie7uheoYqKPffEf33AVdx3t
-fHjCBH+Uflx/GhXw30/9CvL8suCqv7YzngpUDkDQTbTHPq4NmnSKXCwFKWoOf1go
-H4ZctbERZDFJNKTkrvG+nu4alGab0FXX7oS5xpl3lrT6RuVxHsTWl03HxP4S3Mi1
-eA47sfttDLNBXqituwVWibMiKJviiCnS/BcktsezzDxjVoS7jHwXyLEeZdhc+bDW
-jKA9Ygf5Ozj6JS9yZH36B+VFvQCcaNAZc++nm4m59QWAJWfSK+PUTqWIsou8s1rE
-oPol7JQQRVTlJDhlHO4c
-=O8Ol
+iQIcBAEBCAAGBQJSCB/+AAoJENXLsxwXqFxyrpcP/16SYyJpDEN7ntD8P0oSiyaD
+LoAotnz1bVy3Qtqu/mc/7KoaCa0xww6wfSCxLdYUE5qqqgOenmZ7bOWvPrlT1nww
+QAbGHxCb8jcyjQ7pXUE3io/ok5hXPCcpuXcP6V5qeDc01MB2zk3NxaUSH58CDkDj
+pzswyTEmi+tPVNtmg6qNnRIele0dxS254+Ixnux0TNoHyuEFvssSm1+WjnqmVfcN
+3AO8tGdhPn8jL5+SsHHe1/2RUVDYIHiwEs0rHmJv/Ml0hnC5Z2b4jrZoc/nX/jl2
+BhWNNuKgtKG4sUQpkEAtVJqGBHEVwCYa7gkRCxE6H/YtCz4ydpXX2Uesd2NYgdcu
+feu4EaDVWS8zWNz/Z3Qhaszm1EdnANn6ErbDD6fPsUPCyZahHkudbWkul9b9Ssck
+0dG+Nse/fXhgUJosFpUtssK5M3TWjm9jlZo7ASxM64xSBf6TnXrTNAPwhtXYB2KX
+WYaZWb6fe3gc9++XqsUenYTP/UZ95iFT8iF+rOk56RpBfWFkgLq51lQYxl1j7IJX
+R7AAvU11Ch8NfcmHKotuxaoacvtQ/WXm8ayg0QJh9srAZdSZVaRTdFo3SzcmpDtf
+Fr8fAqDkQdBjTmhfN4jJ2ShQgJd/+ZhBnfE2Vejea+3YMO5mGdTcWCpPajoQIfmx
+RwKpKJc0+tKi1GVXxcJi
+=OScM
 -----END PGP SIGNATURE-----
diff --git a/net-libs/qmf/files/qmf-4.0.2-include.patch b/net-libs/qmf/files/qmf-4.0.2-include.patch
deleted file mode 100644
index 5d050074edfe..000000000000
--- a/net-libs/qmf/files/qmf-4.0.2-include.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f3ef1f7f6eb9e456465924c63ade2a036079c85f Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <davidepesa@gmail.com>
-Date: Sun, 28 Jul 2013 21:27:16 -0700
-Subject: [PATCH] Add missing include.
-
-Fixes the following compilation errors with gcc 4.7 and later.
-
-messageserver.cpp: In static member function 'static void MessageServer::hupSignalHandler(int)':
-messageserver.cpp:501:5: error: '::write' has not been declared
-messageserver.cpp: In member function 'void MessageServer::handleSigHup()':
-messageserver.cpp:508:5: error: '::read' has not been declared
-
-Change-Id: I6fbcf2cba884f5e285c0259e020c60f4a44173b4
-Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
-Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
----
- src/tools/messageserver/messageserver.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
-index b749f03..5fbedf9 100644
---- a/src/tools/messageserver/messageserver.cpp
-+++ b/src/tools/messageserver/messageserver.cpp
-@@ -61,6 +61,7 @@ extern "C" {
- }
- 
- #if defined(Q_OS_UNIX)
-+#include <unistd.h>
- int MessageServer::sighupFd[2];
- #endif
- 
--- 
-1.7.1
-
diff --git a/net-libs/qmf/files/qmf-4.0.2-visibility.patch b/net-libs/qmf/files/qmf-4.0.2-visibility.patch
deleted file mode 100644
index 5d9a26980bbd..000000000000
--- a/net-libs/qmf/files/qmf-4.0.2-visibility.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From a84920f307cd4c5661f09dc41e562ff949d6779c Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <davidepesa@gmail.com>
-Date: Sun, 28 Jul 2013 23:40:16 -0700
-Subject: [PATCH] libqmfclient: export a few private classes used by messageserver.
-
-Since version 4.7.0, gcc constraints the ELF visibility of template
-instantiations to the visibility of its template arguments (see
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35688).
-
-Therefore all explicit instantiations of QPrivatelyImplemented<> in
-qmailinstantiations.cpp are now hidden, because the template arguments
-are private classes that have hidden visibility.
-
-This commit restores pre-gcc-4.7 behavior by exporting the symbols
-required to build messageserver successfully.
-
-Change-Id: I7c0ae91a56cac390f1e73418af486578da665a94
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
----
- src/libraries/qmfclient/qmailmessage_p.h |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/libraries/qmfclient/qmailmessage_p.h b/src/libraries/qmfclient/qmailmessage_p.h
-index 256c6b4..8a93432 100644
---- a/src/libraries/qmfclient/qmailmessage_p.h
-+++ b/src/libraries/qmfclient/qmailmessage_p.h
-@@ -59,7 +59,7 @@
- 
- // These classes are implemented via qmailmessage.cpp and qmailinstantiations.cpp
- 
--class QMailMessageHeaderFieldPrivate : public QPrivateImplementationBase
-+class QMF_EXPORT QMailMessageHeaderFieldPrivate : public QPrivateImplementationBase
- {
- public:
-     QMailMessageHeaderFieldPrivate();
-@@ -127,7 +127,7 @@ private:
- };
- 
- 
--class QMailMessageBodyPrivate : public QPrivateImplementationBase
-+class QMF_EXPORT QMailMessageBodyPrivate : public QPrivateImplementationBase
- {
- public:
-     QMailMessageBodyPrivate();
-@@ -169,7 +169,7 @@ private:
- };
- 
- 
--class QMailMessagePartContainerPrivate : public QPrivateImplementationBase
-+class QMF_EXPORT QMailMessagePartContainerPrivate : public QPrivateImplementationBase
- {
- public:
-     template<typename Derived>
-@@ -356,7 +356,7 @@ private:
- };
- 
- 
--class QMailMessageMetaDataPrivate : public QPrivateImplementationBase
-+class QMF_EXPORT QMailMessageMetaDataPrivate : public QPrivateImplementationBase
- {
- public:
-     QMailMessageMetaDataPrivate();
--- 
-1.7.1
-
diff --git a/net-libs/qmf/qmf-4.0.2.ebuild b/net-libs/qmf/qmf-4.0.3.ebuild
index cfd1ba2f8771..be79734e5b34 100644
--- a/net-libs/qmf/qmf-4.0.2.ebuild
+++ b/net-libs/qmf/qmf-4.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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-4.0.2.ebuild,v 1.2 2013/08/01 08:08:27 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qmf/qmf-4.0.3.ebuild,v 1.1 2013/08/11 23:35:41 pesa Exp $
 
 EAPI=5
 
@@ -40,19 +40,18 @@ DEPEND="${RDEPEND}
 DOCS=(CHANGES)
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-tests.patch"
-	"${FILESDIR}/${P}-include.patch"
-	"${FILESDIR}/${P}-visibility.patch"
 )
 
 src_prepare() {
 	qt4-r2_src_prepare
 
-	sed -i	-e '/benchmarks/d' \
-		-e '/tests/d' \
-		messagingframework.pro || die
+	sed -i -e '/SUBDIRS.*=/s/benchmarks//' messagingframework.pro || die
 
 	if ! use examples; then
-		sed -i -e '/examples/d' messagingframework.pro || die
+		sed -i -e '/SUBDIRS.*=/s/examples//' messagingframework.pro || die
+	fi
+	if ! use test; then
+		sed -i -e '/SUBDIRS.*=/s/tests//' messagingframework.pro || die
 	fi
 
 	# disable automagic deps
@@ -80,11 +79,6 @@ src_test() {
 	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
 	cd "${S}"/tests
 
-	einfo "Building tests"
-	eqmake4 QMF_INSTALL_ROOT="${EPREFIX}/usr"
-	emake
-
-	einfo "Running tests"
 	export QMF_DATA=${T}
 	local fail=false test=
 	for test in tst_*; do
@@ -97,6 +91,7 @@ src_test() {
 		fi
 		echo
 	done
+
 	${fail} && die "some tests have failed!"
 }