summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2014-05-24 21:33:09 +0000
committerDavide Pesavento <pesa@gentoo.org>2014-05-24 21:33:09 +0000
commit5f251180c0ba18dec990c06d61ed49c4f2865802 (patch)
tree122c95b03ac2569f38af7879af39796dfbcefba7 /dev-qt
parentFix missing files in 'dodoc' call. (diff)
downloadhistorical-5f251180c0ba18dec990c06d61ed49c4f2865802.tar.gz
historical-5f251180c0ba18dec990c06d61ed49c4f2865802.tar.bz2
historical-5f251180c0ba18dec990c06d61ed49c4f2865802.zip
Install also qtsinglecoreapplication.prf, as required by some packages (e.g. qbittorrent in bug 507998). Remove old.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xDADED6B2671CB57D!
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtsingleapplication/ChangeLog16
-rw-r--r--dev-qt/qtsingleapplication/Manifest37
-rw-r--r--dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch9
-rw-r--r--dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch15
-rw-r--r--dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch77
-rw-r--r--dev-qt/qtsingleapplication/qtsingleapplication-2.6.1.ebuild57
-rw-r--r--dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild (renamed from dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904.ebuild)5
7 files changed, 34 insertions, 182 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/Manifest b/dev-qt/qtsingleapplication/Manifest
index bd2c04b37f9e..b13e46df4abc 100644
--- a/dev-qt/qtsingleapplication/Manifest
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -3,30 +3,27 @@ Hash: SHA256
AUX 2.6.1_p20130904-no-gui.patch 2294 SHA256 164df2885860282c09534da83c9ac1ee56ee6b03d33efb39f75f54df552929cf SHA512 68b6ccf490483df0590af59c447fdfe99f421fd9dbc6211a7666f7ad0557025e13640b1c579fd25477fc0c197f49efa63c017e24a47b91291d99c773a7ad8dc9 WHIRLPOOL a62315f94e8fae5620b6e29eeccc1105fb0c5f3d8ab7f23f0a94b889844cf65b24eb599e0e372f29359eb9c17f1f577aa62849a7e9ebe55b44c4536a9663765a
AUX 2.6.1_p20130904-unbundle-qtlockedfile.patch 2547 SHA256 e5efb144ab9b1d442fb8f3c6616090eff635978b63b3bb72f0929dc3e78e6aa4 SHA512 96a1dd68e8ba841c5466183cfdcb9693e01d2096878f52f0f521bcee14ec38fb005bace877af473b645aa035c3651c136220fd2fc5dfb7a8883b9a75cdc55eba WHIRLPOOL 0d97ae41b2e449259d6e53b5df772e5e2ca129e023c329b8c5a02e25da5b9ebad8d2ba683c7ac85e87b9e11cd666f6a01f3cb410a6007cc92c98fcedcf1c871b
-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 qt-solutions-20130904.tar.xz 751536 SHA256 fc27b49883269a21ced2d3cb543eb78e79223afe5933bbc7d3194146f72f8884 SHA512 9e50d0a7d9fee08a72a3c6dee1d3fe45d04ae0930a967d81eff457f6c0ff53ac8449ef1d8241a5ce75ca2dcf9f4a2fe27b899647748d11060c3ab5767c3d0e75 WHIRLPOOL b933a301de905cffab8393a7adf055ed2f5198f1572657f5993e016746340d9862017982308ac11310add272ae1cd5c3435054dce2dd9d7ee5a9c92baf1878c2
-DIST qtsingleapplication-2.6_1-opensource.tar.gz 92779 SHA256 b0435c9dd2da391ade5686ed75ef0247a1cd341e884d641860bd0f2a70cf1819 SHA512 75ea5f8e860e1e7c7c6989717042c0279a5eb8ba1d1f2ccb8a4ef727d06cb579d4e3aff0557b4f0688ccb5550eff007e8537191c52f84196714ac3fb80d70f5c WHIRLPOOL 9513230e0eddf4ceb65e03692f03ea9ceb192adb06d3a768da0f436f6e2a77b00108d81cb2f933fafb8024f4715d971e755e8a9a8515475fed1707e70475520b
-EBUILD qtsingleapplication-2.6.1.ebuild 1316 SHA256 0c13bdcc0c30ef707c91f4d3c9428745e6d24e520ccbf61e619fdc0e6f5b79aa SHA512 eb0a81a995d36f2c803be298efbde523186a169289be5af83c1be61d795a1870ec8d215c8489a24853fa2f36dce3dabff46921f22855166a5cad53b585269a35 WHIRLPOOL 709b7c8e97fe135e44173091103f239c1e1210e68e328477896dbcfc2e6a8e1281a259096c49684155b5c17e98a80f5dbebda650a80a5a001b42f4b2deff90fc
-EBUILD qtsingleapplication-2.6.1_p20130904.ebuild 1406 SHA256 6bdb26c8c0b201dba005e6d2767f64fedbef0784abeebe65977334b69964ad5f SHA512 c3a9e6762dc43ddac72c4d7538158a678ef704204baf62feed3fc2d45af8df78a59d1d663dc85dd951b567ad781963cb88b762bea421fe985904f42a2a114d1c WHIRLPOOL a9e1dfed70a4fb1a39f63d7ac1b25e482e475807701479fdef47ecc8c31daa676060a5ddfd5d89bfed204d5f40e4953748a8f6bd1d646e4363b7f7389a6ce437
-MISC ChangeLog 1385 SHA256 1e3332609a1d9737243486e017c37a7a637654e5c6a58da0e7cf4e6db6cd0bf1 SHA512 1f2ccf88160e178227b15fc03c8366d7d214b439e085a09d3a1077f0d2ec7198e36886f752acdce17386278373cc6936c81603aa44aa5e6664f7a10964abb36f WHIRLPOOL 70babd6441894a595484c38f68076631b9444170f2df88937fecb19cb95a48986d0d984b245e50535c6a445477f2c688114c9c9cef3fe087b354f002e6f330f8
+EBUILD qtsingleapplication-2.6.1_p20130904-r1.ebuild 1486 SHA256 a99610a7130e169747a19c8d48a5c226c556c5e71efecb8356fabdbfb4e0fb98 SHA512 6802378c85cbdaa70ac83ff767704555d674e2ca6a8141fbe74ec41f845c2ddadc627e7a0ff8a91517710db941a06d0cee389d3cc585ec66b7e47243e2676078 WHIRLPOOL 70d18de26341b849c569990093cf0cc9c28efcadedf58a2fa0d116db8cb5a020e9e06bb964db4a1afaa751f5efcae596f5cf71b642b8805c586ea85332e43402
+MISC ChangeLog 1896 SHA256 825c6d9b1a5b10c4a7a730c022af4c47a0736a3438cbdce8e8a2b86b4aa9c70d SHA512 12827c8b76e0fb0e4f85bd0a0a8bb9d1d24204265db2f115d1713446e484b2f6583f6f70228b6ba91337d2f49484afe644dc8c7351cd187d3d0df040e7495aab WHIRLPOOL ba9ebb8880b0fb0619eadf068ba742c7181b51c751dce85fb87348ea53d82f3bf7a51bc26c0f624b6941fa05a8c43f99b67452c358a5000dabe751d564d5e6e1
MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJSv1YaAAoJENXLsxwXqFxyNckQAL8K93HJQFKhgyzGwHCy7ptP
-7q57Q0b9bVjQLvD+J3qXNuVB7IQpRoRUi3bSGKs1idpNPY2oNhgHBY6u5ROQPe0v
-M9MeDwuhYiNbz3DkKC0D2CXfzuaUpZtHRFBdjf4I4fR24X6lM7aVhSY+KAFvcmj7
-4gL7kkqqy26C1w0LfJNH/uYTQO8tJd1+IPYpEIk3gYe5exjxeFqqQz/BkCZ+Bipm
-9mSmb7KGBXB5nHaJHMfFOoU6OIPmZIBFYiQaQ1My8gAuMaBNitOxmQJiuXYKQaIt
-4tGOHwHSBsI7BXXHVEhyEEY6oFbi9FzZRaKMkTuqIE+psDLAewJduHPntubeZ4JQ
-Qs13D3zJxrW/TqcmOo7fBj6wMUeXIiuwTYld2T3xBUilD/iLBgN4L+i06X1Kk1+X
-7vtn2ni4Yh0clehOzTOEhd7LAItyT2oXBVSFfRtSBXMTthosGfx8F6vhUD1FndwN
-e9ZE4kk9Hi/QFa5GkfyGA5NdUcSc/a8l2j95KaLE7bISjz0zBBD9Uag+/IsImDYe
-uoQZPiorlwkxzEkw5rNTrFjL36ul+xtJpATjnH0pp7rkcVQ8sBAl7kWUFhLzi8Dl
-p3mGAj9zyO3InEne+Wa6jV/52n0lQVjLoQVDD33x+LBsAwhhm8wcx5EMf7PGK+dD
-ImZOfb95qHLp0rqg/4CG
-=byNi
+iQJ8BAEBCABmBQJTgRAgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9w1cP/2GMas/EpmttbuWSd4HouhdY
+aCZwVt25SAcuNGPu73jhIU7c0vMtepXUqhKDrxga9xUTZCN+c1GMFBw7OSpGPcSF
+mcI8Zgs31S9StCNYe0aYYfBu8H/zi0jRxWznTQvP+c78B+UAJ37GygxX82E9sAIv
+ixe/d8FXXW+EPm2WKsJaUrwZORyxq21GdmzjSdWfcETnyXbF1Za5cyeEibIH3Rd0
+3ol0reRt30aO5346SrkXGcF6YuyG2lmOHobOTcKAGfD2VEwzWVO6tyruDVIxVyBs
+blJ1Zp/cp/fOFXRhwI73urUuvM8BzSqJtF2Jfl9gD5kGaYEbBri/hMeDkzUpxsAW
+oULP6ICvsOnCpkpgyHFxmcuhA0Q9haHDHoT7SDBzTo3cBrjFl1Ti40etDjf4MuRR
+pYdXJtrQSnrzrAmNcyk/5VQcovYXZ4i3q6jNfOOFIO2BzgFQ1T/LqF7kkZboer6u
+ID5nuSof+B0b5DHbh+k4xfphpy4+aNFDIZKpT3yocFEjPctGHvXEqcma4q5T/+cd
+he5Vz2cEPSd24pj1ZoOhbPgrkKGqBs2stXJjuWXy1vAVKihGKy8hSb37oRhXXyUg
+vqdtlt/4f63bLAUg96rbrDmQqvfcBOheg2rAcjIbpTNhqd/uuklZWgbKKg/gGXWt
+0P+4m4b8evUPGVra1KGb
+=92mT
-----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
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
}