Use system qtsingleapplication. Patch by cyberbat. Bug #489136

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

3 files changed, 28 insertions, 21 deletions

diff --git a/media-video/minitube/ChangeLog b/media-video/minitube/ChangeLog
index 4c260b1d84a0..c66830da888c 100644
--- a/media-video/minitube/ChangeLog
+++ b/media-video/minitube/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/minitube
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.98 2014/11/06 21:43:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.99 2014/11/07 22:26:09 hwoarang Exp $
+
+*minitube-2.3-r1 (07 Nov 2014)
+
+  07 Nov 2014; Markos Chandras <hwoarang@gentoo.org> +minitube-2.3-r1.ebuild,
+  -minitube-2.3.ebuild:
+  Use system qtsingleapplication. Patch by cyberbat. Bug #489136
 
 *minitube-2.3 (06 Nov 2014)
 
diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
index 88c12adb7f78..a5c018e14079 100644
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -11,25 +11,25 @@ DIST minitube-2.3.tar.gz 955192 SHA256 7fb24e295dc3e2f4ce41add1ef71c7b1fef573835
 EBUILD minitube-2.0.ebuild 1601 SHA256 47765a34d72261aed59be9d0b8fc0ed961108588caee0363b8384d2f25195da5 SHA512 a689ae71ce22dc1708eb3288e04df492f668b296fce7fb2bec47aa09e0742b2f3b244f00ea422e26d3d2d98ceddaf1ed9dca42c5a504b65f1199711c97e90c1e WHIRLPOOL 210d1c54748e50c04a435b433f1993a8aa6fb9fb4ff355c3e88a16dd928c754e7512d026f84e22e2de4f3532857cbd0e17928f711e57805b98cd1aaa624a3a1a
 EBUILD minitube-2.1.6.ebuild 2256 SHA256 2ce3d55222338c926f96d629779833c2cfe90a197cd729994fca489ebb1a9610 SHA512 61eed6ad2ad345e564bb27b776e5459e1b82e160289c244276757ea563cefdd1b2ac878a4b155379e56bc238aab4ac76d93c7dab63275ce9ef7b62a90aa7cf5d WHIRLPOOL 5b2f2685f02e8336edd15a2ad429736b3ea0c3d988a67da8a5e09e5e450086242801b9e259aeb7d18d3ceef226ef55c0e65cc5b5e2e9774dd3541db6780281da
 EBUILD minitube-2.2.ebuild 2254 SHA256 7f0254039160a8344df2bb92652f19da1955cf62cdb2d1156c79cd07456c0732 SHA512 a4df658d60b2924449ee085c24d8712ff6b4468f6647f25930498bba36d6d871dedeccd8dd18f3473eeda8bd4d0bddb9c172b4bedc2b9fff44ebfec187080e2a WHIRLPOOL 865718461a1299d35935882767ed38269390cbabf0e1677c678aa64645c1e51abcf57216ff09c9ca99fa4204e50a2145485c02e8aa9b06d5713069ae0ffe1add
-EBUILD minitube-2.3.ebuild 2254 SHA256 cd89cb76c7adf3115c6eb2507a1f58fd77d08409fe9d24439957134301dd9e2b SHA512 bcf203654da7497659a3da47f9649ef075bf503f983d813933dbb4434dbf9388ba4a8f601bbedf6418378ce0a4e7a7f5ec5b1438ba3298ec8080e10e84271db0 WHIRLPOOL 214a5996f0bfb0abbcc359af4e244914718809ee4d912b47f2762f0a04f5e322e9f676502087359cadef1f627049ea1fa03794c881bff22866f09f666063beae
-MISC ChangeLog 14131 SHA256 140c7d4f0f3cefcd23ce9e1351baecfc041fda4e79da98db9a3a54c563b26332 SHA512 5088d4c7e6926882fb71752e48756169116e0f34dbec1e4c3042a5bbde87a85f1af32bca5c85d710db47f3baea1e0958ecb21f10fd0d131894b0bb512adcecee WHIRLPOOL 167801c5a9855aee34ff8e709bbd42bd281ada32caa65691cd8d55d3d8c4d4a249da02b722c99c9aa67e065c60976b2161461ef9d5996bf50da6994bb4387273
+EBUILD minitube-2.3-r1.ebuild 2331 SHA256 a034570f98251546815ebf53945cbb6b459e2d605f82650803863e3f322d4c72 SHA512 f0e7eab79c50f2eb8b7d93cf24ad27c7955eabd71e28934d40fde1c303a34ec0e1bcc3c8f2b13357d38366510865c14274be17f380a418a846ee63c199ee74ad WHIRLPOOL 296e6a731e45cd991b3bdc761e79deb37192fea406cf93ce2119d0bd654fca9c1df21ff7ae3572c9662b5ab9e9a8a6fe872f23230d2236b849ea6a29a3b57152
+MISC ChangeLog 14331 SHA256 23b7a0185dd926c04d00a336a51ca4de201fd1d62c33f8323f78215e7e15b520 SHA512 484cb051ef29e88b3fa81e1bc80504422c278d5ceb8c23653f6364cf8c5e2ffe3b569afdd649180e905ac554349ef1ee440a2c6df3743f26997e75b99020975c WHIRLPOOL d099cdd2daceeb74c5f6fbf88b25b2a8e44ead4844df1b07cb52b2052a247bcea3b9a5512133213b9ed7e61817259ab1b62d61558b88aaa9f8693d26a43fd102
 MISC metadata.xml 365 SHA256 787bfdbffa3c66857401088746db6b088e6978b135ffcbfb74d616fcbb223797 SHA512 383a31000daba792686a14f5594c6704295163a5b09730d5e8ed894bdbb595b9311b27c233e73e530ec1f7f8a2dca5fddf453159ec94f208bb5f300df0afd399 WHIRLPOOL fc3e39f5aed637fb4e83220153a104443f2d50297f50581771f77351812c3ddba6b223b30e064d27c5c6598eff4c2445897603cea05a98422a4884c6acf081a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUW+udXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUXUcCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88/JwQALFSuBbOSRnPOZlmOMlxnAox
-p6YNdQwdbI16puyqFdTNoeS19RRITQdzrsfrnerY6heZE8t00e2Hqes8kIE9NTk1
-1jHLcxJ9d/63ZPOI6UNPvsbX6NXpWctrGc44XcTsSNw1qVKkMdRecun0is3kqe+N
-BBO7+8VWQv4/QLju0QNiHy7207DYrEs5AR+ZMhaa49SogRgdk1007d1b9bGqGeRQ
-jlGcyI1OB3m6gqFg/K8HpifIvMmAOooTFhtRgjKrXRzbcNmXX/gbtwGv6nyB0duI
-bDxejdHivjpJlX0or2afc3j7x/I4kLdfvN3piUH3enn9jhqSS7GhFBmCFwedPHNm
-yff24yecfkWwe8/e3RyZVhZ17GZrOikk4jDnyGP/3TorBPgLs9CKU5HEntQRPqE2
-GcudBxm29js73axMg8bSmefkHaotGDCcu/HaB59/J2XK5VLsmYSuMzstRkbMYUy5
-BSFxybYVb6oTzmRzN6yP7r1Ooki2x8FRo2wWAhMijAC08mg0GDMqNCDayN9a9cf3
-HtDg/Q/0NDY8SQ5qGyF7f/eqHVY+UnG5ua+G1LycMiLX5MYZZ0YJmj9wLrIx/7Ew
-Y8+M0FQB+1Qo6z2KMf0mrjP/ltly8QIXdjUyyXTXG1UoR0ca95h+1IBVA3ozFQky
-CBpWp5GFFGQyVaV32634
-=Zpvs
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88eyYP/AyN/aQHp+kt0fODBewEpz5x
+L1joxrTLrmAv53VsVTTsEWwTAu1wpSLTxA1K/c7L9+xH7wpvCKMQ2yEaSzhHIufD
+75Q27R4Ib5hkBTDBB2jajc6wvEzTbPUdHENqjguHvuBt14aCa9+erMd95GrbLhqs
+v5uv59xsNIv/f43I/d51bBkNpbpM1quJzDhdTshpP12+HODB7SbRXkMPeaxJvK3+
+SU5/j7ShOhV5VBUymWJcGzBg92tdSvaPJhAdUMj24AMM51Osn5N2iYxTzLWfu/Gt
+ztsWm5Fawpnr+McydtxLS2y2nkP9lVQqyNXdDaHt8ieEUXW4mQc1VALFGU04T5jD
+s/eev+rq27Dkp0utQOnSvD5dGQzNCYP8CzLRUZMJoueJ8LHVb1zym3HiGx57S8y3
+95XJ1oODHllbSzWJn2gDcuwLZn2XSBbwf5lgylxS8YyPzOzyHuVMabYmY/ui/g2x
+ImbQB3Zn5/r6c1/Cx/AOAk0so6RWex1RoY3P1QspF3ldvQWWCkQvxX0+RvH3iAwr
+IF5RRB9zdcSAf7ch2IsAfuNGbmBJ2lfUvY/bsiCKIimyTldC+ieLgXFoJj1AcZ8T
+r8HqbI1uhxxIY2qBh8HcpBDhztnRjpAO6bd/dY/Sqk8F7fODRc+2PlKDGNHrPDQw
+NA8Y9QCZkV6fOvaAi70b
+=PHuJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/minitube/minitube-2.3.ebuild b/media-video/minitube/minitube-2.3-r1.ebuild
index 7c89aab31b0b..8188da6c821b 100644
--- a/media-video/minitube/minitube-2.3.ebuild
+++ b/media-video/minitube/minitube-2.3-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/media-video/minitube/minitube-2.3.ebuild,v 1.1 2014/11/06 21:43:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-2.3-r1.ebuild,v 1.1 2014/11/07 22:26:09 hwoarang Exp $
 
 EAPI=5
 PLOCALES="ar ca ca_ES da de_DE el en es es_AR es_ES fi fi_FI fr he_IL hr hu
@@ -31,6 +31,7 @@ DEPEND=">=dev-qt/qtgui-4.8:4[accessibility]
 		media-plugins/gst-plugins-faad:0.10
 		media-plugins/gst-plugins-theora
 	)
+	dev-qt/qtsingleapplication[X]
 "
 RDEPEND="${DEPEND}"
 
@@ -52,9 +53,9 @@ src_prepare() {
 	if [[ -n ${trans} ]]; then
 		sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
 	fi
-	# gcc-4.7. Bug #422977. Will probably be fixed
-	# once ubuntu moves to gcc-4.7
-	epatch "${FILESDIR}"/${PN}-1.9-gcc47.patch
+	sed -i \
+		's|include(src/qtsingleapplication/qtsingleapplication.pri)|CONFIG += qtsingleapplication|g' \
+		${PN}.pro || die "Failed to unbundle qtsingleapplication"
 	# Enable video downloads. Bug #491344
 	use download && { echo "DEFINES += APP_DOWNLOADS" >> ${PN}.pro; }
 }