Improve desktop entry and scalable icon install and stabilize amd64.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 57 insertions, 126 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/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
 }