Version bump.

(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

4 files changed, 15 insertions, 113 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/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!"
 }