From af022a5812e1abd15347b7c45c969bc51e7862b2 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 23 Jan 2012 10:14:59 +0000 Subject: Use python.eclass and convert shebang(s) wrt #317041 by Ian Delaney (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) --- x11-themes/fvwm-crystal/ChangeLog | 6 +++++- .../fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild | 23 ++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) (limited to 'x11-themes') diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog index e5ffc6a78891..e36d9471e333 100644 --- a/x11-themes/fvwm-crystal/ChangeLog +++ b/x11-themes/fvwm-crystal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/fvwm-crystal # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.65 2012/01/23 10:05:46 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.66 2012/01/23 10:14:59 ssuominen Exp $ + + 23 Jan 2012; Samuli Suominen + fvwm-crystal-3.0.6-r1.ebuild: + Use python.eclass and convert shebang(s) wrt #317041 by Ian Delaney 23 Jan 2012; Samuli Suominen fvwm-crystal-3.0.6-r1.ebuild: diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild index e1059d692836..1a63a158b1b7 100644 --- a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild +++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild @@ -1,9 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild,v 1.6 2012/01/23 10:05:46 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild,v 1.7 2012/01/23 10:14:59 ssuominen Exp $ EAPI=4 -inherit eutils + +PYTHON_DEPEND="2:2.7" + +inherit eutils python DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency" HOMEPAGE="http://gna.org/projects/fvwm-crystal/" @@ -14,16 +17,20 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" IUSE="" -RDEPEND=">=x11-wm/fvwm-2.6.2[png] - dev-lang/python - media-gfx/imagemagick - || ( x11-misc/stalonetray x11-misc/trayer ) - || ( x11-misc/habak x11-misc/hsetroot ) +RDEPEND="|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) x11-apps/xwd - || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )" + || ( x11-misc/habak x11-misc/hsetroot ) + || ( x11-misc/stalonetray x11-misc/trayer ) + >=x11-wm/fvwm-2.6.2[png]" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} src_prepare() { find . -type d -name '.svn' -prune -exec rm -rf {} ';' || die + python_convert_shebangs -r 2 bin fvwm/scripts #317041 epatch "${FILESDIR}"/fvwm-crystal.apps.patch } -- cgit v1.2.3-65-gdbad