From 167830276f609e8f7e2776ce309b713ecb454727 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 28 May 2010 21:30:24 +0000 Subject: [PATCH] Delete call to deprecated python_version(). Package-Manager: portage-HEAD/cvs/Linux x86_64 --- media-sound/moosic/ChangeLog | 8 ++++++-- media-sound/moosic/moosic-1.5.4.ebuild | 25 ++++++++++--------------- media-sound/pympd/ChangeLog | 8 ++++++-- media-sound/pympd/pympd-0.08.1.ebuild | 9 ++++----- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/media-sound/moosic/ChangeLog b/media-sound/moosic/ChangeLog index e3f5e7961fb2..15eb99b69dcf 100644 --- a/media-sound/moosic/ChangeLog +++ b/media-sound/moosic/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/moosic -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/ChangeLog,v 1.20 2009/07/17 23:26:28 tcunha Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/ChangeLog,v 1.21 2010/05/28 21:27:28 arfrever Exp $ + + 28 May 2010; Arfrever Frehtes Taifersar Arahesis + moosic-1.5.4.ebuild: + Delete call to deprecated python_version(). 17 Jul 2009; Tiago Cunha moosic-1.5.4.ebuild: stable sparc, bug 274738 diff --git a/media-sound/moosic/moosic-1.5.4.ebuild b/media-sound/moosic/moosic-1.5.4.ebuild index 09e389c91528..62287e792651 100644 --- a/media-sound/moosic/moosic-1.5.4.ebuild +++ b/media-sound/moosic/moosic-1.5.4.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/moosic-1.5.4.ebuild,v 1.6 2009/07/17 23:26:28 tcunha Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/moosic/moosic-1.5.4.ebuild,v 1.7 2010/05/28 21:27:28 arfrever Exp $ -inherit bash-completion distutils python multilib +EAPI="3" + +inherit bash-completion distutils DESCRIPTION="Moosic is a music player that focuses on easy playlist management" HOMEPAGE="http://www.nanoo.org/~daniel/moosic" @@ -13,13 +15,11 @@ SLOT="0" KEYWORDS="amd64 ~ppc sparc x86" IUSE="doc" -RDEPEND="dev-lang/python" -DEPEND="${RDEPEND} - dev-python/setuptools" +RDEPEND="" +DEPEND="dev-python/setuptools" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { + distutils_src_prepare sed -i -e 's:distutils.core:setuptools:' setup.py || die "sed failed" } @@ -33,11 +33,6 @@ src_install() { } pkg_postinst() { - python_version - python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages bash-completion_pkg_postinst -} - -pkg_postrm() { - python_mod_cleanup + distutils_pkg_postinst } diff --git a/media-sound/pympd/ChangeLog b/media-sound/pympd/ChangeLog index 941213b62a87..6b9209e58ff4 100644 --- a/media-sound/pympd/ChangeLog +++ b/media-sound/pympd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/pympd -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/ChangeLog,v 1.23 2009/05/26 21:17:25 fauli Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/ChangeLog,v 1.24 2010/05/28 21:30:24 arfrever Exp $ + + 28 May 2010; Arfrever Frehtes Taifersar Arahesis + pympd-0.08.1.ebuild: + Delete call to deprecated python_version(). 26 May 2009; Christian Faulhammer pympd-0.08.1.ebuild: stable x86, bug 270782 diff --git a/media-sound/pympd/pympd-0.08.1.ebuild b/media-sound/pympd/pympd-0.08.1.ebuild index 6b56ec458381..45d45f9b939d 100644 --- a/media-sound/pympd/pympd-0.08.1.ebuild +++ b/media-sound/pympd/pympd-0.08.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.7 2009/05/26 21:17:25 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pympd/pympd-0.08.1.ebuild,v 1.8 2010/05/28 21:30:24 arfrever Exp $ EAPI=2 inherit eutils toolchain-funcs python multilib gnome2-utils @@ -43,12 +43,11 @@ pkg_preinst() { } pkg_postinst() { - python_version - python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pympd + python_mod_optimize $(python_get_sitedir)/pympd gnome2_icon_cache_update } pkg_postrm() { - python_mod_cleanup + python_mod_cleanup $(python_get_sitedir)/pympd gnome2_icon_cache_update } -- 2.26.2