Fix call for music directory, upstream bug #743484 (thanks to foser for reporting the bug and the fix); drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 43 insertions, 66 deletions

diff --git a/media-sound/gnome-music/ChangeLog b/media-sound/gnome-music/ChangeLog
index 68328083c170..0dd45fc12c3d 100644
--- a/media-sound/gnome-music/ChangeLog
+++ b/media-sound/gnome-music/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/gnome-music
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-music/ChangeLog,v 1.22 2015/01/19 13:12:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-music/ChangeLog,v 1.23 2015/01/25 15:07:47 pacho Exp $
+
+*gnome-music-3.14.3-r1 (25 Jan 2015)
+
+  25 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-music-3.14.3-music-dir.patch, +gnome-music-3.14.3-r1.ebuild,
+  -gnome-music-3.14.2.ebuild, -gnome-music-3.14.3.ebuild:
+  Fix call for music directory, upstream bug #743484 (thanks to foser for
+  reporting the bug and the fix); drop old
 
 *gnome-music-3.14.3 (19 Jan 2015)
 
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 2e2f10258b52..dfaf029dbc63 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnome-music-3.14.3-music-dir.patch 976 SHA256 9e96208cd35917c1fdb630a96ca0a99eab84fe2528d9def8a157e7064877d501 SHA512 421c027b28c6218b4472224ba56c0d997b3ecc59bfffb7dbbd53e10d13e22baa6d4763979857d06644db7051e10fc2ef04f3d3afd90640f82d7dc59aed304bea WHIRLPOOL b2cdcc84a3f869ccc497ec2e9105b2a578c3a6d8d2c36fbdd9020b55a5171ae2d4540cfd1a6a03f4c8a35742293a39252893ae0dcb591eda097a5c50d1c291ac
 DIST gnome-music-3.12.2.1.tar.xz 1423164 SHA256 9f0c99283853f054e3c5b4ad15df1e8fe3ac07bc046ac0f019ef0600ca969fef SHA512 8dc1b665b7e236e404dbc996a56216e90b8f3e0f61fe2ec719ed478a2900130af371312f04fe4a83ff9f5b975ce92b76e3654878ebeb72b2c49bcfdd996022a4 WHIRLPOOL 50d86204d2ed4b87b23f2d9c2ae0431913a7dc3e09eeb7e220aee70c8addf6047b4d88cdec1c789ba4f374c81a0bb1c6e2e0c532cf815e4cb61298664eaace5a
-DIST gnome-music-3.14.2.tar.xz 1463220 SHA256 f322897cabfab464e424ab7ff3c7d759912c977b365009dc02f074cf971afb35 SHA512 812abb624b8b08fb4247b9ba314a1f02a80d83a6ff195480a0beb4db990cf3e701cef52ed3042b7fc35545d658c939c8b7ae923f61c3f87c4d59175e70f55ffa WHIRLPOOL 693a54ecb8b5281566d9a5cebd848f0a185cee57f05a0e4da84ff953d0eee8376a1155b93faacacbbf80cf1d4727b8da7c6e8d9bf4b1f4abd32fd75ac378571b
 DIST gnome-music-3.14.3.tar.xz 1466112 SHA256 30bec04bb506f8dfc9a41ccf89243ed7422736f65e804482a3b4ed2b7b80e55d SHA512 b76c263f88f996fe8570c49db0b01bff9d407f1770b5052258b5eba7139d5c70c16f1dd6548fbdfa3e6f8b4f66227fced66821a8d054e80f0220f6770ddd1f6b WHIRLPOOL b8659d3ea10975d345bd56f859d257ac0b81874a1a53a4b5692e062435ed2f8ff3b293c18c775740baee5a5e9bc4c74f1241782b505ec7ec62dda79d3da138f0
 EBUILD gnome-music-3.12.2.1.ebuild 1380 SHA256 dd5c8f58ac7df7d92c88bfeec8816c8aa4a5395c681ae515ade63ca9ce392ac6 SHA512 a306e465835b1d8f995418633cd6acb4b8c8495f14ff133f2fdb3c2468db752644bf9c22a59dfe845402f38203c16202fe32a3d682fbcb938214e5909fe0d8f3 WHIRLPOOL 6684e942c8fedf708436ef6fce2d74451ee4b50ce274b9eacffeedc74f18bb3d3b3d327fba6fac090049fbdb75fde3e43cd49d525c4a75f6f0884055e9ccd9ee
-EBUILD gnome-music-3.14.2.ebuild 1436 SHA256 abdfadf6ef349129c62ed24bc0ef43c7b97a76f0db02966707cdcd8687ff2db6 SHA512 0387c538e2c0ed1f12f042e1d336a46902a86a93f58fd723beca27bf35525f19565e3d895654e7e27cb855de498fa2ad786271204f3cff355240058a4cc82032 WHIRLPOOL 01c20e51f4e8644fe0e92cfbbbe91978ad2838c1e92ccc7da1501e0d30587410b748a0b729e9fc70881449f635250bbeaedf73fa1cc4e5366439622fa80a6afc
-EBUILD gnome-music-3.14.3.ebuild 1577 SHA256 ffb6dfdfdae1e24de3b5e621989ba2b37f204b3de507ba64abad8dc0c73050ed SHA512 1cdbf69871d26789f398c0bb4b507c77d228a3d62b3e85ec465dddacd6c7a61625cf455e14de8348c99af52a90f7d97ab9031630e14b2660f0e03a6f66635bc6 WHIRLPOOL b10d666aa14aaad5ed29eee160dd0c28e467a54b1b02d35ca16eb802da1531bfb1a88cbbcdd47a90a04b04ffaddde505035eac4ac57c9519d98af1ff67f4e2e9
-MISC ChangeLog 3019 SHA256 66030f4495bfac5aaf5e4e8a8516bd290863c0ba1f5a663c0410c2df0dedecce SHA512 114ff5ec7a6dd3415e65b0ff8c3de3fa2e39f67968eb3d6104f2adc6ccb5ea91dc6bbe21fa727bbf2107b57883777e1208cee785fb3f43e54f50dc75be7ff942 WHIRLPOOL 07b7e9ed0cefbccea08232cb826693f1fb23f0571f5866b3b08bcf3805c23ff2f37f529803e01791763ffb4e228492ed501d560ad0e7d8c9dad54205d39435d4
+EBUILD gnome-music-3.14.3-r1.ebuild 1724 SHA256 39a2c80c2a4ace2d95b8b78758af9d642749515b9154088511377f9c8cbad507 SHA512 65a698e1f1e8319b3085c92972463abd79e267f71657f7527c79fcb41c2f039d487e925d65cdb7b744fa4c46d6977e0ad82e86e9b19cb104d5e2609b3cccab75 WHIRLPOOL ae09cf24d17a63e08744a545714706b7d7fa02dcac1e170368d3672e1a5c91d0228ab13382b82197153fb90526ccb49ce6903f0050c55c5665e9dcfae0ada6bf
+MISC ChangeLog 3355 SHA256 adffc85ce8889dbda1f41617c583023f3711be928c5aa7bdab00fcfbfe34bd5f SHA512 cf24a5809e0a42b5de8836a6968d27b5f971f90f7477cfad20d94764cf5f724b94ea12ddd8bfa0791c6e79b89d9e69e7267e64932d331218e34c6a357fd45812 WHIRLPOOL c7a0681515f94d65e3b68f0c449a8953e370d2e84f65370733f12dbef3decc9223d8859d431efe2d5e02cf05ad748e14a6213007da14d01bf00890a519b6e636
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS9ArAACgkQCaWpQKGI+9SKkwCeOi9hNZ2nm7bsU4Ti3aV0kpIu
-l/AAnAwu3e5I6+ClWhiGhoQlOpOPfnrR
-=+TKA
+iEYEAREIAAYFAlTFBsQACgkQCaWpQKGI+9SLjACfe0O+1iubSx+np0F1dheQQpC7
+rTwAnR2GETRMd7f5xBO26au/BdCFUqM3
+=hAvh
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gnome-music/files/gnome-music-3.14.3-music-dir.patch b/media-sound/gnome-music/files/gnome-music-3.14.3-music-dir.patch
new file mode 100644
index 000000000000..3d69f155c1b9
--- /dev/null
+++ b/media-sound/gnome-music/files/gnome-music-3.14.3-music-dir.patch
@@ -0,0 +1,21 @@
+--- gnome-music-3.14.3/gnomemusic/query.py~	2015-01-19 13:14:23.000000000 +0100

++++ gnome-music-3.14.3/gnomemusic/query.py	2015-01-25 15:30:42.478238978 +0100

+@@ -30,14 +30,14 @@

+ 

+ class Query():

+     music_folder = None

+-    MUSIC_URI = None

++    MUSIC_DIR = None

+     download_folder = None

+-    DOWNLOAD_URI = None

++    DOWNLOAD_DIR = None

+     try:

+         music_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)

+-        MUSIC_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(music_folder))

++        MUSIC_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(music_folder))

+         download_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOWNLOAD)

+-        DOWNLOAD_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(download_folder))

++        DOWNLOAD_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(download_folder))

+ 

+     except TypeError:

+         print("XDG user dirs are not set")
\ No newline at end of file
diff --git a/media-sound/gnome-music/gnome-music-3.14.2.ebuild b/media-sound/gnome-music/gnome-music-3.14.2.ebuild
deleted file mode 100644
index 6fd3c14a0574..000000000000
--- a/media-sound/gnome-music/gnome-music-3.14.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-music/gnome-music-3.14.2.ebuild,v 1.1 2014/12/22 23:38:19 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="http://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-# Let people emerge this by default, bug #472932
-IUSE+=" +python_single_target_python3_3 python_single_target_python3_4"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-1.35.9
-	>=media-libs/grilo-0.2.6:0.2[introspection]
-	media-libs/libmediaart:1.0
-	>=x11-libs/gtk+-3.13.2:3[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	app-misc/tracker[introspection(+)]
-	|| (
-		app-misc/tracker[gstreamer]
-		app-misc/tracker[ffmpeg]
-	)
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.2[tracker]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure ITSTOOL="$(type -P true)"
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/gnome-music/gnome-music-3.14.3.ebuild b/media-sound/gnome-music/gnome-music-3.14.3-r1.ebuild
index fd3bba8e09d4..99f60b3499d7 100644
--- a/media-sound/gnome-music/gnome-music-3.14.3.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.14.3-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/gnome-music/gnome-music-3.14.3.ebuild,v 1.1 2015/01/19 13:12:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-music/gnome-music-3.14.3-r1.ebuild,v 1.1 2015/01/25 15:07:47 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -50,6 +50,12 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	# Fix call for music directory, upstream bug #743484
+	epatch "${FILESDIR}"/${PN}-3.14.3-music-dir.patch
+	gnome2_src_prepare
+}
+
 src_configure() {
 	gnome2_src_configure ITSTOOL="$(type -P true)"
 }