Install also qtsinglecoreapplication.prf, as required by some packages (e.g. qbittorrent in bug 507998). Remove old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

6 files changed, 17 insertions, 162 deletions

diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog
index ef738ce9c2bf..3f83803d9ecc 100644
--- a/dev-qt/qtsingleapplication/ChangeLog
+++ b/dev-qt/qtsingleapplication/ChangeLog
@@ -1,6 +1,18 @@
 # 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.5 2013/12/28 22:51:55 pesa Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.6 2014/05/24 21:33:01 pesa Exp $
+
+*qtsingleapplication-2.6.1_p20130904-r1 (24 May 2014)
+
+  24 May 2014; Davide Pesavento <pesa@gentoo.org>
+  +qtsingleapplication-2.6.1_p20130904-r1.ebuild,
+  -files/qtsingleapplication-2.6.1-examples.patch,
+  -files/qtsingleapplication-2.6.1-gcc47.patch,
+  -files/qtsingleapplication-2.6.1-unbundle.patch,
+  -qtsingleapplication-2.6.1.ebuild,
+  -qtsingleapplication-2.6.1_p20130904.ebuild:
+  Install also qtsinglecoreapplication.prf, as required by some packages (e.g.
+  qbittorrent in bug 507998). Remove old.
 
 *qtsingleapplication-2.6.1_p20130904 (28 Dec 2013)
 
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch
deleted file mode 100644
index 079e3435b5aa..000000000000
--- a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 003725e55ee8..000000000000
--- a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index ef94938b777e..000000000000
--- a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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/qtsingleapplication-2.6.1.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
deleted file mode 100644
index 222bf7ddb061..000000000000
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.4 2013/10/13 10:33:28 maekke 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 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtlockedfile"
-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
-}
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
index c8991787a210..31c52b639b3b 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild,v 1.1 2014/05/24 21:33:01 pesa Exp $
 
 EAPI=5
 
@@ -54,6 +54,7 @@ src_install() {
 
 	insinto /usr/share/qt4/mkspecs/features/
 	doins "${FILESDIR}"/${PN}.prf
+	dosym ${PN}.prf /usr/share/qt4/mkspecs/features/qtsinglecoreapplication.prf
 
 	use doc && dohtml -r doc/html
 }