New package wrt bug #441914.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

8 files changed, 201 insertions, 0 deletions

diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog
new file mode 100644
index 000000000000..7707ca40e364
--- /dev/null
+++ b/dev-qt/qtsingleapplication/ChangeLog
@@ -0,0 +1,13 @@
+# 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.1 2013/09/04 14:52:13 kensington Exp $
+
+*qtsingleapplication-2.6.1 (04 Sep 2013)
+
+  04 Sep 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/qtsingleapplication-2.6.1-examples.patch,
+  +files/qtsingleapplication-2.6.1-gcc47.patch,
+  +files/qtsingleapplication-2.6.1-unbundle.patch,
+  +files/qtsingleapplication.prf, +metadata.xml,
+  +qtsingleapplication-2.6.1.ebuild:
+  New package wrt bug #441914.
diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
new file mode 100644
index 000000000000..ebd6f49e6fca
--- /dev/null
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX qtsingleapplication-2.6.1-examples.patch 200 SHA256 cb3a4abceda9603841d4c079afbe213fa41ed603652e3cede5314f046f0b0275 SHA512 dbe9a903e02fb2d02543824afa47467c50de71a083adde76bf95b929949fdd8dbe5fd921e63b89f43818b48b7d8ea42391bba10e330676c3bf3bb81482fbc1d4 WHIRLPOOL 4fc3e9c8478d9c0cfa7f11dd829144865769a889c3b11baa764fc2bc8a699ee58dccd4251d7385660c159a9fa12039c7aacd6637e5cd839f5221634025a7dca2
+AUX qtsingleapplication-2.6.1-gcc47.patch 637 SHA256 0953db6f189e21ce377d2ee6f20aecd75e3081121071e637263e906707d02bc0 SHA512 7e5aa548f4fb6d7aa5b01ff11a076114eb91bedce5b9bd0c9470eec90f00c8cdf964aea0a4f8a216da8b048d7c2925311da2c7243f9a22c3653dd334263ad814 WHIRLPOOL 584fc31a1ad509c75b55d1e734605cd29f4feae2e345c2dc7681f8ae9020b5e6c8da74b4dca207ecc1ef449b654a37dfe66ff0bcaa2aec5570353452dab668ed
+AUX qtsingleapplication-2.6.1-unbundle.patch 2880 SHA256 0c96fabb5c81989c4b2da372b34955c6b8992ec0a41990e4490346758e1607e5 SHA512 caa63dc5677cfa069cb5df7d4dacecd55f054a1633cff1a87f4f40df2c82e471f868ff7987970c1a3babf49623b8e1bfe43d5f0b0c357f49c388c1c5d9151463 WHIRLPOOL e3cbf24a8c3625dc66fbb564408f9223f8b18a8b67af000c85caa471a2abb3b94cf01fb3dd766be8fb4069b772362c1e2d1b55024ec04f0d5f79b474f99a8781
+AUX qtsingleapplication.prf 148 SHA256 8ec2ad9c025496b5c1002a34f3603b78c7e9e5986c4706eb533db0090346fb04 SHA512 674d9b16bd774b7fe5e5e1a1e0ef7a7ab898482affb22bc3d72ddfbed8e3cbb42f43810dcc56d3ac4808809f03ed192187ae4b3f8bdeaa8cda2e9b155ee327c5 WHIRLPOOL 069fe748ecf97e2389d0c0f924d9f4b7b185da1fcab5bf5d91f412bc7a589911e4386c9dd4d7d90aa055b6b515efbded5c747ac792305b24f1762bc88722237b
+DIST qtsingleapplication-2.6_1-opensource.tar.gz 92779 SHA256 b0435c9dd2da391ade5686ed75ef0247a1cd341e884d641860bd0f2a70cf1819 SHA512 75ea5f8e860e1e7c7c6989717042c0279a5eb8ba1d1f2ccb8a4ef727d06cb579d4e3aff0557b4f0688ccb5550eff007e8537191c52f84196714ac3fb80d70f5c WHIRLPOOL 9513230e0eddf4ceb65e03692f03ea9ceb192adb06d3a768da0f436f6e2a77b00108d81cb2f933fafb8024f4715d971e755e8a9a8515475fed1707e70475520b
+EBUILD qtsingleapplication-2.6.1.ebuild 1265 SHA256 c47f09d13dddf9e65e619c82188d86e959cdc10b28b09dd9f5b33bfdc9c6e0e0 SHA512 8d94904a6d4ac8aa7d937f6fa2a2ae502dfde9d2798d195afa4abc8f00bbdff870d874378fb9839a6b61350196a9259ed3488338fddfa3278e82fb86601628d6 WHIRLPOOL fd3ab3d75d594fdb032b9c2b415a9c8e71790cd2ad9b89612f2520d2c229b8937a1dc213f72452071dba05ed6109ffc79e8972f6fb6ce78358afb069c0ef48bf
+MISC ChangeLog 594 SHA256 3087bf7df443dbbb06f66d5678ebf1636e6e2370be8062ad9bfac62b5d7acc0c SHA512 333a498999a414b0aef7aeaa51cbb795774d19d2e2c335cc286505ff90c154689ab012a2355d0ee6435ba706c34e4c38bab4c5176513ab5a18a032670db3155f WHIRLPOOL f35788b4ca89872e0e8be77be7e274ae0042595b4fb0f46b258bc35d5a6d3dfc7ed7464398ef2e54bfcb128d3ce1249f5bd6a70bbbf37f1800f11330f18b2ef4
+MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSJ0iGAAoJEMbwO6tnXQ0sRBcH/jGk9GgfUqsB17PR6sg80jkZ
+O99GJMQpr4s3h75dSJTmx+RZPGBAfYALOadBeJQ32KhtAT//tTDHQYsa+Q/DBosk
+zIvzl+8sqJkICK8PxCd/ZMOfB6Ymnb8RLK26xx/ano21Bpa0y5UToKXzvEuNC6+X
+exF+lc494OshN8vb/e5cfkwWNFdWv2rIit7b0tP63efh6WjObnREhvM9him/opov
+mzzFW//2ChxeWFv1KJfK5mzscot38Okc4c1YZdJ/CEgpzzJI5QuJ51ZFUJ6x9e/u
+fXrE1WMsRP/QAkJfMb4WItGwTnPV8+DW7ShZ5emg6JNwFSr5ny8wzXY0N4VbzEo=
+=qSZm
+-----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch
new file mode 100644
index 000000000000..079e3435b5aa
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch
@@ -0,0 +1,9 @@
+Do not build examples.
+
+--- qtsingleapplication.pro
++++ qtsingleapplication.pro
+@@ -2,4 +2,3 @@
+ CONFIG += ordered
+ include(common.pri)
+ qtsingleapplication-uselib:SUBDIRS=buildlib
+-SUBDIRS+=examples
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
new file mode 100644
index 000000000000..003725e55ee8
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
@@ -0,0 +1,15 @@
+Fix build with GCC 4.7.
+
+Source: http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/tree/qtsingleapplication-gcc47.patch
+
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
+--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp	2012-01-11 08:15:08.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp	2012-01-11 08:17:36.874461946 -0500
+@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdT
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ const char* QtLocalPeer::ack = "ack";
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch
new file mode 100644
index 000000000000..ef94938b777e
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch
@@ -0,0 +1,77 @@
+Do not bundle qtlockedfile.
+
+Original source: http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/tree/qtsingleapplication-dont-bundle-external-libs.patch
+
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
+--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp	2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp	2010-07-21 22:10:43.000000000 -0400
+@@ -59,15 +59,6 @@ static PProcessIdToSessionId pProcessIdT
+ #include <time.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)
+@@ -118,7 +109,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 -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h
+--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h	2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h	2010-07-21 22:10:43.000000000 -0400
+@@ -49,9 +49,7 @@
+ #include <QtNetwork/QLocalSocket>
+ #include <QtCore/QDir>
+ 
+-namespace QtLP_Private {
+ #include "qtlockedfile.h"
+-}
+ 
+ class QtLocalPeer : public QObject
+ {
+@@ -74,7 +72,7 @@ protected:
+     QString id;
+     QString socketName;
+     QLocalServer* server;
+-    QtLP_Private::QtLockedFile lockFile;
++    QtLockedFile lockFile;
+ 
+ private:
+     static const char* ack;
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri
+--- qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri	2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri	2010-07-21 22:11:08.000000000 -0400
+@@ -2,6 +2,8 @@ include(../common.pri)
+ INCLUDEPATH += $$PWD
+ DEPENDPATH += $$PWD
+ QT *= network
++CONFIG *= qtlockedfile
++LIBS+= -lQtSolutions_LockedFile-2.4
+ 
+ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
+     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
+--- a/src/qtsinglecoreapplication.pri
++++ b/src/qtsinglecoreapplication.pri
+@@ -4,6 +4,8 @@
+ SOURCES		+= $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+ 
+ QT *= network
++CONFIG *= qtlockedfile
++LIBS+= -lQtSolutions_LockedFile-2.4
+ 
+ win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+     DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication.prf b/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
new file mode 100644
index 000000000000..40335a1c345b
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
@@ -0,0 +1,4 @@
+INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
+DEPENDPATH  *= $$QMAKE_INCDIR_QT/QtSolutions
+LIBS *= -lQtSolutions_SingleApplication-2.6
+QT *= network
diff --git a/dev-qt/qtsingleapplication/metadata.xml b/dev-qt/qtsingleapplication/metadata.xml
new file mode 100644
index 000000000000..ab02f994fdd2
--- /dev/null
+++ b/dev-qt/qtsingleapplication/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+</pkgmetadata>
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
new file mode 100644
index 000000000000..78449b669ad5
--- /dev/null
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
@@ -0,0 +1,56 @@
+# 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.ebuild,v 1.1 2013/09/04 14:52:13 kensington Exp $
+
+EAPI=5
+
+inherit qt4-r2 versionator
+
+MY_P="${PN}-$(replace_version_separator 2 _)-opensource"
+
+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/~kensington/distfiles/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-examples.patch"
+	"${FILESDIR}/${P}-gcc47.patch"
+	"${FILESDIR}/${P}-unbundle.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# to ensure unbundling
+	rm src/qtlockedfile*
+}
+
+src_configure() {
+	eqmake4 CONFIG+=qtsingleapplication-uselib
+}
+
+src_install() {
+	dolib.so lib/*
+	insinto /usr/include/qt4/QtSolutions/
+	doins src/QtSingleApplication src/${PN}.h
+
+	insinto /usr/share/qt4/mkspecs/features/
+	doins "${FILESDIR}/${PN}.prf"
+
+	if use doc ; then
+		dodoc -r examples
+		dodoc doc/index.qdoc
+		dohtml -r doc/html/ doc/images
+	fi
+}