Improve desktop entry and scalable icon install and stabilize amd64.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 60 insertions, 142 deletions

diff --git a/media-sound/pympd/ChangeLog b/media-sound/pympd/ChangeLog
index 8fb8c12bbad8..2b2313f0bbf6 100644
--- a/media-sound/pympd/ChangeLog
+++ b/media-sound/pympd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pympd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/ChangeLog,v 1.21 2008/05/30 07:06:49 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/ChangeLog,v 1.22 2009/05/22 02:29:48 ssuominen Exp $
+
+  22 May 2009; Samuli Suominen <ssuominen@gentoo.org> -pympd-0.06.1.ebuild,
+  -pympd-0.07.ebuild, pympd-0.08.1.ebuild,
+  +files/pympd-0.08.1-desktop-entry.patch:
+  Improve desktop entry and scalable icon install and stabilize amd64.
 
   30 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Andrej Kacian (Ticho) from metadata.xml (as per #59986).
diff --git a/media-sound/pympd/Manifest b/media-sound/pympd/Manifest
index fd58142afc55..d8bb190896de 100644
--- a/media-sound/pympd/Manifest
+++ b/media-sound/pympd/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST pympd-0.06.1.tar.gz 56869 RMD160 352e45cd705e5102482167789ccc3b2b2d5542c5 SHA1 23224b9379349eac5be2d0abdfac20e40d3edca9 SHA256 7396d9a6694266ef588a1382aa4e02494ffaa2921db24fe43d8ef778de4012da
+AUX pympd-0.08.1-desktop-entry.patch 1412 RMD160 5334df83b9b435287649ca96963cd9b23df91bf6 SHA1 506500d3e7b6e8a338cde46966fa160fed4e3c12 SHA256 bc96c7dba3353e1008ac92781c4d7d5f105e2f1a161b3071567f5fa564d93900
 DIST pympd-0.06.tar.gz 88844 RMD160 029eb205ad5ef3fa8ff88d6d0ab3b67f82c86dd1 SHA1 a96bb1794ee12508d0a04ca30ea81849c472684e SHA256 0281d1892486890c9bbeacd8844a3641227dddd26f43c7934b215aeb362c84ed
-DIST pympd-0.07.tar.gz 92785 RMD160 a91c6f1d5fd064cfe66cf79c38418b0e1cfd7677 SHA1 70d329a10b3f09b31b86cee1787709ba7ef423e3 SHA256 091cf6a2cc9149abf383f50d623cef49d5805fb68ca27d51614663c570c6591a
 DIST pympd-0.08.1.tar.gz 101120 RMD160 96bc3c5ce39991ebed389241f372ace5e5bf61fa SHA1 b266af61e83a350af097f3a789465e9939159a01 SHA256 8da3b91c06857c486321a1d2769c035becd90286ce03791aa2058b0a5f620a06
-EBUILD pympd-0.06.1.ebuild 1271 RMD160 9a9408373dc3054bd0829dbab6f5d3d9b26ea870 SHA1 15438136b8b59b9cf29f63222e105e404829b5dd SHA256 fdd0f7b9844abae72369278471f8c19f8115f4d90ecb4c14a267dcc21d71c087
 EBUILD pympd-0.06.ebuild 1491 RMD160 13428a106009164ff70f9b2a29b2cd367e4318cf SHA1 5caed2a90f5ba8e61284bf7c083f8dde317364e1 SHA256 ec534de1672131d66e3a605256645ae06d6cb11ce336f9ca751a12966af2b7b5
-EBUILD pympd-0.07.ebuild 1412 RMD160 a9c11948ae73a1e10cfcc5fcde68cc0e5c380be7 SHA1 5961655b774c9ed83bcf22b09b3cedf6eaef37e3 SHA256 b8a9e459ba633c6a49c559f3a13d8a35a7f461c7872c1466b6fad47ca9842468
-EBUILD pympd-0.08.1.ebuild 1461 RMD160 ffd74702b7d5e831e664c18337df1ebbd9d4c53e SHA1 c4a1dcb5402a276a111350e74b5ab1d696eea34b SHA256 6388115860c2693626bed3e0a3b160d43c6665ae2a892ee3720fdf5186f048f0
-MISC ChangeLog 3488 RMD160 6e9b245679f2be7a8897b4ec994eef410e31f0fc SHA1 b6c45cd9e1eace72b34fa3998383079ae9d2ba42 SHA256 382b828a2df61a53ad1c937bd67f355e42b3494a2b6b18a65d6908fe27e3c988
+EBUILD pympd-0.08.1.ebuild 1358 RMD160 5db686f3fc9cef312a84eafdbdbaceff41f76db3 SHA1 f6f2caaaf8eb7b823545a164ed52a3bbf6648eeb SHA256 764784ffee45a6f9234ac0ad3afa9cd070b17f0e0ff61574f6226c1bd1869b9c
+MISC ChangeLog 3725 RMD160 84d3d4f10faf700257ccc84b11d8785435b7597a SHA1 ac14c0fdf1ae92eb64f69658a3a01351c1c1098d SHA256 fda2efd05d7b8c34e18222100915bd82dfeaf01f55f048b301e0cc63adabf314
 MISC metadata.xml 266 RMD160 1d79567528a12ae737c2f05fdce81fc4810098b2 SHA1 55630b50a2a8609f4103420f60d96873ab4d3d8b SHA256 66667ccb14250e85122223a8eb0a9bbe7a0c2e2f1431301982f581df6ef3708f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg/p44ACgkQyuNVb5qfaOauAQCfXrE37MW0E/zdC0UI7sR4UHod
-hhsAoKU56YO35TLO5RxZTAWhoUwQkTXV
-=KlJg
------END PGP SIGNATURE-----
diff --git a/media-sound/pympd/files/pympd-0.08.1-desktop-entry.patch b/media-sound/pympd/files/pympd-0.08.1-desktop-entry.patch
new file mode 100644
index 000000000000..ac8698c67940
--- /dev/null
+++ b/media-sound/pympd/files/pympd-0.08.1-desktop-entry.patch
@@ -0,0 +1,30 @@
+diff -ur pympd-0.08.1.orig/pympd.desktop pympd-0.08.1/pympd.desktop
+--- pympd-0.08.1.orig/pympd.desktop	2007-05-10 16:11:16.000000000 +0300
++++ pympd-0.08.1/pympd.desktop	2009-05-22 05:20:43.000000000 +0300
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Version=0.06.2
++Version=1.0
+ Type=Application
+-Encoding=UTF-8
+ Name=pympd
+ Comment=pyGTK+ Frontend for MPD
+ TryExec=pympd
+ Exec=pympd
+-Icon=pympd.svg
+-Categories=Application;AudioVideo;Audio;Player;
++Icon=pympd
++Categories=AudioVideo;Audio;Player;
+ Terminal=false
+diff -ur pympd-0.08.1.orig/setup.py pympd-0.08.1/setup.py
+--- pympd-0.08.1.orig/setup.py	2007-05-10 16:11:16.000000000 +0300
++++ pympd-0.08.1/setup.py	2009-05-22 05:24:56.000000000 +0300
+@@ -23,7 +23,7 @@
+         package_dir= {'pympd':'src'},
+         packages=['pympd', 'pympd.modules'],
+         package_data={'pympd.modules': ['trayicon.so']},
+-        data_files=[('share/pympd/glade', glades + ['pympd.svg']), ('share/pympd/plugins', plugins), ('share/pixmaps', ['pympd.svg']), ('share/pympd/', ['pympd.svg']), ('share/applications', ['pympd.desktop']), ('share/pympd/pixmaps',icons) ],
++        data_files=[('share/pympd/glade', glades + ['pympd.svg']), ('share/pympd/plugins', plugins), ('share/icons/hicolor/scalable/apps', ['pympd.svg']), ('share/pympd/', ['pympd.svg']), ('share/applications', ['pympd.desktop']), ('share/pympd/pixmaps',icons) ],
+         
+         scripts = ['pympd']
+      )
diff --git a/media-sound/pympd/pympd-0.06.1.ebuild b/media-sound/pympd/pympd-0.06.1.ebuild
deleted file mode 100644
index 2349ac2fb148..000000000000
--- a/media-sound/pympd/pympd-0.06.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/pympd-0.06.1.ebuild,v 1.5 2008/05/29 17:19:20 hawking Exp $
-
-inherit eutils python multilib
-
-DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
-HOMEPAGE="http://sourceforge.net/projects/pympd"
-SRC_URI="http://pympd.sourceforge.net/files/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE="gnome"
-RDEPEND=">=virtual/python-2.4
-	>=dev-python/pygtk-2.6
-	x11-themes/gnome-icon-theme
-	gnome? ( dev-python/gnome-python-extras )"
-
-DOCS="README"
-
-src_compile() {
-	make PREFIX="/usr" DESTDIR="${D}"
-}
-
-src_install() {
-	make PREFIX="/usr" DESTDIR="${D}" install
-
-	use gnome || cd "${D}" && find -iname trayicon.* | xargs rm
-
-	dodir /usr/share/pixmaps
-	insinto /usr/share/pixmaps
-
-	cd "${S}"
-	newins src/glade/pixmaps/icon.png pympd.png
-	make_desktop_entry "pympd" "pympd" "pympd" "Audio"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pympd
-
-	echo
-	ewarn
-	ewarn "You need to remove the .pympd directory from your home directory, as new version uses different settings format"
-	ewarn
-	echo
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/media-sound/pympd/pympd-0.07.ebuild b/media-sound/pympd/pympd-0.07.ebuild
deleted file mode 100644
index 841ae9a414da..000000000000
--- a/media-sound/pympd/pympd-0.07.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/pympd-0.07.ebuild,v 1.7 2008/05/29 17:19:20 hawking Exp $
-
-inherit eutils toolchain-funcs python multilib
-
-DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
-HOMEPAGE="http://sourceforge.net/projects/pympd"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=virtual/python-2.4
-	>=dev-python/pygtk-2.6
-	x11-themes/gnome-icon-theme"
-
-pkg_setup() {
-	if ! built_with_use '=x11-libs/gtk+-2*' jpeg; then
-		echo
-		ewarn "If you want album cover art displayed in pympd,"
-		ewarn "you must build gtk+-2.x with \"jpeg\" USE flag."
-		echo
-		ebeep 3
-	fi
-}
-
-src_compile() {
-	# Honor CFLAGS in make.conf
-	export BUILDFLAGS="${CFLAGS}"
-	sed -i -e 's:CFLAGS =:CFLAGS = ${BUILDFLAGS}:' src/modules/tray/Makefile
-	emake CC="$(tc-getCC)" PREFIX="/usr" DESTDIR="${D}" || die "emake failed."
-}
-
-src_install() {
-	# Fix for 'src//glade/../pympd.svg': No such file or directory
-	sed -i -e 's:\..\/py:/usr/share/pympd/py:g' src/glade/pympd.glade
-
-	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed."
-	dodoc README
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pympd
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/media-sound/pympd/pympd-0.08.1.ebuild b/media-sound/pympd/pympd-0.08.1.ebuild
index 00e037ba3c7f..28e60c1b9c25 100644
--- a/media-sound/pympd/pympd-0.08.1.ebuild
+++ b/media-sound/pympd/pympd-0.08.1.ebuild
@@ -1,54 +1,54 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/pympd-0.08.1.ebuild,v 1.4 2008/05/29 17:19:20 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/pympd-0.08.1.ebuild,v 1.5 2009/05/22 02:29:48 ssuominen Exp $
 
-inherit eutils toolchain-funcs python multilib
+EAPI=2
+inherit eutils toolchain-funcs python multilib gnome2-utils
 
 DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
 HOMEPAGE="http://sourceforge.net/projects/pympd"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/python-2.4
 	>=dev-python/pygtk-2.6
+	x11-libs/gtk+[jpeg]
 	x11-themes/gnome-icon-theme"
 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 pympd,"
-		ewarn "you must build gtk+-2.x with \"jpeg\" USE flag."
-		echo
-		ebeep 3
-	fi
+src_prepare() {
+	sed -i -e 's:CFLAGS =:CFLAGS +=:' src/modules/tray/Makefile \
+		|| die "sed failed"
+	sed -i -e 's:\..\/py:/usr/share/pympd/py:g' src/glade/pympd.glade \
+		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
 }
 
 src_compile() {
-	# Honor CFLAGS in make.conf
-	export BUILDFLAGS="${CFLAGS}"
-	sed -i -e 's:CFLAGS =:CFLAGS = ${BUILDFLAGS}:' src/modules/tray/Makefile
-	emake CC="$(tc-getCC)" PREFIX="/usr" DESTDIR="${D}" || die "emake failed."
+	emake CC="$(tc-getCC)" PREFIX="/usr" DESTDIR="${D}" || die "emake failed"
 }
 
 src_install() {
-	# Fix for 'src//glade/../pympd.svg': No such file or directory
-	sed -i -e 's:\..\/py:/usr/share/pympd/py:g' src/glade/pympd.glade
-
-	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed."
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed"
 	dodoc README
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	python_version
 	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pympd
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	python_mod_cleanup
+	gnome2_icon_cache_update
 }