Reorganize ebuild and depends wrt #205597

Package-Manager: portage-2.1.4

3 files changed, 25 insertions, 42 deletions

diff --git a/media-sound/sonata/ChangeLog b/media-sound/sonata/ChangeLog
index e3d79467b184..b1d9840b8bcc 100644
--- a/media-sound/sonata/ChangeLog
+++ b/media-sound/sonata/ChangeLog
@@ -1,6 +1,9 @@
 # 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.15 2007/09/26 12:14:37 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/ChangeLog,v 1.16 2008/01/13 15:06:51 drac Exp $
+
+  13 Jan 2008; Samuli Suominen <drac@gentoo.org> sonata-1.2.2.ebuild:
+  Reorganize ebuild and depends wrt #205597
 
   26 Sep 2007; Christoph Mende <angelos@gentoo.org> sonata-1.2.2.ebuild:
   Stable on amd64 wrt bug #193786
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 64f2fc899bc3..5436236ac06b 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST sonata-1.0.1.tar.bz2 165048 RMD160 82bda48617e48a07b24b598b5d310eca305ee9dd SHA1 e771538c1fc4f6299efc4699acffd8af7d529417 SHA256 dc817c2007d501c3bbb4476e7b4b73aab2104a2927ac217a48a54ae1f179971d
 DIST sonata-1.1.1.tar.bz2 188438 RMD160 42ca328e5569b17f3c3a3396258b49e4552721ed SHA1 278ef615018be65fc6ea9d0c345be8b8b6f2c5f6 SHA256 4c421501346a19fb643eb904377a525f0817ccb7725b8a8db4020b0e9b10bab3
 DIST sonata-1.2.2.tar.bz2 200498 RMD160 574358554ead893f8202bc30ae261015f47c6810 SHA1 b13a3c840f62fc2f9723ebfc91e83416bbee7149 SHA256 9c3356639c15307af7dc6647bff0eebb17945363eb852de726ac4d2a2cb5bc70
@@ -12,14 +9,14 @@ EBUILD sonata-1.1.1.ebuild 1236 RMD160 946d9281af1076a88b85fbef9808a564de47da6f
 MD5 be3114261a102f5b8109c57f7bbdcffc sonata-1.1.1.ebuild 1236
 RMD160 946d9281af1076a88b85fbef9808a564de47da6f sonata-1.1.1.ebuild 1236
 SHA256 78ae51bfecea2cebff6e9ecfe1fd58ea9356504b860c613558fe834c252ba598 sonata-1.1.1.ebuild 1236
-EBUILD sonata-1.2.2.ebuild 1237 RMD160 23f61973ca06c0bc08c01de0cccbb6542659ddaf SHA1 30e2f0130da352d3e5755ff30c7dde74bb0dceec SHA256 3435cb3bf770a96be4e8c930763ef8394fc99f81f6e9bde9a3782235066fbef1
-MD5 1c6d820d4669097db206dde0088d08dc sonata-1.2.2.ebuild 1237
-RMD160 23f61973ca06c0bc08c01de0cccbb6542659ddaf sonata-1.2.2.ebuild 1237
-SHA256 3435cb3bf770a96be4e8c930763ef8394fc99f81f6e9bde9a3782235066fbef1 sonata-1.2.2.ebuild 1237
-MISC ChangeLog 2429 RMD160 f812af8be00b4f95b4f874bbb5d0e1ff72b13c7e SHA1 406af7ec9b51f8169b167c54f3de7a159070bec8 SHA256 a4641b84013e0ff32d4c3e273d158243f2b0903a3a34e69265695eb078f0a8af
-MD5 8b1bad3594ded57901a9c494b9580c7c ChangeLog 2429
-RMD160 f812af8be00b4f95b4f874bbb5d0e1ff72b13c7e ChangeLog 2429
-SHA256 a4641b84013e0ff32d4c3e273d158243f2b0903a3a34e69265695eb078f0a8af ChangeLog 2429
+EBUILD sonata-1.2.2.ebuild 1153 RMD160 7cdc6c8399fa6d2c42bfca867c89c6d1369af472 SHA1 94a3e595488a62ead55c260002f4d7db955007fd SHA256 5f0bf8514a268a92fe1e918301399dea06f2852d3ce7499f90cdb2a6d9a28760
+MD5 d15e14189bc9ce4097c0fd9ad8dec6ec sonata-1.2.2.ebuild 1153
+RMD160 7cdc6c8399fa6d2c42bfca867c89c6d1369af472 sonata-1.2.2.ebuild 1153
+SHA256 5f0bf8514a268a92fe1e918301399dea06f2852d3ce7499f90cdb2a6d9a28760 sonata-1.2.2.ebuild 1153
+MISC ChangeLog 2541 RMD160 7a5922bfced9cd499bcd41b68716b6e44e6e9511 SHA1 74f28f2285ca774126c364908213032c04e2c153 SHA256 34a1d95a604276927ef49f1549e96c56fde8cff58baa0a3589e0c9d1c6de7bf1
+MD5 74fe2161801e53805d73de26e59bf8cf ChangeLog 2541
+RMD160 7a5922bfced9cd499bcd41b68716b6e44e6e9511 ChangeLog 2541
+SHA256 34a1d95a604276927ef49f1549e96c56fde8cff58baa0a3589e0c9d1c6de7bf1 ChangeLog 2541
 MISC metadata.xml 447 RMD160 47f21131d95b139c9c13102dc53fba9999a246b2 SHA1 974c22ce51d445e98fb37f4b96ac74209eb38aad SHA256 9c8e77fd798cb6410d7dea4fee82412649dbf478851518ff36976c0525fb0675
 MD5 d9809f6f0ee0060188f36b02ee46b234 metadata.xml 447
 RMD160 47f21131d95b139c9c13102dc53fba9999a246b2 metadata.xml 447
@@ -33,10 +30,3 @@ SHA256 96f5c1061e7281ec5d4f1c86165f87ac2f8172f151e2d364a825b7584ee9fad1 files/di
 MD5 20cc924df95c9a1acb72ebb33a704c4a files/digest-sonata-1.2.2 241
 RMD160 4b47bfffb0173bbcd6c4a376db9f917e64ee3a42 files/digest-sonata-1.2.2 241
 SHA256 96483f9540a3094306a9c2a4b3212ee1e807a59667879f7fa9cabcfc43f76488 files/digest-sonata-1.2.2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG+k0zKhnDs22gwa8RArh8AJ4m8jwVWvWhc+a98ArDoEO2L+yuvQCfZt6V
-Gji9tIsuGPe48SwueCHHvOk=
-=PpAh
------END PGP SIGNATURE-----
diff --git a/media-sound/sonata/sonata-1.2.2.ebuild b/media-sound/sonata/sonata-1.2.2.ebuild
index d17618f6b447..deb66589dfe1 100644
--- a/media-sound/sonata/sonata-1.2.2.ebuild
+++ b/media-sound/sonata/sonata-1.2.2.ebuild
@@ -1,51 +1,41 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-1.2.2.ebuild,v 1.2 2007/09/26 12:14:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-1.2.2.ebuild,v 1.3 2008/01/13 15:06:51 drac Exp $
 
-inherit distutils
+inherit distutils fdo-mime multilib python
 
 DESCRIPTION="A lightweight music player for MPD, written in Python."
-DESCRIPTION="Sonata is an elegant GTK+ music client for the Music Player Daemon (MPD)."
-HOMEPAGE="http://sonata.berlios.de/"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://sonata.berlios.de"
+SRC_URI="http://download2.berlios.de/${PN}/${P}.tar.bz2
+	http://download.berlios.de/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc64 ~x86"
 SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="taglib lyrics dbus"
 
-DEPEND=""
 RDEPEND=">=virtual/python-2.4
 	>=dev-python/pygtk-2.10
 	taglib? ( >=dev-python/tagpy-0.91 )
 	dbus? ( dev-python/dbus-python )
 	lyrics? ( dev-python/soappy )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 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
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
-	python_version
 	python_mod_cleanup
+	fdo-mime_desktop_database_update
 }