diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-30 00:03:46 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-30 00:03:46 +0000 |
commit | c3daedd99949d81cf9ba75f0eb9abc1863bfb67b (patch) | |
tree | e64d5bdc846b560c7aaa7d4c2563a4a2ae399cd4 /media-sound/cplay | |
parent | Link to upstream bug. (diff) | |
download | gentoo-2-c3daedd99949d81cf9ba75f0eb9abc1863bfb67b.tar.gz gentoo-2-c3daedd99949d81cf9ba75f0eb9abc1863bfb67b.tar.bz2 gentoo-2-c3daedd99949d81cf9ba75f0eb9abc1863bfb67b.zip |
Fix python.eclass usage wrt #313941 by Arfrever Frehtes Taifersar Arahesis.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/cplay')
-rw-r--r-- | media-sound/cplay/ChangeLog | 8 | ||||
-rw-r--r-- | media-sound/cplay/cplay-1.49.ebuild | 25 |
2 files changed, 22 insertions, 11 deletions
diff --git a/media-sound/cplay/ChangeLog b/media-sound/cplay/ChangeLog index 3656efcdda77..4bb01b938b5d 100644 --- a/media-sound/cplay/ChangeLog +++ b/media-sound/cplay/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/cplay -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/cplay/ChangeLog,v 1.24 2009/02/27 12:47:06 aballier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/cplay/ChangeLog,v 1.25 2010/07/30 00:03:46 ssuominen Exp $ + + 30 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> cplay-1.49.ebuild: + Fix python.eclass usage wrt #313941 by Arfrever Frehtes Taifersar + Arahesis. 27 Feb 2009; Alexis Ballier <aballier@gentoo.org> cplay-1.49.ebuild: sed the script after installing it if we're sedding in D; bug #256142 diff --git a/media-sound/cplay/cplay-1.49.ebuild b/media-sound/cplay/cplay-1.49.ebuild index 35e5ede40192..81cb7150a7e7 100644 --- a/media-sound/cplay/cplay-1.49.ebuild +++ b/media-sound/cplay/cplay-1.49.ebuild @@ -1,6 +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/cplay/cplay-1.49.ebuild,v 1.18 2009/09/06 17:53:17 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cplay/cplay-1.49.ebuild,v 1.19 2010/07/30 00:03:46 ssuominen Exp $ + +EAPI=2 +PYTHON_DEPEND="2" +inherit python DESCRIPTION="A Curses front-end for various audio players." SRC_URI="http://mask.tf.hut.fi/~flu/cplay/${P}.tar.gz" @@ -11,19 +15,22 @@ SLOT="0" KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86" IUSE="mp3 vorbis" -DEPEND="sys-devel/gettext" -RDEPEND="dev-lang/python - vorbis? ( media-sound/vorbis-tools ) +RDEPEND="vorbis? ( media-sound/vorbis-tools ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 media-sound/madplay media-sound/splay ) )" +DEPEND="sys-devel/gettext" -src_install () { - emake PREFIX="${D}/usr" recursive-install || die "emake failed." +src_prepare() { + sed -i -e 's:make:$(MAKE):' Makefile || die + sed -i -e 's:/usr/local:/usr:' cplay || die + python_convert_shebangs 2 cplay +} - dobin cplay || die "dobin failed." +src_install () { + emake PREFIX="${D}/usr" recursive-install || die + dobin cplay || die doman cplay.1 dodoc ChangeLog README TODO - sed -i -e "s:/usr/local:/usr:g" "${D}"/usr/bin/cplay || die "dosed failed." } |