Revision bump: unbundle QtSingleApplication, wrt bug #489148. Drop old revision

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 66 insertions, 24 deletions

diff --git a/app-editors/focuswriter/ChangeLog b/app-editors/focuswriter/ChangeLog
index 0407741b962a..ac7ff01b1df9 100644
--- a/app-editors/focuswriter/ChangeLog
+++ b/app-editors/focuswriter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/focuswriter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/focuswriter/ChangeLog,v 1.19 2014/07/31 10:49:52 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/focuswriter/ChangeLog,v 1.20 2014/07/31 14:07:24 pinkbyte Exp $
+
+*focuswriter-1.5.2-r1 (31 Jul 2014)
+
+  31 Jul 2014; Sergey Popov <pinkbyte@gentoo.org> -focuswriter-1.5.2.ebuild,
+  +focuswriter-1.5.2-r1.ebuild,
+  +files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch:
+  Revision bump: unbundle QtSingleApplication, wrt bug #489148. Drop old
+  revision
 
 *focuswriter-1.5.2 (31 Jul 2014)
 
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index b2642bd9d41c..5e46a6f17768 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,29 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX focuswriter-1.5.2-unbundle-qtsingleapplication.patch 1175 SHA256 336277dca5e9feda67a84c115f3853afe9838913de7e09ba17ae2e7baa5c6dd2 SHA512 ab179ed7f4851de3258fc637914a99090786b70a9a5dc54bebbd598a06acbaa86445e0dc254160b904969e7dde82c9bdaac1833e34f11386f5eaf090bcb84e96 WHIRLPOOL cac2c1870f4940036b1a57e08d5e4818b7e5da96dc09d31560478ef8fee8a54a4019682003364f69c9e2b03f4c2f65e4733dc9b358ab035d66319826e1a2c393
 DIST focuswriter-1.4.2-src.tar.bz2 3149160 SHA256 f41ccf226cb5e4181162d37b2a4b5598be202bb184e2f7c26412dc371c9ef328 SHA512 4b6f503fb6624eea12372fbee169e21df3e728420ffede73bc5895ba451c80910f7f68ebba67a914fe380634d868e7d5a5d196218e255d15155ba397805a63d6 WHIRLPOOL 705694be03e514c2f432d014dbafc1a8a55d0025bdfbfd697dfe416dc2beee3ddd337f8ea50eea8737af59015a6d15e64d55f53afa80c62b5f640fefc3e7b2e9
 DIST focuswriter-1.4.4-src.tar.bz2 3361062 SHA256 b574d6b76609078e36c38dd3b632cdfe1360bfb3a71221c3afc89b1c01d7670f SHA512 2206022f4de9878629e6bb1c8c64870b73c604496d116c8a692181dedf05b9a975d845f64997e2ca3d762c49a52cfbce56167b9ec512fee64a12eb93a513df00 WHIRLPOOL 8727d83dd24830496b149a912fd351687e4fcdc63353448fa29220e909b9b78856e4d21263ddb4d7b856dc72d9aa7a1106633590597f9fed7ed0d3d934edd953
 DIST focuswriter-1.5.2-src.tar.bz2 5200637 SHA256 b1c09aafcf9a28f5a02a0c5365b6585cee3a2f027739593b80687b1efb32a7c3 SHA512 d121ceac035b447443267fe1fe422d53ce5f66f06b7ee8b37fe0e5a3ac2e599d85c2a8f753c3507f1b04c72928f310fb67310bb5b8707c06cbe095afe875925a WHIRLPOOL bdd658b60c2cd87a06cc3e57919bcd65fd68d99141a731464918dec146ae1af643f05f63c81d450d14ab70700740e31501393d18ba872d0e679c682edc23a034
 EBUILD focuswriter-1.4.2.ebuild 1229 SHA256 baf33abc5f00fdb6eda4b3d90c9bbda3bfda6948588621bd6e7b30aa9609266a SHA512 09005ae22cfe6c0228677cb8825e5edc571fbbc71c5f577eb74dc0d6d11ab471ac0f504929456413ec8ea08d68e786dd056b24414d13402aa9d03c8f9765803e WHIRLPOOL ee342d8208ed828553a94f9d6e7893ab233815d70e31aba71658b46a5ed4919f59591f7265dc3e72a5b3edfdc7394475a44aa0eda063a606f5170a3d05b47bdc
 EBUILD focuswriter-1.4.4.ebuild 1488 SHA256 a79c4cca54c7d4e1195c477ffcb5d1735659f445a713b05aaa589c42183f43ca SHA512 8d7f29630a9b173b03b40aeca35ad498ea25b58255d2e23d19481b15e355195ef722e023da19a106e61fc7bfe8530723f71220652f5e336ed400d4ce53f7204c WHIRLPOOL eab609e81a70fe17a95f0962b97d0adc62441356322305b3be7b55e7bca2115ab83c19830e4ad22e7fd0241f298c2a2f17a926c668b5a02c84e16b1ae70154e6
-EBUILD focuswriter-1.5.2.ebuild 1507 SHA256 6323b682310381d528af45762930e545a4c739adc6c21b33c85803afb8bb665f SHA512 2d297f112d83775380ee60902cf9db5892ac91fac74f6685f7d5ac3e6ebbeda4d5594fa70e38a6b5cfe898f9e9bf7bc00f2b9cb273215a7e948d62968c3b220a WHIRLPOOL 982da768877e5b213e3aad29f7d61ad7843091f04fc6e99115689d320f780e0a684179afc341738e7ba18a909a142d861bfaabcf72d1fc080523e1e7e7d89d9d
-MISC ChangeLog 4116 SHA256 711838b9690abc9f7efd0ab226da1ac0f359bb611e7c7add12dd7b3d776eb768 SHA512 531492d8e2c64af2da264939a0fc3b3bd24ff96d0085ec5a04824461d55d419b4a98ccf23b3f4b317fa59435323c85156a67493d0a054c641a3bba8fa9d76694 WHIRLPOOL 4ef2f7c8dcd4d2cc4d78aafad25fb79500f727c7b5b30ec072627290381e0955f800ac10a6978528e08027a2f74844d1774f3da6d31211e60f9e8e5b13729ab3
+EBUILD focuswriter-1.5.2-r1.ebuild 1626 SHA256 9dae5484861e6312d2b21b698e0649c845e059402d14f79a0851e550dd52824b SHA512 a8e7202e40fd716a73789caeaf015eac2ac4c1161515de6e47e9b0fd864bd9688cdc470d70cb6fdef21dda6e9db9fcc5fe4b4aa8f796df75bb06e62d708c4221 WHIRLPOOL 668d1d8cba7d02c28c259ef0364fe9cfd1e6c9ef3577f9012b33c32e11258bc38230809841afb2db3a6da6f6384be7e3265ca3ccd544c1d5e03f9e6fa9613ac2
+MISC ChangeLog 4408 SHA256 997e9b600fa008a114b4ab3e0e19617911c849101118f574dbd5374ac620b26d SHA512 8a2fd2a47c8857fd424b43503864121475b7792de0261b1ab9023779bd289436b363526ca9dddca9d67ed151511b3694e9b1f037b9089bda72daa233eeb120e2 WHIRLPOOL cc8ec2ee29588eeca2941314339496d719e40d76fb4f0bc481b626730e992c94db55ac844a2ae581cca375d44729b58ee91c414a058419d025525d3480887181
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJT2h9TRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7HpWEAC5g6gK15D38ZKLNnS8WfKYunPpTts3UUzaXGa4P01MofcPuad3YHdNnSiJ
-pPpnoXQxledmuH4OrhRtcSr5QHgusWAaQD0KXHuvR6D+qYAYpeBmrKwHEd+h2VTn
-zZxhz+4xSxI/Pi2Qw3aOmZ3/k+QmGtu6x0/ZxY8YQUwHhvE3UEDa99MlWNAXRTGU
-TcVY5SzelKgYdT9CMRKFcbNzpr8NQbRicK92Iwh61l6CISZrkJnFBb9ZlOTzYjnt
-hwP8khEDq5nR/SsVXW9Q2HYRs4LJYiDCN/2kmiMfDq63dljhi4lyIpi/NSFhzgQ5
-Xkb/0T7adHc7dR4c4Vr6DTDsE8WceEwK0X6d3muHn9rU7Ust8uGpBrTvNIoK/8yz
-4S38Cbyi8CV9q++v2yPsp1TapuIUwHC6cRKhKY2WEHMJKlPTgbpqF4C9hC/290RT
-S0fVAsB0ZhuLcO+tVEMHjfWdSe1pBI76i6b8F03kmTMd7Z5Z3OLwcld1ICcBQexR
-YYW48IoUr+1ddUjkIN8rMkWeUCHSAu4GsObatMsRNobS0LxJcYAQgDbQ4ZiSyTDK
-491D40moZUE4+r8POrG1R2I6RPmDK2YG9bcFj1nQHpNiF6SdFEiOdznMq6cV2LoR
-dgZ7GkgiMmoIOOIEttkvQ4Mu2HxsNHgkaqomzWRB1kPhQKQ4Ww==
-=ZLDN
+iQEcBAEBCAAGBQJT2k2fAAoJECo/aRed9267EBwH/RFNXUk+NOP0Kfef5GkxZ4C3
+cQhykJ8IQYjcQUg7grxHpf5/1hsJo9A+JtChcSAD0hQv7D1z3e/EINIWDEyX2auZ
+ZpZE7KSRE1GMnZt56no2bpaumsWA0vfVoTZhPTdKNhTnXQklSw39PEAV5sxTQ5Ly
+MggSMUmz25pBOT/OY+i4evyDio6CRgVx6kmHaBsErL7b1YZGKHnD7llKfLz08Exh
+6FzIvk9wDfKDVTxa03I8MqdDlX2QLt9Tu+71C1c+VucPfoJiuVS57xVFq0xDnLM6
+4lwvJNKX1P+bXZbXeNa5Wd9HdIsSbQZqq/F8FT1u4/pV2gKkClYUgEueZAQXGyI=
+=8irO
 -----END PGP SIGNATURE-----
diff --git a/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch b/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..e7815be0ee5f
--- /dev/null
+++ b/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
@@ -0,0 +1,36 @@
+--- focuswriter.pro.orig	2014-07-20 17:37:05.000000000 +0400
++++ focuswriter.pro	2014-07-31 17:56:00.702801120 +0400
+@@ -90,13 +90,14 @@
+ 		src/spelling/dictionary_provider_voikko.cpp
+ 
+ 	lessThan(QT_MAJOR_VERSION, 5) {
++		CONFIG += qtsingleapplication
+ 		SOURCES += src/sdl/sound.cpp
+ 	} else {
+ 		SOURCES += src/sound.cpp
+ 	}
+ }
+ 
+-INCLUDEPATH += src src/fileformats src/qtsingleapplication src/qtzip src/spelling
++INCLUDEPATH += src src/fileformats src/qtzip src/spelling
+ 
+ # Specify program sources
+ HEADERS += src/action_manager.h \
+@@ -155,8 +156,6 @@
+ 	src/fileformats/rtf_tokenizer.h \
+ 	src/fileformats/rtf_writer.h \
+ 	src/fileformats/txt_reader.h \
+-	src/qtsingleapplication/qtsingleapplication.h \
+-	src/qtsingleapplication/qtlocalpeer.h \
+ 	src/qtzip/qtzipreader.h \
+ 	src/qtzip/qtzipwriter.h \
+ 	src/spelling/abstract_dictionary.h \
+@@ -219,8 +218,6 @@
+ 	src/fileformats/rtf_tokenizer.cpp \
+ 	src/fileformats/rtf_writer.cpp \
+ 	src/fileformats/txt_reader.cpp \
+-	src/qtsingleapplication/qtsingleapplication.cpp \
+-	src/qtsingleapplication/qtlocalpeer.cpp \
+ 	src/qtzip/qtzip.cpp \
+ 	src/spelling/dictionary_dialog.cpp \
+ 	src/spelling/dictionary_manager.cpp \
diff --git a/app-editors/focuswriter/focuswriter-1.5.2.ebuild b/app-editors/focuswriter/focuswriter-1.5.2-r1.ebuild
index c9cab120d623..13f2f1beb60e 100644
--- a/app-editors/focuswriter/focuswriter-1.5.2.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/focuswriter/focuswriter-1.5.2.ebuild,v 1.1 2014/07/31 10:49:52 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/focuswriter/focuswriter-1.5.2-r1.ebuild,v 1.1 2014/07/31 14:07:24 pinkbyte Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ IUSE="debug"
 RDEPEND="app-text/hunspell
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
+	dev-qt/qtsingleapplication[X]
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -29,8 +30,16 @@ DOCS=( ChangeLog CREDITS NEWS README )
 DOC_CONTENTS="Focuswriter has optional sound support if media-libs/sdl-mixer is
 installed with wav useflag enabled."
 
+PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+
+rm_loc() {
+	sed -e "s|translations/${PN}_${1}.ts||"	-i ${PN}.pro || die 'sed failed'
+	rm translations/${PN}_${1}.{ts,qm} || die "removing ${1} locale failed"
+}
+
 src_prepare() {
 	l10n_for_each_disabled_locale_do rm_loc
+	qt4-r2_src_prepare
 }
 
 src_configure() {
@@ -56,8 +65,3 @@ pkg_postrm() {
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
-
-rm_loc() {
-	sed -e "s|translations/${PN}_${1}.ts||"	-i ${PN}.pro || die 'sed failed'
-	rm translations/${PN}_${1}.{ts,qm} || die "removing ${1} locale failed"
-}