Add tag and lyrics USE flags. Patch by Stephen Boyd <bebarino at gmail.com> in bug #171247. Removed 0.9 ebuild.

Package-Manager: portage-2.1.2.3

5 files changed, 29 insertions, 70 deletions

diff --git a/media-sound/sonata/ChangeLog b/media-sound/sonata/ChangeLog
index 0158cbd4752f..298a14dd9b75 100644
--- a/media-sound/sonata/ChangeLog
+++ b/media-sound/sonata/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sonata
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/ChangeLog,v 1.10 2007/02/20 18:46:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/ChangeLog,v 1.11 2007/04/15 19:56:03 ticho Exp $
+
+  15 Apr 2007; Andrej Kacian <ticho@gentoo.org> -sonata-0.9.ebuild,
+  sonata-1.0.1.ebuild:
+  Add tag and lyrics USE flags. Patch by Stephen Boyd <bebarino at gmail.com>
+  in bug #171247. Removed 0.9 ebuild.
 
   20 Feb 2007; Markus Rothe <corsair@gentoo.org> sonata-1.0.1.ebuild:
   Added ~ppc64
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 2c0043129510..a0ada62b53f3 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,24 +1,26 @@
-DIST sonata-0.9.tar.bz2 127882 RMD160 e3612ffdb3ee24d7031c45a93d21a5e9d6e6ce44 SHA1 f4686098b99eeb91485fa614987b2e5a66532de2 SHA256 037a6ae5bc3147be5c7136c1ddfbabd0f4aa09d2893a03c8f6d8474b7c09f5c7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST sonata-1.0.1.tar.bz2 165048 RMD160 82bda48617e48a07b24b598b5d310eca305ee9dd SHA1 e771538c1fc4f6299efc4699acffd8af7d529417 SHA256 dc817c2007d501c3bbb4476e7b4b73aab2104a2927ac217a48a54ae1f179971d
-EBUILD sonata-0.9.ebuild 1059 RMD160 3f89464aaf826e81dce0a8e8b53804287c00328c SHA1 1078fbd412dc1cde2e856c78350936aad4b7f9ee SHA256 067ff6f7ed30144eb2c3aa6deb7d4bdf6e89719c4c41a9b255a423abf35cb856
-MD5 2b1886f931872ae404ba1e26112c7a2e sonata-0.9.ebuild 1059
-RMD160 3f89464aaf826e81dce0a8e8b53804287c00328c sonata-0.9.ebuild 1059
-SHA256 067ff6f7ed30144eb2c3aa6deb7d4bdf6e89719c4c41a9b255a423abf35cb856 sonata-0.9.ebuild 1059
-EBUILD sonata-1.0.1.ebuild 1067 RMD160 a5d4122b3f321855115759e588a7e5edb1f1e475 SHA1 b4f00704f7072e41065d939d6bf007196586e492 SHA256 c8a85c0b5a76e8c95c37cb10e7913d5bb05aa249b3d45be0303d1d79e918ae7e
-MD5 53996e8fd8311b38b54d5e2157bd3da8 sonata-1.0.1.ebuild 1067
-RMD160 a5d4122b3f321855115759e588a7e5edb1f1e475 sonata-1.0.1.ebuild 1067
-SHA256 c8a85c0b5a76e8c95c37cb10e7913d5bb05aa249b3d45be0303d1d79e918ae7e sonata-1.0.1.ebuild 1067
-MISC ChangeLog 1647 RMD160 e6cad2c706eb91c8c0423cdbdc392becc2925109 SHA1 d3aa22fd6d4ecae98550daddf3d0fc87a30a8d36 SHA256 35d1027ab786745ce326ce0ae0fbeadb27dc651009a0a544fd074338fe9fe6d5
-MD5 793196c42ec55274a43f069b1312494f ChangeLog 1647
-RMD160 e6cad2c706eb91c8c0423cdbdc392becc2925109 ChangeLog 1647
-SHA256 35d1027ab786745ce326ce0ae0fbeadb27dc651009a0a544fd074338fe9fe6d5 ChangeLog 1647
+EBUILD sonata-1.0.1.ebuild 1155 RMD160 c701ff33ac31a58d8aa49419476f382b78976195 SHA1 40cdfbf4efd5aa616bc2a569ae7d42802b0a3bed SHA256 0adf7baededb133d405f14383b7b8d57f147ecef2e90f14d16917393350f4bbf
+MD5 b7355da9aac94cff30a9c4f087fc56ec sonata-1.0.1.ebuild 1155
+RMD160 c701ff33ac31a58d8aa49419476f382b78976195 sonata-1.0.1.ebuild 1155
+SHA256 0adf7baededb133d405f14383b7b8d57f147ecef2e90f14d16917393350f4bbf sonata-1.0.1.ebuild 1155
+MISC ChangeLog 1853 RMD160 81a110a2d9fc5020fa5317bfe8d32312caa136cb SHA1 ad8123c524895e83041b89b820de5b43e3b1a9e2 SHA256 58779de61599bdee929d13efd53235d494ed8aeec9939aaa3138229c2459ba67
+MD5 a77a5064fc31c20763c6978c00a22817 ChangeLog 1853
+RMD160 81a110a2d9fc5020fa5317bfe8d32312caa136cb ChangeLog 1853
+SHA256 58779de61599bdee929d13efd53235d494ed8aeec9939aaa3138229c2459ba67 ChangeLog 1853
 MISC metadata.xml 447 RMD160 47f21131d95b139c9c13102dc53fba9999a246b2 SHA1 974c22ce51d445e98fb37f4b96ac74209eb38aad SHA256 9c8e77fd798cb6410d7dea4fee82412649dbf478851518ff36976c0525fb0675
 MD5 d9809f6f0ee0060188f36b02ee46b234 metadata.xml 447
 RMD160 47f21131d95b139c9c13102dc53fba9999a246b2 metadata.xml 447
 SHA256 9c8e77fd798cb6410d7dea4fee82412649dbf478851518ff36976c0525fb0675 metadata.xml 447
-MD5 19e8fc8aed315c6d2d2a1966ba86937d files/digest-sonata-0.9 235
-RMD160 68be6110362bc87e331640e376a784b90e47b56d files/digest-sonata-0.9 235
-SHA256 9ea40c16731c76012a2c2d952383a06850914a9a25c69a3b53ae09089f01a0d4 files/digest-sonata-0.9 235
 MD5 88c60656815892cea3df5b5d2081490a files/digest-sonata-1.0.1 241
 RMD160 7ca2501dd15e23ec38dd11ff57cc496b165b8799 files/digest-sonata-1.0.1 241
 SHA256 2acedfa2eb228150e091e473f7bf5aaf98033e6dad5c01e270d8d0e419c05992 files/digest-sonata-1.0.1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGIoNaQlM6RnzZP+IRAq6iAJoCpftHQSseb26nwdfJT4Y5TtE4mQCeOAFj
+FdQgzHs8eHTeY+OlipdRcto=
+=ELM3
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sonata/files/digest-sonata-0.9 b/media-sound/sonata/files/digest-sonata-0.9
deleted file mode 100644
index 35a19e259a0f..000000000000
--- a/media-sound/sonata/files/digest-sonata-0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df2be78e039306f6b4a297204cd6a091 sonata-0.9.tar.bz2 127882
-RMD160 e3612ffdb3ee24d7031c45a93d21a5e9d6e6ce44 sonata-0.9.tar.bz2 127882
-SHA256 037a6ae5bc3147be5c7136c1ddfbabd0f4aa09d2893a03c8f6d8474b7c09f5c7 sonata-0.9.tar.bz2 127882
diff --git a/media-sound/sonata/sonata-0.9.ebuild b/media-sound/sonata/sonata-0.9.ebuild
deleted file mode 100644
index 2a862e02bfe5..000000000000
--- a/media-sound/sonata/sonata-0.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-0.9.ebuild,v 1.3 2007/01/09 21:10:56 swegener Exp $
-
-inherit distutils
-
-DESCRIPTION="A lightweight music player for MPD, written in Python."
-HOMEPAGE="http://sonata.berlios.de/"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="gnome"
-
-RDEPEND=">=virtual/python-2.4
-	>=dev-python/pygtk-2.6
-	gnome? ( dev-python/gnome-python-extras )"
-
-pkg_setup() {
-	if ! built_with_use '=x11-libs/gtk+-2*' jpeg; then
-		echo
-		ewarn "If you want album cover art displayed in Sonata,"
-		ewarn "you must build gtk+-2.x with \"jpeg\" USE flag."
-		echo
-		ebeep 3
-	fi
-}
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-	dodoc COPYING CHANGELOG README TODO TRANSLATORS
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}
diff --git a/media-sound/sonata/sonata-1.0.1.ebuild b/media-sound/sonata/sonata-1.0.1.ebuild
index f9621355a365..2ea2387d50d9 100644
--- a/media-sound/sonata/sonata-1.0.1.ebuild
+++ b/media-sound/sonata/sonata-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-1.0.1.ebuild,v 1.2 2007/02/20 18:46:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-1.0.1.ebuild,v 1.3 2007/04/15 19:56:03 ticho Exp $
 
 inherit distutils
 
@@ -11,11 +11,13 @@ SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 SLOT="0"
-IUSE="gnome"
+IUSE="gnome tagwriting lyrics"
 
 RDEPEND=">=virtual/python-2.4
 	>=dev-python/pygtk-2.6
-	gnome? ( dev-python/gnome-python-extras )"
+	gnome? ( dev-python/gnome-python-extras )
+	tagwriting? ( >=dev-python/tagpy-0.91 )
+	lyrics? ( dev-python/soappy )"
 
 pkg_setup() {
 	if ! built_with_use '=x11-libs/gtk+-2*' jpeg; then