Version bump to 1.0.0, remove all older (probably semi-broken) versions to avoid version number confusion.

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

13 files changed, 184 insertions, 278 deletions

diff --git a/media-sound/pithos/ChangeLog b/media-sound/pithos/ChangeLog
index bc609bafce8b..3c3beca91441 100644
--- a/media-sound/pithos/ChangeLog
+++ b/media-sound/pithos/ChangeLog
@@ -1,26 +1,21 @@
 # ChangeLog for media-sound/pithos
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/ChangeLog,v 1.5 2014/04/06 10:45:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/ChangeLog,v 1.6 2014/09/22 18:20:08 chutzpah Exp $
 
-  06 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> pithos-20130710.ebuild,
-  pithos-20130808.ebuild, pithos-99999999.ebuild:
-  Pin gst-python to 0.10 slot.
+*pithos-1.0.0 (22 Sep 2014)
 
-  09 Aug 2013; Patrick McLean <chutz@gentoo.org> pithos-99999999.ebuild:
-  Update patch names in 99999999 so it actually works.
-
-*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).
+  22 Sep 2014; Patrick McLean <chutzpah@gentoo.org> +pithos-1.0.0.ebuild,
+  +pithos-9999.ebuild, -pithos-20130710.ebuild, -pithos-20130808.ebuild,
+  -pithos-99999999.ebuild, +files/pithos-1.0.0-icons.patch,
+  -files/pithos-20130808-detect-datadir.patch,
+  -files/pithos-20130808-dont-notify-volume.patch,
+  -files/pithos-detect-datadir.patch, -files/setup.py, metadata.xml:
+  Version bump to 1.0.0, remove all older (probably semi-broken) versions to
+  avoid version number confusion.
 
 *pithos-99999999 (11 Jul 2013)
 
-  11 Jul 2013; Patrick McLean <chutzpah@gentoo.org> -pithos-9999.ebuild,
+  11 Jul 2013; Patrick McLean <chutz@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.
@@ -28,7 +23,7 @@
 *pithos-20130710 (10 Jul 2013)
 *pithos-9999 (10 Jul 2013)
 
-  10 Jul 2013; Patrick McLean <chutzpah@gentoo.org> +pithos-9999.ebuild,
+  10 Jul 2013; Patrick McLean <chutz@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 fe1ff9be2ed2..2bde5fc4bd55 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,21 +1,26 @@
 -----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
-DIST pithos-20130808.tar.gz 138217 SHA256 aee6755562a5391ad9e1edcc35633e11f8575ee128da4d0faf5d8746966ca317 SHA512 c62df5c9b45569ea59cc013c69c2359e8217ee2aac4d87dbc7bdd0af6a72926f1962f213bec9885891621abb9f4ffe01b9f49e6728b1025042eadc5ddabe49a4 WHIRLPOOL d21ca3695a96d12c5a93f21d3b9c109b2dd1b72c289a5aac00a59ca40cdf3bf72ffe8a0d2a56cd210e44d2173fc6c38c9f0d02ac7cb8af7d5d5d390c0d49a28a
-EBUILD pithos-20130710.ebuild 1406 SHA256 8d681a89a1b81e70ff7716e89ed2cb16c5b4ce7e3b431c756d25a5ff77dc09ec SHA512 e762a66949864f4386c8b11f993ed5b81633e6d42ae9801f1d858b452e81ba720f4a4745a92413b0511f477ec6bd6f5ae6c1d0fb8075dd26bfd0682914517068 WHIRLPOOL 91a24e4abfbbfc2fab37df55a51f09733c44d3dca0b09491a96fea7e4483817ca2954609e24505c6dfd04301f20001ba474bd1050c858d53b256fa21a5c90f49
-EBUILD pithos-20130808.ebuild 1460 SHA256 dfea9404717a4dddd96534c162bc4b9a815787ab780da73ad7b7f7f1066e0df2 SHA512 06dff38f1a7f34bbfcc048527060dcd9505dbbbfe455f68317771566e1ce771a0d6befc6d58c6fa3410bf1e13e952532c664a8675fc54f3fc4ab44679fce8673 WHIRLPOOL 73c92466aee6cd71684f5ac8e4fb48c354960c877fd3e9fef77413fae0021ebd468a5357e4035dded9c0ef49709b9f4aa7c7c01e14056e456ddbb0c6b5879e7c
-EBUILD pithos-99999999.ebuild 1434 SHA256 4963fb88557d31fc6ffb87a8970ebd9dd7b807d93e0a0fc7ea490320e6b6a62e SHA512 907aa4ae75c8fa00c7b856d6cb6a2d6c3a03f4149f8bdecec5b08b1670dd3dcce90f49cce4e3e0a1eed98c0c0ea945870e8df871472548c96f0c94160600ea58 WHIRLPOOL 590ecdda796569cc7b383a248201073ff85981065bac6ecf7ba1aa62fc717b7e0652f3c1060f523d5511df431d32601d700da29211c265761ba3284f5a0ee723
-MISC ChangeLog 1363 SHA256 f00ae741fee864590f70806ca7b4ab0ad14ec9641c95d0cb14b9c0854f9325cd SHA512 ee0a622429a42ac5d55c0c6bc84209da79975d0f7a1b6b19925cc764c5f13dd90c70be5a09ff7cd4ab76f04ea2e5ff3d4fec50bf41d660b05e53455d091e4fa3 WHIRLPOOL fb2d858b143212dbcd743492d7a556bffd97ca50d5a36ad1b07106d6dd3de2cdadfad4e4d1d6286bf4e4a2491e3f056a1b58f4075c2163de6c31451ee70d4dac
-MISC metadata.xml 235 SHA256 eeecec82a9d4e1a6330fa485c7503118f87431a470fc7da57412778731048f74 SHA512 2fa3e4bfc7d03b52e6cb2b8c5c791ace815d2590fd89005dbc15127a9a155439982a5b256440a63af63a0013818f371ab57c363de78ab4096219e775b361a3e6 WHIRLPOOL 68556a383f7efe32bd43d3891e57c9c075b03b7cdd4f7f06d088a84119de3c0db6b94f5eb461e3b351cc13eda5c0f2c89c7faa71f7b68d90c3eecd43953102bf
+AUX pithos-1.0.0-icons.patch 3715 SHA256 c213cd137143f3f33684cb14a6c85cf485ad2713af86de25b8ca7bb5270c0344 SHA512 4ef1c42be15af27ecfa8b601e0bf2f1626a7fc0ca1e3be0a1d51f9f548a344900456f7b0f9e2fef78552efe8f7e305fbed5dc577931d608b28ee3aeedda34e29 WHIRLPOOL 580917476a60684ec349b9b3f32eec903b0a11db40e597b3fccffb3dc1db13e48f308b505c56ecc5bcfabb6bdcf60a31108f84395f49d919dea69d0d94efb54c
+DIST pithos-1.0.0.tar.gz 107108 SHA256 cacd1a09e984fd83c4e9f38fa41feb0990981e0fd14d7b8c64e99cff294a9184 SHA512 175c2c6d06b111063b0d1b655aa8386797a27be8161a446a2056959d5f6281ed92b88a8a7b92b0a35d9eebb23d7dcfbeb02ee62a5f4541df6d602f1f4543b6dd WHIRLPOOL 1ec296cdb10ab86a4ad7893cd15c45081237d9001f9975fbc8ffb7e0ce2502417e3101b4484ce61510417143d202863a25d6a0235ea64e86a68fe1947d0f18ba
+EBUILD pithos-1.0.0.ebuild 1144 SHA256 6a399b762f31c47f5042d68227a344410979c25bd08985c7ed9a69b8fa100167 SHA512 5541ca697ef71095c67e6c507a923187a931e316ef6d6b9317258c0320b64f8f0f3496ed0e6240429937ca553bd1df88b0813def847c575ce886f3db91bf95b7 WHIRLPOOL 4ab8416b3cf7690bfec80212522ddbfebe788e1fada4048435b9d6a939efdd0194503c8d58b5398d9225b25349537b99795e617601c3039cb0a9d99e209d6ef4
+EBUILD pithos-9999.ebuild 1137 SHA256 cbb97a9d89db3e1f8b7e187d9536032278a83cad84fd825b4ac2e65418a0c285 SHA512 941982ee5db1e761a08c4a4dd7dd5250e4a6e53932386b9840f8f4a74f45b30a9260bbe0844afa8988f8b6b23a819e578fbf16bb3d753c51e2efa84c76770439 WHIRLPOOL ff6bc327e997c6c08aefb90c3d1e821b6c56d6c61052b4a6cbc270a24992948f64f6bfc326c7943879eb6a68bc5e0993a874474a2be5469d8faa6a4a96016c8b
+MISC ChangeLog 1200 SHA256 1cdb9f83d77bc375bae843eebc040110e322a2b1f74928ec82695f664367d486 SHA512 9918b9fbc6681cce166fa60f978e6c3e88ff20e3db3bb102e005e55f939c89cadeac13e5c9c71da086fe2d5ebaefa9845ed7b0e58175ba07a76f28c863d1b202 WHIRLPOOL ad7c1b6d2d452f4a82696ed97272a1f97ec37f0f3beafc6f922472d593d1e8f202ee07fecf12ed1cff6e3ce710964bb0b5adb600678c323a93c9465c924d5650
+MISC metadata.xml 425 SHA256 13a13e53e82ccfd151f2eeda14c885cc607da1fa87668dc33b4f78b9fd19c565 SHA512 6f34248b39894bd9f12554a18600afd1587e661c658c5b1e9a744d1c74114c3dd07596f890039d461faf3646dfe76534065fb8afba2396ce6db8163afcff0427 WHIRLPOOL ac8de0fa27bda383a3e31a68bc1edcdb8b7afa083657b0f4c849df48f2ea73615310e51107fad178d465c1e56c0d05f28f524adde42899e070b8bc93c270e86f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNBMEgACgkQ1fmVwcYIWAa2IACg7qrFli0y7qut9R/3CcWhkRwX
-NWMAoIgAqU9ciCLSFP4eGpDjZlQJ0sjP
-=Lci5
+iQIcBAEBCAAGBQJUIGhZAAoJEHy/RO9cNQiDRR4P/1/nKSPJGHHgBx5lDe4OnuWc
+7NqZrjwzcgMco0twpPxwbCcTV/ULrPoAe7/osILBauiMqn3MwSRNMqoAiLAXBcHB
+tK17tzhorBw8qbvNHIFGiX6Cdv8516iWjoW/ZF/wFboQ8zYs20A06TNDgjfmqD2+
+qH166NQghFRawtwexatGg0+qktQCoZYRiB7IJ+inhTEaJT5/uzn705Uz4n63fB8w
+cLf1EclvzceCsRKHbFj/6oaCXm2csJYPgj+6RaRliXFlk8zd3whcX4+90grm7OT0
+t8fKjQYnGPNY/hLoA76J6c6LMExbudJM7tSBKs5eAmnKSKq2IXy72SlpOH/uG4sF
+ZmPcT59uePGAOCufxT8a9Pc0G3zftKNF+Qs4x6s4By0KCHUZVxBvS+5gqgKmY/N1
+um1SIhlofoF/UQ27tRWoeXwtxqgvy0vCPCStpd3p+tPziWj6I6olKTFjWWfWv0+L
+7tzCfaPM8pmbTxwPHoOMbxhmBSMmpQwhMhGgFT42ydO//LxB0WOcL2otYGrv5jxc
+tlilF59uob6qlUd0nCqr/exLF6d4ykBk3PMOqlPQvRdDBq8J8YCUvjhPdTsg80b+
+6NbepzXc8AgTgaTy6KKS1zFzJyeKfS+Toxa435OUZI8wQ3Syt0IIxWNk0UKx5nrb
+YgSnIgciOn8azGoEnRIL
+=0ytb
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pithos/files/pithos-1.0.0-icons.patch b/media-sound/pithos/files/pithos-1.0.0-icons.patch
new file mode 100644
index 000000000000..ea2ceb0e3bba
--- /dev/null
+++ b/media-sound/pithos/files/pithos-1.0.0-icons.patch
@@ -0,0 +1,68 @@
+diff --git a/pithos/data/ui/PithosWindow.ui b/pithos/data/ui/PithosWindow.ui
+index 711892f..722dad0 100644
+--- a/pithos/data/ui/PithosWindow.ui
++++ b/pithos/data/ui/PithosWindow.ui
+@@ -48,7 +48,7 @@
+                           <object class="GtkImage" id="playpause_image">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="icon_name">media-playback-start-symbolic</property>
++                            <property name="icon_name">media-playback-start</property>
+                             <property name="icon_size">2</property>
+                           </object>
+                         </child>
+@@ -69,7 +69,7 @@
+                           <object class="GtkImage" id="skip_image">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="icon_name">media-skip-forward-symbolic</property>
++                            <property name="icon_name">media-skip-forward</property>
+                             <property name="icon_size">2</property>
+                           </object>
+                         </child>
+@@ -88,10 +88,10 @@
+                         <property name="relief">none</property>
+                         <property name="focus_on_click">False</property>
+                         <property name="orientation">vertical</property>
+-                        <property name="icons">audio-volume-muted-symbolic
+-audio-volume-high-symbolic
+-audio-volume-low-symbolic
+-audio-volume-medium-symbolic</property>
++                        <property name="icons">audio-volume-muted
++audio-volume-high
++audio-volume-low
++audio-volume-medium</property>
+                         <signal name="value-changed" handler="on_volume_change_event" swapped="no"/>
+                         <child internal-child="plus_button">
+                           <object class="GtkButton" id="volumebutton-plus_button2">
+@@ -160,7 +160,7 @@ audio-volume-medium-symbolic</property>
+                           <object class="GtkImage" id="image14">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="icon_name">dialog-information-symbolic</property>
++                            <property name="icon_name">dialog-information</property>
+                           </object>
+                         </child>
+                       </object>
+diff --git a/pithos/pithos.py b/pithos/pithos.py
+index e7e0c97..8076b7e 100755
+--- a/pithos/pithos.py
++++ b/pithos/pithos.py
+@@ -489,7 +489,7 @@ class PithosWindow(Gtk.ApplicationWindow):
+             self.playing = True
+         self.player.set_state(Gst.State.PLAYING)
+         GLib.timeout_add_seconds(1, self.update_song_row)
+-        self.playpause_image.set_from_icon_name('media-playback-pause-symbolic', Gtk.IconSize.SMALL_TOOLBAR)
++        self.playpause_image.set_from_icon_name('media-playback-pause', Gtk.IconSize.SMALL_TOOLBAR)
+         self.update_song_row()
+         self.emit('play-state-changed', True)
+ 
+@@ -500,7 +500,7 @@ class PithosWindow(Gtk.ApplicationWindow):
+     def pause(self):
+         self.playing = False
+         self.player.set_state(Gst.State.PAUSED)
+-        self.playpause_image.set_from_icon_name('media-playback-start-symbolic', Gtk.IconSize.SMALL_TOOLBAR)
++        self.playpause_image.set_from_icon_name('media-playback-start', Gtk.IconSize.SMALL_TOOLBAR)
+         self.update_song_row()
+         self.emit('play-state-changed', False)
+ 
diff --git a/media-sound/pithos/files/pithos-20130808-detect-datadir.patch b/media-sound/pithos/files/pithos-20130808-detect-datadir.patch
deleted file mode 100644
index ba3414bb9277..000000000000
--- a/media-sound/pithos/files/pithos-20130808-detect-datadir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index cf605b32441e..000000000000
--- a/media-sound/pithos/files/pithos-20130808-dont-notify-volume.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/pithos-detect-datadir.patch b/media-sound/pithos/files/pithos-detect-datadir.patch
deleted file mode 100644
index 018f8e368fa3..000000000000
--- a/media-sound/pithos/files/pithos-detect-datadir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/pithos/pithosconfig.py b/pithos/pithosconfig.py
-index dd46d2b..f82b458 100644
---- a/pithos/pithosconfig.py
-+++ b/pithos/pithosconfig.py
-@@ -1,22 +1,25 @@
- # -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; -*-
- ### BEGIN LICENSE
- # Copyright (C) 2010-2012 Kevin Mehall <km@kevinmehall.net>
--#This program is free software: you can redistribute it and/or modify it 
--#under the terms of the GNU General Public License version 3, as published 
-+#This program is free software: you can redistribute it and/or modify it
-+#under the terms of the GNU General Public License version 3, as published
- #by the Free Software Foundation.
- #
--#This program is distributed in the hope that it will be useful, but 
--#WITHOUT ANY WARRANTY; without even the implied warranties of 
--#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-+#This program is distributed in the hope that it will be useful, but
-+#WITHOUT ANY WARRANTY; without even the implied warranties of
-+#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- #PURPOSE.  See the GNU General Public License for more details.
- #
--#You should have received a copy of the GNU General Public License along 
-+#You should have received a copy of the GNU General Public License along
- #with this program.  If not, see <http://www.gnu.org/licenses/>.
- ### END LICENSE
- 
- # 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/setup.py b/media-sound/pithos/files/setup.py
deleted file mode 100644
index 0d5776ae4a98..000000000000
--- a/media-sound/pithos/files/setup.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# replacement for setup.py for pithos as the included one is.. less than ideal
-
-from os import walk
-from glob import glob
-from os.path import join
-from setuptools import setup, find_packages
-
-DATA_DIR = '/usr/share/pithos/'
-ICON_DIR = '/usr/share/icons/hicolor/'
-APP_DIR = '/usr/share/applications'
-
-datadir = 'data'
-datadirs = ['ui', 'media']
-icondir = 'data/icons'
-bindir = 'bin'
-
-datafiles = [[(join(DATA_DIR, root.partition(datadir)[2].lstrip('/')), [join(root, f) for f in files])
-             for root, dirs, files in walk(join(datadir, data))][0] for data in datadirs]
-
-datafiles += ([(join(ICON_DIR, root.partition(icondir)[2].lstrip('/')), [join(root, f) for f in files])
-               for root, dirs, files in walk(icondir)])
-
-datafiles += [(APP_DIR, glob('*.desktop'))]
-
-setup(
-    name='pithos',
-    version='0.3',
-    ext_modules=[],
-    license='GPL-3',
-    author='Kevin Mehall',
-    author_email='km@kevinmehall.net',
-    description='Pandora.com client for the GNOME desktop',
-    packages=find_packages(),
-    url='https://launchpad.net/pithos',
-    data_files=datafiles,
-    scripts=glob('bin/*'),
-)
diff --git a/media-sound/pithos/metadata.xml b/media-sound/pithos/metadata.xml
index 340136403603..a1bf7a1b8aa6 100644
--- a/media-sound/pithos/metadata.xml
+++ b/media-sound/pithos/metadata.xml
@@ -5,4 +5,8 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<use>
+		<flag name='appindicator'>Enable usage of appindicator to export menu options in to unity</flag>
+		<flag name='keybinder'>Use keybinder to enable global key bindings</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/pithos/pithos-1.0.0.ebuild b/media-sound/pithos/pithos-1.0.0.ebuild
new file mode 100644
index 000000000000..81afb3dfedbc
--- /dev/null
+++ b/media-sound/pithos/pithos-1.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-1.0.0.ebuild,v 1.1 2014/09/22 18:20:08 chutzpah Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python3_3)
+inherit eutils distutils-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/pithos/pithos.git
+		https://github.com/pithos/pithos.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="http://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify appindicator +keybinder"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/pylast[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	libnotify? ( x11-libs/libnotify )
+	appindicator? ( dev-libs/libappindicator:3 )
+	keybinder? ( dev-libs/keybinder:3 )"
+
+PATCHES=("${FILESDIR}/${P}-icons.patch")
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/media-sound/pithos/pithos-20130710.ebuild b/media-sound/pithos/pithos-20130710.ebuild
deleted file mode 100644
index e3cbbc010b4b..000000000000
--- a/media-sound/pithos/pithos-20130710.ebuild
+++ /dev/null
@@ -1,45 +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/pithos/pithos-20130710.ebuild,v 1.3 2014/04/06 10:45:27 eva Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-inherit eutils distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/kevinmehall/pithos.git
-					https://github.com/kevinmehall/pithos.git"
-else
-	MY_PV="759fd22b993b063527866dedfb335a88d0c71766"
-	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:0.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	media-plugins/gst-plugins-meta:0.10[aac,http,mp3]
-	gnome? ( gnome-base/gnome-settings-daemon )
-	!gnome? ( dev-libs/keybinder[python] )"
-
-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
-}
diff --git a/media-sound/pithos/pithos-20130808.ebuild b/media-sound/pithos/pithos-20130808.ebuild
deleted file mode 100644
index b457a1627555..000000000000
--- a/media-sound/pithos/pithos-20130808.ebuild
+++ /dev/null
@@ -1,49 +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/pithos/pithos-20130808.ebuild,v 1.2 2014/04/06 10:45:27 eva 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:0.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	media-plugins/gst-plugins-meta:0.10[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-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
new file mode 100644
index 000000000000..53015d2a3493
--- /dev/null
+++ b/media-sound/pithos/pithos-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-9999.ebuild,v 1.3 2014/09/22 18:20:08 chutzpah Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python3_3)
+inherit eutils distutils-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/pithos/pithos.git
+		https://github.com/pithos/pithos.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="http://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="libnotify appindicator +keybinder"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/pylast[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	libnotify? ( x11-libs/libnotify )
+	appindicator? ( dev-libs/libappindicator:3 )
+	keybinder? ( dev-libs/keybinder:3 )"
+
+PATCHES=("${FILESDIR}/${P}-icons.patch")
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/media-sound/pithos/pithos-99999999.ebuild b/media-sound/pithos/pithos-99999999.ebuild
deleted file mode 100644
index 774937b40797..000000000000
--- a/media-sound/pithos/pithos-99999999.ebuild
+++ /dev/null
@@ -1,49 +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/pithos/pithos-99999999.ebuild,v 1.4 2014/04/06 10:45:27 eva 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=""
-	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=""
-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:0.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	media-plugins/gst-plugins-meta:0.10[aac,http,mp3]
-	gnome? ( gnome-base/gnome-settings-daemon )
-	!gnome? ( dev-libs/keybinder[python] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20130808-detect-datadir.patch
-	"${FILESDIR}"/${PN}-20130808-dont-notify-volume.patch
-)
-
-src_prepare() {
-	# replace the build system with something more sane
-	cp "${FILESDIR}"/setup.py "${S}"
-
-	distutils-r1_src_prepare
-}