removing the qt3support useflag, doesn't seem to be needed bug 545068

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

3 files changed, 25 insertions, 34 deletions

diff --git a/media-sound/spotify/ChangeLog b/media-sound/spotify/ChangeLog
index c74378ea2abe..8bff947b41bf 100644
--- a/media-sound/spotify/ChangeLog
+++ b/media-sound/spotify/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/spotify
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.38 2015/03/27 18:31:22 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.39 2015/04/03 01:42:41 prometheanfire Exp $
+
+*spotify-0.9.17.1-r1 (03 Apr 2015)
+
+  03 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +spotify-0.9.17.1-r1.ebuild, -spotify-0.9.17.1.ebuild:
+  removing the qt3support useflag, doesn't seem to be needed bug 545068
 
 *spotify-0.9.17.1 (27 Mar 2015)
 
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 6f60191c4309..19eb77bc5f9a 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -4,24 +4,24 @@ Hash: SHA256
 DIST spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb 42733568 SHA256 717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775 SHA512 a19403558c0a641b0264641501c9538f169b9e64d532e5d54dd67b7edbb27d400f07395014c9693fed298a1331c053cc9e62988d1293e9b1f1809d68a74646ad WHIRLPOOL 712ac07a3cd3230e3de17e9209380d0e0cc9a33c77cb4753e04490c5bb9a4e2d3e386ee92ffadecd9888ea701aa2a0c4c1b8c579cfa2f5b61d72981a5736f495
 DIST spotify-client_0.9.4.183.g644e24e.428-1_amd64.deb 47355040 SHA256 dd0d072013918498a65dbc26bfb3dda0aacd7ee122e300bccd39731d8da5d1fa SHA512 f596c79cc69508ec47f7579e73033127c403bed9209cef5b9c1cb88805054f85ebb38eaa28037ae2955a5fb14cc8b3c76b3c2d7668316e4d5a2c80d6fdd6c571 WHIRLPOOL 088c73004fb273d1d0ea143f4da212402a82109f9eb7464cf829f96cd8e0446a8adc976ecc16020a664653d2c8e6bc521b843d075a52c5867d97bbfac1b8cba3
 DIST spotify-client_0.9.4.183.g644e24e.428-1_i386.deb 41740148 SHA256 ca45d057357e4c30efee3838dd941222500463ddd0a1db6981e4d48d7ad986f2 SHA512 0f31fbf2274ca6cf16144bc85c8e71cfe347ad2994c100917a5912b413e976b2f913c3aea4d6cc7fd83bdf9d3c2836cc4d758f90f7afdb1078a14c93c23436d9 WHIRLPOOL bcce68c713606a3c092cf82356f56f4ad84f1e70046eef68ba9263ced73c0e101de082362e44050640ac8bfa968716d2ef7ca97f9e3cd2323e91ee4403b3b58d
-EBUILD spotify-0.9.17.1.ebuild 5365 SHA256 f239116494cf85b1d10abe97d2113e41f0e654614d3024b4883a3e610e0dccb9 SHA512 ef3cea36f94184288f1dac5ee812001160849f4d8be47a18576138a5a249649a2df8c56c22214b18ad982c65339dabbb91e4757e0f3f2609100645d2b1954869 WHIRLPOOL 84b6fdd2422ec5752a99e0f2b2b3306f1250b1218367323ecf10bd6f936b17922a92e7e1dde4e2ed9973f6f39106531bf55530ba2cd2c52206abc285760f009c
+EBUILD spotify-0.9.17.1-r1.ebuild 4603 SHA256 8e0fe5811ebe080cb3264a8740dc84a433a9f38032f04aac898c41fd9f012045 SHA512 df24e01e3cd60c75bd07dde22204ad1e559d816546d2a7ea232a52db16c29f6d713b430d8e04cb14a57097cec2de1aa0568c175af67ca10d2551cb00c93eaec1 WHIRLPOOL 2ba6e53c60b66915019cb018233ee0aa0ed186f4fb2d88f3dbf18bac6566cbcbb6ac3e4726819cace7a9ff79c805eeb9afb389ab2f0630648f07ba4bfa27e6a8
 EBUILD spotify-0.9.4.183-r9.ebuild 5651 SHA256 1c00c8c050ee5d7dda16c1f1971ff92baa75c496599f827866c051a3bb7a6482 SHA512 3fc4cf98fd1b64c4c67f2925bb72c79e8176a56f4c44ffd0c55db782087453bb84ac037312eb937a9378178e9c045b75588bcda1130c3834c66d85eaeb2c7532 WHIRLPOOL 25a8a7a4c4e9c91d4325503c49f26417c1d75f9b2bfef8637d9fb4f5dc672b1ce3f17b66e3378590b4afc5749d091a771d3b101d4a398fe10e1f29bbe2794d08
-MISC ChangeLog 6927 SHA256 41b1a90eaa998a9d9bb0d75f1ede9ba558bfd66294f3ef73ef3bf834a7d1557e SHA512 e7762eedfe5a0dd691b8e36aa714d7850b7a414ade846a6352c6c536072babee78897ace51838ced838867cc470a9e44d8a711d95b4cd513cf8daf9b1adbf051 WHIRLPOOL 8184709ee8e8a2e29513fa595146188f726f47f9eb515c079f7df71ecad9b814ed8ef415e6dd23c16f9767c5cd3f6cb54bb9cf7ea0a82e5e665715d63c2fb058
+MISC ChangeLog 7150 SHA256 91da0360f567cf9f18f2d866afd3117c4b64a9f3afba642b50efa5706fe9b060 SHA512 dfcead6a27aa14fd44fc5b8a8b17699fb76545207c75cfa43c0239f57d1e1c3fd95b84ca72d235e0d4fd8623e4870d5558a1070e5d3cee538c2bb8e6d235143c WHIRLPOOL 23d0a666e3da93347079cf73f20e84cd558981221a2f26389e6c020d61c61ef9c1c57578ce7f6fffc6fa54fc496a5fd2f74b21874f595abda911b3b4c4143eb5
 MISC metadata.xml 383 SHA256 2b8b3f4b10decd35022fb1973384e6d8ac74c439bcd104263651faada927b728 SHA512 b7be1a1ea17efea5c3d01d812a79e8c84137219c36d9a4ce511f473d99102953df615ce119e5d993253cf1ec65967a2df06f8e23eb2bfb2debe1e03049ffed29 WHIRLPOOL 431d2deed63c25a74019050e19618a1e1d5482b81c03f9d14cc8b01218cb96ca1bc703a94ecaa54a487c02608e6b0ac7080082a4f30ae49b3e8f22a3a81a3fea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVFaH8AAoJEGSje+quGaToRdwQAI+bMPGojnjWsfDhWaMVl8Ut
-GmkOT0yzbKz4p4kg6x1RM5Xyfc9Zrzrl7IwCCDctdl+w35NpjYhWMvjzQm/+l9st
-B4F0uj7ggCwlkppWbALLFAbpRFWfBYnVat5Vll9f93ngSV5DR3SH8zdo38jW0dfe
-hQCFwGBJqVvHb8xAqnNO0szOn9W0h/EQMXt+a36Kr+y7YMv2nitS/upczZVuU+Rc
-PED6NOAQpEK2KSRXY9ol9q4ie5GgoBbtj9kIweeOo1Hv5BF8ViDfLlHkvJdjKWU3
-EZhlSh+sZec+oVepi4LXWm2m0bu953djFpghpzBqmCwBvqt9TP65Lloj8YIF/Rn/
-AvDTfU3xGkFSYvj2LMVt+7HjgcM+Hs3YNLr+Lb86Y021YH7+HSB21xwZQqbF6qGe
-WO1eujM9TrGcoA+cXFn2O9WbddBMs+/0t4HMDNTswXN1JLEj6zqsQhtNhFjhwR3k
-NCQ9B09CtEjoECo9sDelgLEP0Kk8u6Ax6GE/QQjTjlGSoN8Z7CdiFCy7CgFTo75a
-gnIacWDbTqnt8mYHVBfrKUd80YsFUIkJsG5yNiWUPtYGcSHjnklRuzr676EeESD7
-/GsrW0A9oPIxT48WiZBIs0ybNIqMciPU0gRU6UEyz4c+LnMObtfy8hXfw71Dta62
-7U9hg4vmm34jlj03nO9O
-=T/M3
+iQIcBAEBCAAGBQJVHfAYAAoJEGSje+quGaToTqwP/2HRjLfgLxxRMwe6PZpuw+97
+aHS7WL/5cJqdcBvn79B/qSpqP2P5ooLD/JaseqEZqn7gLJs8/zg8hOpgCcfIs7wi
+XU9JzgFNWs8Xb1VYcPS8PM+9uKLcEQ1AsCooNvJViaBZgBuSUBZd6aU5KXDm90Rr
+Mmp0Qm1P5AC20hQppb5PL/sHipM/sRpVeI2NfA5IL6s8UNpzhX1Kb96IwOI4G9dz
+YnPZtSI2+XjFhynro9Pf/RTDanyJpDS2yNascwFduk0F5QN3kO3uDMa+iuogWmXZ
+f383TVee0poEprY7CSDzvjzZHtWtL5/5aE5hxLB+OIu+g4f1deaPo7egOL+iR/3x
+Bbvn8apHrGAIJjEj/MO/vI7Z+XnmKBu9CSSYTInjoPjH6J/5SpumXRwb7xSIkp4Z
+ellaCgk6DBlEM16giu1BHqRtBm5k75FQuVtjB/c6Z3V1DHLCXlNPv1fyVuK++EI6
+l+UPhO4iZBnBkgVNcM5uivZ7ieRmTJddP5RqlIbCNoHxat+FXKxGIxkemhwLWeRZ
+yypDiabq03tYknG8uHbrbBmsoksHepAiMwwuCOcagzLL7KDouxFC0UltX1psEZ0H
+TG0VcZIxCda28kn1oK6E3ymIWjej1nnDJasXfu+ldn7Le4kZPBvUmYv1do3ylUKu
+JQcfbx1RY2kdZkt0h9/s
+=2rGM
 -----END PGP SIGNATURE-----
diff --git a/media-sound/spotify/spotify-0.9.17.1.ebuild b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
index 8057f5765835..5fa252fca943 100644
--- a/media-sound/spotify/spotify-0.9.17.1.ebuild
+++ b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.17.1.ebuild,v 1.1 2015/03/27 18:31:22 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.17.1-r1.ebuild,v 1.1 2015/04/03 01:42:41 prometheanfire Exp $
 
 EAPI=5
 inherit eutils fdo-mime gnome2-utils pax-utils unpacker
@@ -34,9 +34,9 @@ RDEPEND="${DEPEND}
 		x11-libs/libXScrnSaver
 		x11-libs/libXrandr
 		x11-libs/libXrender
-		dev-qt/qtcore:4[qt3support,glib]
+		dev-qt/qtcore:4[glib]
 		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[qt3support,glib]
+		dev-qt/qtgui:4[glib]
 		dev-qt/qtwebkit:4
 		x11-misc/xdg-utils
 		media-libs/alsa-lib
@@ -70,14 +70,6 @@ QA_PREBUILT="/opt/spotify/spotify-client/spotify
 			/opt/spotify/spotify-client/Data/libcef.so"
 
 src_prepare() {
-#	# different NSPR / NSS library names for some reason
-#	sed -i \
-#		-e 's/\(lib\(plc4\|nspr4\).so\).9\(.\)/\1.0d\3\3/g' \
-#		opt/spotify/spotify-client/Data/SpotifyHelper || die "sed failed"
-#	sed -i \
-#		-e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1\x00\x00\x00/g' \
-#		-e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1\x00\x00\3\3/g' \
-#		opt/spotify/spotify-client/Data/libcef.so || die "sed failed"
 	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
 	if use gnome ; then
 	sed -i \
@@ -107,10 +99,6 @@ src_install() {
 	fperms +x ${SPOTIFY_HOME}/Data/SpotifyHelper
 
 	dodir /usr/bin
-#		LD_PRELOAD="\${LD_PRELOAD} ${SPOTIFY_HOME}/libnspr4.so.9 ${SPOTIFY_HOME}/libplc4.so.9"
-#		LD_LIBRARY_PATH="${SPOTIFY_HOME}/Data/"
-#		export LD_PRELOAD
-#		export LD_LIBRARY_PATH
 	cat <<-EOF >"${D}"/usr/bin/spotify
 		#! /bin/sh
 		exec ${SPOTIFY_HOME}/spotify "\$@"
@@ -144,9 +132,6 @@ src_install() {
 		eqawarn "please open a bug."
 	fi
 
-#	#hack to fix the nspr linking in spotify
-#	dosym /usr/lib/libnspr4.so "${SPOTIFY_HOME}/libnspr4.so.9"
-#	dosym /usr/lib/libplc4.so "${SPOTIFY_HOME}/libplc4.so.9"
 	#TODO fix for x86
 	dosym /usr/lib/libudev.so "${SPOTIFY_HOME}/Data/libudev.so.0"
 }