Version bump, add PYTHON_USEDEP dependencies (bug #479930). Add patch to disable annoying volume notifications (bug #480286).

Package-Manager: portage-2.1.13.5/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

7 files changed, 131 insertions, 36 deletions

diff --git a/media-sound/pithos/ChangeLog b/media-sound/pithos/ChangeLog
index 66f8cd59cd5f..868d035c7466 100644
--- a/media-sound/pithos/ChangeLog
+++ b/media-sound/pithos/ChangeLog
@@ -1,10 +1,19 @@
 # ChangeLog for media-sound/pithos
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/ChangeLog,v 1.2 2013/07/11 17:06:04 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/ChangeLog,v 1.3 2013/08/08 21:24:48 chutzpah Exp $
+
+*pithos-20130808 (08 Aug 2013)
+
+  08 Aug 2013; Patrick McLean <chutzpah@gentoo.org> pithos-20130710.ebuild,
+  +pithos-20130808.ebuild, pithos-99999999.ebuild,
+  +files/pithos-20130808-detect-datadir.patch,
+  +files/pithos-20130808-dont-notify-volume.patch:
+  Version bump, add PYTHON_USEDEP dependencies (bug #479930). Add patch to
+  disable annoying volume notifications (bug #480286).
 
 *pithos-99999999 (11 Jul 2013)
 
-  11 Jul 2013; Patrick McLean <chutz@gentoo.org> -pithos-9999.ebuild,
+  11 Jul 2013; Patrick McLean <chutzpah@gentoo.org> -pithos-9999.ebuild,
   +pithos-99999999.ebuild:
   Rename pithos-9999 to pithos-99999999 so the live will have a higher version
   that the release.
@@ -12,7 +21,7 @@
 *pithos-20130710 (10 Jul 2013)
 *pithos-9999 (10 Jul 2013)
 
-  10 Jul 2013; Patrick McLean <chutz@gentoo.org> +pithos-9999.ebuild,
+  10 Jul 2013; Patrick McLean <chutzpah@gentoo.org> +pithos-9999.ebuild,
   +pithos-20130710.ebuild, +files/pithos-detect-datadir.patch, +files/setup.py,
   +metadata.xml:
   Initial import.
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index afd6827c3cdb..49d4a057f6d1 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,27 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pithos-20130808-detect-datadir.patch 629 SHA256 c5046cdd89d602b704df6c4638a9899bfcb8a38f6cccc626bae074102e3f1439 SHA512 ec5059e39f42bf33442222d3135c17f2b6d93087e355d4d6693322b9493dc654a059a91138f5b280220dd49cdc183df719e8f114582015954e8924cfa66b97cc WHIRLPOOL c412a6b82df777387bd543247ed722aeb20c4a064081e224baf56b8c447a5d88ce51bbd061ac455591de0fade45a63358bfbe4df3840251018409967a6d99c64
+AUX pithos-20130808-dont-notify-volume.patch 591 SHA256 76447fe32e8f6ece44f90ba9243daf7b653605717c3cbed7b39cb28f75254c24 SHA512 9f3a7dd2ab96c3e242031df2d597cee06745099b16e42552dad6ba337138dfbe7d9b2874220f57d23db9d6175a3960470a0341592183e484a02e9a3f2b654429 WHIRLPOOL 6baa818fc7df84426b9c8a9d2a83459a2887c68d14d8665bb04099b36e33f6e865d7a523279f73c62ecb83dbd67c65136d76e9ace011330c0820b2e1cf0e655a
 AUX pithos-detect-datadir.patch 1818 SHA256 59d46cd8a8a7b91be6f5252f900fa67acd8d7cf812ef4b7d041ad4f89ee7e25f SHA512 3dc757b5b1fae074eb30e28872ec050e123bf386128482b4687429b96aec8962c48ff2e8f15c2d9edb990dff3a4a92a7fc59e62cf15a8d01ed1522c9f673b9d6 WHIRLPOOL 648328ee123ee8f6df497e4878437da1d734c6488690d1edf6919f87f9072b6e10e9e5f1fa1d7416107ff3a2fa4c2972c40d775cab231d6fbe22c58bf901bf9d
 AUX setup.py 1120 SHA256 2297bbdfede1f81214f94a215992610c077a20a5995ebf987cc69e8a9804f07d SHA512 8669452b177031c9eb20de122b0d0644dc16703e8d502b4e7cc4e2ceacc18ff123275a995af2fc128fe14a31e39b1922e6791d5d77d07b90f0b0c97cd46d5f86 WHIRLPOOL 9eca6e86d2c2bb14ea313e97ba2bf3fa35eaa7ccc152767bc9343ee5d97d65115e48156baef746ec13e83a33852ab9830be543899032afe7cab62046b66f5774
 DIST pithos-20130710.tar.gz 138260 SHA256 db6dcdcacb90757396295c4ac7b3f1af9ce4bc2c5ef425e0bfc3dabc106c7d86 SHA512 8e975075e4fee61ffe6520bc8bcf882861cb98c0c04a2a351fa2da3501576771cf095094efc75e94f11c6ad5fc9010dce38bb8a875f0c44ec5501492b65593f8 WHIRLPOOL 8c0c18742f7ee6d21eaf1da99beb5c4d5dc16678f0c2f64d43398ea89d90f9b8e7876145ed877fd52030ddd49b3e6e102f86263de84c91f4f1d111f0d605f8dc
-EBUILD pithos-20130710.ebuild 1275 SHA256 d511f5eb25b9ae3129b511152a8444cdffcb428fa29102746053e4bfbfaaf892 SHA512 13e72a5f31ced563cb627f7da4362ae26620101f69ade2b319c40023a5477bad3dbb227a73e758438a4f79243e68b9e8b6783e7be9770a08462bfdd237801077 WHIRLPOOL 5793aef854224277399f0cf28011ebac980bed2d468c14317b69823ef464b1e2f590e3c63e24d69ce49d3a63e1758c789d5bddd59bac8e775b982798ab200bfb
-EBUILD pithos-99999999.ebuild 1233 SHA256 6bf56c04b398350a28cc03c840c43a90a5c0c1ce366ae7abb07e80f9aacd5025 SHA512 4eeb920338c2992ec16d4f5fda2c7502e42e462e22143444cbc61f141e353b0b9b2f8b843c07d3e3853e9c6c655ddb0cf523b8866674e0ff9f954280b147d9b5 WHIRLPOOL 372f8bdaa15e1ad392ca2c044a7e5d77397a46020950198eece59376aad5787d536012dbeb8c81ddc07a0cb36a6c8f30dd007c8ee879ab9e55cc2208c8a37797
-MISC ChangeLog 685 SHA256 deab1e44622dd4411da9873c66c2ad6bf4b105feb010a9688e4fb2acbdc4e30c SHA512 a1ded4c1d3df888c6e8e3966c317ada53362b8b405e13e1452c91fa06aadbc0a8c8bbe26996048ca60945782c9ba32dd174950f8bbba616acc5fcdae4e394a05 WHIRLPOOL 98bdb62668981408e8b63d0963f7d95bf6e3fee36ab66a8ba1b621731ed804bc7bce5a522b6cb2193fa79f39578b68371292561471247e874c473e845ed61772
+DIST pithos-20130808.tar.gz 138217 SHA256 aee6755562a5391ad9e1edcc35633e11f8575ee128da4d0faf5d8746966ca317 SHA512 c62df5c9b45569ea59cc013c69c2359e8217ee2aac4d87dbc7bdd0af6a72926f1962f213bec9885891621abb9f4ffe01b9f49e6728b1025042eadc5ddabe49a4 WHIRLPOOL d21ca3695a96d12c5a93f21d3b9c109b2dd1b72c289a5aac00a59ca40cdf3bf72ffe8a0d2a56cd210e44d2173fc6c38c9f0d02ac7cb8af7d5d5d390c0d49a28a
+EBUILD pithos-20130710.ebuild 1401 SHA256 478a8eb5ddea86af5f9dc77884e36a8583250fe880c63e5cc7464bd6c4a88df5 SHA512 c317e968da6d45ae81e5ab57b7ab71b0077a98d580bcaac61a1cda3cb43ef36729c917af1ed41d60ec265def58c80515e8d506d9c3a013941420d731d33f35ec WHIRLPOOL 91ed8033beb2ee4e734f5ea27e58af3f5ab6973e6da6f1d82893dbef65811e23ad728d7013f2161a2650cb37dda21a36e03b0c02836e1a109556b718a60c7519
+EBUILD pithos-20130808.ebuild 1455 SHA256 d8af50b223ac5852b12ec219d18a821f0b42b19761457c0f3276d479c06952d6 SHA512 af277d76a50655dcb733b220a263452252b31723f26e6ad20b51853c5881a5d200a30a3a745149bba09c6848449249ef9a565a3769017d6b18d6042c55ab2bc1 WHIRLPOOL 8108e76869d7aed94bbdedf7f7bfca66635b60d77e3152298ee059c42095a643251c01883a41ea6d91c9bdd9b608ba7982cb1cd723d3753e1ffa1168a05cc4ae
+EBUILD pithos-99999999.ebuild 1409 SHA256 48528083558d0f12fa0861c0d3d50405c9f206d8436a729208bd747ee8275828 SHA512 ea7e3898c1fc86bf68971cbf244a753d252c76bb5cab2f668c1b2a17c315f8d8116eac1b620d279e39f27684b71d97806130a942aa96fe4a0965f44b54728966 WHIRLPOOL a02edae384c18c098e1248d3ea08c157c54d833d00ff58f40b6a903270c2d48eef8e8047841b28e806a42690b04c9d1dab61aadbcdafd99528272ec0633f3fc8
+MISC ChangeLog 1079 SHA256 b475021d4e790ae150abcb20539c87997d2150f3e2757adc3ac8041f392c8705 SHA512 faffb3978ebbbd9f060bd24e76a04c2ec4b7c1361da46695b5958dba901109b3959b024d68180d0cdeb97501660177a6fdc4e0a3ca2eedbdefeae0e5778a8d84 WHIRLPOOL e4c29eb4eaa8923bd0fc198030b2ba70b04bf1e603f56d469aabf9b647c1d10279d7e9a1dd20bb459fd779dcc4cada6ac4ab5b280e835bfc23f3a6ff82e29f64
 MISC metadata.xml 235 SHA256 eeecec82a9d4e1a6330fa485c7503118f87431a470fc7da57412778731048f74 SHA512 2fa3e4bfc7d03b52e6cb2b8c5c791ace815d2590fd89005dbc15127a9a155439982a5b256440a63af63a0013818f371ab57c363de78ab4096219e775b361a3e6 WHIRLPOOL 68556a383f7efe32bd43d3891e57c9c075b03b7cdd4f7f06d088a84119de3c0db6b94f5eb461e3b351cc13eda5c0f2c89c7faa71f7b68d90c3eecd43953102bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR3uX9AAoJEHy/RO9cNQiDzCUQALf0ojl5tX7n/Zf5mn13VwQj
-EH2dNluO4DvUxLRBHnmqXFsjxEXNoAAVW2LsaszXK9dj2ygYv62l42Rnd0UqS5Z8
-3HFqmRItJufTplqwudhiY6GiVb3bXpnEsDohxgdFe1RMqCHOQEZA97NgbMrwGblw
-TvE6m0b+P1Gj1yNl/v3lojBrUnxB/096lQvyr/UfJ21NSB1t5VsNdMxShaU+bHIc
-tpsdlaiJLvaNe+HedOS1JHp7K1gJOvIky3QdxN+exCp6RHfp0MrLczZbOl9zPkiJ
-gDTUghmbA6Igth8RnYuBdx4ClheIa5J12vq1WXwx1LNXKMIzhzqr45+fb/r9e7Qz
-PamQyFeKQLgAkslI2TN4MGNhqMflYaFacDY1Z2pbwNiTgIRc+tKKmuehXBZBq5cl
-jrhmHH61s/Pzb1EFgKrbAeynTjh8IcdkxMSVo4UjzNkOuVf5z7BAvwv3/wFBSCiN
-B99C7aSI8vQY5Ni6ZiRcv/TXlNmhqgS3L4lcnc2hv0EFsPU0UxqPrNHia6LZcyFy
-4qPUQ66TMCYZ33/m1Sya/HndFy63TUpFHQnUg3BKfMGuo8/RDiwY4JYYE9YHMlX5
-svDT+V1kAeMIE5ZknR/ZQE3aI8KZTVa7GiQdBZyx9wsevgotsCQrYw7f6v1iLQag
-O7p93YTxGmQfNZuFRVeY
-=FGhH
+iQIcBAEBCAAGBQJSBAyiAAoJEHy/RO9cNQiDPrMP+wYUNfFs5WKNOorNa+JQe827
+35+/vozI5VboyAbWeqE5EgpODHCtKTin+akZidLPcanTMuwWG+SnNJsoZFIA25Jz
+nqEdFPd7Da/1klfaE7xk25DtoqSjE/nflkPD2VlaqeZ8enHPKoHg+1yA1d+JHHyD
+0KRGrJPiXvTI2yhksKL6AkQo9CRyHD2+Wx7HxuJfF3N6YwTeDoJ7aq91KkE1pTEe
+16yS+LbzA6Aev5L9mFbhfL5BzZGr4zP2qFeHPhPRs2WaLsYZkqk583MESQymw84q
+2zx2YzV3RksZKEJRkgR1ak/jLlNA2RhQbdFTcxn8iJQ1DB8oYfzu7uHhWtewK5pm
+umLdSaXBrMKXvlxDrTRibMj6RbOlVO1ByNXdUHjfURCA6F7CqUQblnS2VWeCdywb
+1nVrQ7AnvfDpGLOEs9T6bzutaMds5xT8QSamiiKPivXizeye45+i1tyMp52VxNCJ
+6mN0JOTY4va9JfcZhX8BtslQno/2WMXkExpM9dNxjcrlavAKBnwUdzLdVdXCyvqF
+BJGEWq9gSe9WDKfoJfDS57RzbovNn0I5XPx5qrRydTbPA0MU9JFhvt+Qq7nhA8LS
++EUHx66TVS7RGO4dRcUrRVdHcw2OYr/B3+IiEIOjTtehN9uJOKpA36Nlsk4BbszK
+03rcHiilO7bTQSypesEN
+=27sH
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pithos/files/pithos-20130808-detect-datadir.patch b/media-sound/pithos/files/pithos-20130808-detect-datadir.patch
new file mode 100644
index 000000000000..ba3414bb9277
--- /dev/null
+++ b/media-sound/pithos/files/pithos-20130808-detect-datadir.patch
@@ -0,0 +1,16 @@
+diff --git a/pithos/pithosconfig.py b/pithos/pithosconfig.py
+index dfaaf5d..f82b458 100644
+--- a/pithos/pithosconfig.py
++++ b/pithos/pithosconfig.py
+@@ -16,7 +16,10 @@
+ 
+ # where your project will head for your data (for instance, images and ui files)
+ # by default, this is ../data, relative your trunk layout
+-__pithos_data_directory__ = '../data/'
++from os.path import isdir, normpath, join
++__pithos_data_directory__ = (normpath(join(__file__, '../data/'))
++                             if isdir(join(__file__, '../data/'))
++                             else '/usr/share/pithos')
+ __license__ = 'GPL-3'
+ 
+ VERSION = '0.3.17'
diff --git a/media-sound/pithos/files/pithos-20130808-dont-notify-volume.patch b/media-sound/pithos/files/pithos-20130808-dont-notify-volume.patch
new file mode 100644
index 000000000000..cf605b32441e
--- /dev/null
+++ b/media-sound/pithos/files/pithos-20130808-dont-notify-volume.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/pithos b/bin/pithos
+index 725ad7b..62ddd88 100755
+--- a/bin/pithos
++++ b/bin/pithos
+@@ -204,7 +204,7 @@ class PithosWindow(gtk.Window):
+         bus.connect("message::eos", self.on_gst_eos)
+         bus.connect("message::buffering", self.on_gst_buffering)
+         bus.connect("message::error", self.on_gst_error)
+-        self.player.connect("notify::volume", self.on_gst_volume)
++        #self.player.connect("notify::volume", self.on_gst_volume)
+         self.player.connect("notify::source", self.on_gst_source)
+         self.time_format = gst.Format(gst.FORMAT_TIME)
+ 
diff --git a/media-sound/pithos/pithos-20130710.ebuild b/media-sound/pithos/pithos-20130710.ebuild
index 47c6fc89d587..65caf14830c2 100644
--- a/media-sound/pithos/pithos-20130710.ebuild
+++ b/media-sound/pithos/pithos-20130710.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-20130710.ebuild,v 1.1 2013/07/10 23:14:43 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-20130710.ebuild,v 1.2 2013/08/08 21:24:48 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
@@ -24,14 +24,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gnome"
 
-DEPEND="dev-python/setuptools"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-RDEPEND="dev-python/pyxdg
-	dev-python/pygobject:2
-	dev-python/notify-python
-	dev-python/pygtk
-	dev-python/gst-python
-	dev-python/dbus-python
+RDEPEND="dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/gst-python[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
 	media-plugins/gst-plugins-meta[aac,http,mp3]
 	gnome? ( gnome-base/gnome-settings-daemon )
 	!gnome? ( dev-libs/keybinder[python] )"
diff --git a/media-sound/pithos/pithos-20130808.ebuild b/media-sound/pithos/pithos-20130808.ebuild
new file mode 100644
index 000000000000..bc735e44dcd6
--- /dev/null
+++ b/media-sound/pithos/pithos-20130808.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-20130808.ebuild,v 1.1 2013/08/08 21:24:48 chutzpah Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+inherit eutils distutils-r1
+
+if [[ ${PV} == 99999999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/kevinmehall/pithos.git
+					https://github.com/kevinmehall/pithos.git"
+else
+	MY_PV="6c9a9ff1660bb8c35b846cb5763f8a131228b6d4"
+	SRC_URI="https://github.com/kevinmehall/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="A Pandora Radio (pandora.com) player for the GNOME Desktop"
+HOMEPAGE="http://kevinmehall.net/p/pithos/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnome"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/gst-python[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	media-plugins/gst-plugins-meta[aac,http,mp3]
+	gnome? ( gnome-base/gnome-settings-daemon )
+	!gnome? ( dev-libs/keybinder[python] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-detect-datadir.patch
+	"${FILESDIR}"/${P}-dont-notify-volume.patch
+)
+
+src_prepare() {
+	# replace the build system with something more sane
+	cp "${FILESDIR}"/setup.py "${S}"
+
+	distutils-r1_src_prepare
+}
diff --git a/media-sound/pithos/pithos-99999999.ebuild b/media-sound/pithos/pithos-99999999.ebuild
index 00bea458d062..c01589ab664b 100644
--- a/media-sound/pithos/pithos-99999999.ebuild
+++ b/media-sound/pithos/pithos-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-99999999.ebuild,v 1.1 2013/07/11 17:06:04 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-99999999.ebuild,v 1.2 2013/08/08 21:24:48 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
@@ -24,21 +24,25 @@ SLOT="0"
 KEYWORDS=""
 IUSE="gnome"
 
-DEPEND="dev-python/setuptools"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-RDEPEND="dev-python/pyxdg
-	dev-python/pygobject:2
-	dev-python/notify-python
-	dev-python/pygtk
-	dev-python/gst-python
-	dev-python/dbus-python
+RDEPEND="dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/gst-python[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
 	media-plugins/gst-plugins-meta[aac,http,mp3]
 	gnome? ( gnome-base/gnome-settings-daemon )
 	!gnome? ( dev-libs/keybinder[python] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-detect-datadir.patch
+	"${FILESDIR}"/${P}-dont-notify-volume.patch
+)
+
 src_prepare() {
 	# replace the build system with something more sane
-	epatch "${FILESDIR}"/${PN}-detect-datadir.patch
 	cp "${FILESDIR}"/setup.py "${S}"
 
 	distutils-r1_src_prepare