New snapshot from qt-solutions git repo wrt bug 489168.

Install QtSingleCoreApplication header file.
Implement USE="X" to solve bug 491494.

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

4 files changed, 217 insertions, 1 deletions

diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog
index 10923d051c8d..ef738ce9c2bf 100644
--- a/dev-qt/qtsingleapplication/ChangeLog
+++ b/dev-qt/qtsingleapplication/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-qt/qtsingleapplication
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.4 2013/10/13 10:33:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.5 2013/12/28 22:51:55 pesa Exp $
+
+*qtsingleapplication-2.6.1_p20130904 (28 Dec 2013)
+
+  28 Dec 2013; Davide Pesavento <pesa@gentoo.org>
+  +files/2.6.1_p20130904-no-gui.patch,
+  +files/2.6.1_p20130904-unbundle-qtlockedfile.patch,
+  +qtsingleapplication-2.6.1_p20130904.ebuild:
+  New snapshot from qt-solutions git repo wrt bug 489168. Install
+  QtSingleCoreApplication header file. Implement USE="X" to solve bug 491494.
 
   13 Oct 2013; Markus Meier <maekke@gentoo.org>
   qtsingleapplication-2.6.1.ebuild:
diff --git a/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch
new file mode 100644
index 000000000000..19019e2892a4
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-no-gui.patch
@@ -0,0 +1,67 @@
+From f66352d6c2918123466bd72aee2118b9167562af Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <davidepesa@gmail.com>
+Date: Sat, 28 Dec 2013 16:43:18 +0100
+Subject: [PATCH] no gui
+
+---
+ buildlib/buildlib.pro           |  4 +++-
+ src/qtsingleapplication.pri     | 11 +++++------
+ src/qtsinglecoreapplication.pri |  2 +-
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/buildlib/buildlib.pro b/buildlib/buildlib.pro
+index 37dddcd..f7c6508 100644
+--- a/buildlib/buildlib.pro
++++ b/buildlib/buildlib.pro
+@@ -2,7 +2,9 @@ TEMPLATE=lib
+ CONFIG += qt dll qtsingleapplication-buildlib
+ mac:CONFIG += absolute_library_soname
+ win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
+-include(../src/qtsingleapplication.pri)
++include(../common.pri)
++include(../src/qtsinglecoreapplication.pri)
++exists(../config.pri):!infile(../config.pri, QTSA_NO_GUI, yes):include(../src/qtsingleapplication.pri)
+ TARGET = $$QTSINGLEAPPLICATION_LIBNAME
+ DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR
+ win32 {
+diff --git a/src/qtsingleapplication.pri b/src/qtsingleapplication.pri
+index 02c9e5b..772924d 100644
+--- a/src/qtsingleapplication.pri
++++ b/src/qtsingleapplication.pri
+@@ -1,15 +1,14 @@
+-include(../common.pri)
+-INCLUDEPATH += $$PWD
+-DEPENDPATH += $$PWD
+-QT *= network
++INCLUDEPATH *= $$PWD
++DEPENDPATH *= $$PWD
++QT *= gui network
+ greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
+ CONFIG *= qtlockedfile
+ 
+ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
+     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
+ } else {
+-    SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp
+-    HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h
++    SOURCES += $$PWD/qtsingleapplication.cpp
++    HEADERS += $$PWD/qtsingleapplication.h
+ }
+ 
+ win32 {
+diff --git a/src/qtsinglecoreapplication.pri b/src/qtsinglecoreapplication.pri
+index f5b8414..bf14a3f 100644
+--- a/src/qtsinglecoreapplication.pri
++++ b/src/qtsinglecoreapplication.pri
+@@ -3,7 +3,7 @@ DEPENDPATH      += $$PWD
+ HEADERS		+= $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+ SOURCES		+= $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+ 
+-QT *= network
++QT = core network
+ CONFIG *= qtlockedfile
+ 
+ win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+-- 
+1.8.5.2
+
diff --git a/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch
new file mode 100644
index 000000000000..93c78fab9bab
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/2.6.1_p20130904-unbundle-qtlockedfile.patch
@@ -0,0 +1,81 @@
+From 62210d463f87abb0584ce699915e1845cacaa480 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <davidepesa@gmail.com>
+Date: Sat, 28 Dec 2013 16:33:15 +0100
+Subject: [PATCH] unbundle qtlockedfile
+
+---
+ src/qtlocalpeer.cpp             | 11 +----------
+ src/qtlocalpeer.h               |  2 +-
+ src/qtsingleapplication.pri     |  1 +
+ src/qtsinglecoreapplication.pri |  1 +
+ 4 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp
+index 332b064..f17e662 100644
+--- a/src/qtlocalpeer.cpp
++++ b/src/qtlocalpeer.cpp
+@@ -55,15 +55,6 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #include <unistd.h>
+ #endif
+ 
+-namespace QtLP_Private {
+-#include "qtlockedfile.cpp"
+-#if defined(Q_OS_WIN)
+-#include "qtlockedfile_win.cpp"
+-#else
+-#include "qtlockedfile_unix.cpp"
+-#endif
+-}
+-
+ const char* QtLocalPeer::ack = "ack";
+ 
+ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
+@@ -114,7 +105,7 @@ bool QtLocalPeer::isClient()
+     if (lockFile.isLocked())
+         return false;
+ 
+-    if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
++    if (!lockFile.lock(QtLockedFile::WriteLock, false))
+         return true;
+ 
+     bool res = server->listen(socketName);
+diff --git a/src/qtlocalpeer.h b/src/qtlocalpeer.h
+index 1b533b1..1127735 100644
+--- a/src/qtlocalpeer.h
++++ b/src/qtlocalpeer.h
+@@ -68,7 +68,7 @@ protected:
+     QString id;
+     QString socketName;
+     QLocalServer* server;
+-    QtLP_Private::QtLockedFile lockFile;
++    QtLockedFile lockFile;
+ 
+ private:
+     static const char* ack;
+diff --git a/src/qtsingleapplication.pri b/src/qtsingleapplication.pri
+index 6f2bced..02c9e5b 100644
+--- a/src/qtsingleapplication.pri
++++ b/src/qtsingleapplication.pri
+@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
+ DEPENDPATH += $$PWD
+ QT *= network
+ greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
++CONFIG *= qtlockedfile
+ 
+ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
+     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
+diff --git a/src/qtsinglecoreapplication.pri b/src/qtsinglecoreapplication.pri
+index d2d6cc3..f5b8414 100644
+--- a/src/qtsinglecoreapplication.pri
++++ b/src/qtsinglecoreapplication.pri
+@@ -4,6 +4,7 @@ HEADERS		+= $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+ SOURCES		+= $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+ 
+ QT *= network
++CONFIG *= qtlockedfile
+ 
+ win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+     DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
+-- 
+1.8.5.2
+
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904.ebuild
new file mode 100644
index 000000000000..c8991787a210
--- /dev/null
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904.ebuild,v 1.1 2013/12/28 22:51:55 pesa Exp $
+
+EAPI=5
+
+inherit qt4-r2
+
+MY_P=qt-solutions-${PV#*_p}
+
+DESCRIPTION="Qt library to start applications only once per user"
+HOMEPAGE="http://doc.qt.digia.com/solutions/4/qtsingleapplication/index.html"
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="X doc"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtlockedfile
+	X? ( dev-qt/qtgui:4 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/${PN}
+
+PATCHES=(
+	"${FILESDIR}/${PV}-unbundle-qtlockedfile.patch"
+	"${FILESDIR}/${PV}-no-gui.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	echo 'SOLUTIONS_LIBRARY = yes' > config.pri
+	use X || echo 'QTSA_NO_GUI = yes' >> config.pri
+
+	sed -i -e "s/-head/-${PV%.*}/" common.pri || die
+	sed -i -e '/SUBDIRS+=examples/d' ${PN}.pro || die
+
+	# to ensure unbundling
+	rm -f src/qtlockedfile*
+}
+
+src_install() {
+	dodoc README.TXT
+
+	dolib.so lib/*
+	insinto /usr/include/qt4/QtSolutions/
+	doins src/qtsinglecoreapplication.h
+	use X && doins src/{QtSingleApplication,${PN}.h}
+
+	insinto /usr/share/qt4/mkspecs/features/
+	doins "${FILESDIR}"/${PN}.prf
+
+	use doc && dohtml -r doc/html
+}