From 8a674861e3f06cc819e9a849957d67f2f24aaf8e Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 3 Aug 2009 10:24:11 +0000 Subject: Move sed and epatch to src_prepare in EAPI=2 ebuilds. (Portage version: 2.2_rc33/cvs/Linux x86_64) --- x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild | 7 ++----- x11-wm/fluxbox/fluxbox-1.0.0.ebuild | 7 ++----- x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild | 7 ++----- x11-wm/fluxbox/fluxbox-9999.ebuild | 5 ++++- 4 files changed, 10 insertions(+), 16 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild index 9c3ee3da0307..5924920a0c3e 100644 --- a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.10 2009/06/24 05:13:08 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.11 2009/08/03 10:24:11 ssuominen Exp $ EAPI="2" inherit eutils @@ -38,10 +38,7 @@ SLOT="0" LICENSE="MIT" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # We need to be able to include directories rather than just plain # files in menu [include] items. This patch will allow us to do clever # things with style ebuilds. diff --git a/x11-wm/fluxbox/fluxbox-1.0.0.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0.ebuild index 93f218bb094e..1f66bb233c39 100644 --- a/x11-wm/fluxbox/fluxbox-1.0.0.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.10 2009/03/08 19:47:56 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.11 2009/08/03 10:24:11 ssuominen Exp $ EAPI="2" inherit eutils @@ -37,10 +37,7 @@ SLOT="0" LICENSE="MIT" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # We need to be able to include directories rather than just plain # files in menu [include] items. This patch will allow us to do clever # things with style ebuilds. diff --git a/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild index efe4ad17716f..228b06d43456 100644 --- a/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.4 2009/04/08 16:40:32 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.5 2009/08/03 10:24:11 ssuominen Exp $ EAPI="2" inherit eutils @@ -38,10 +38,7 @@ SLOT="0" LICENSE="MIT" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # We need to be able to include directories rather than just plain # files in menu [include] items. This patch will allow us to do clever # things with style ebuilds. diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild index 60d3e307d8ea..2aa6d83bfe8a 100644 --- a/x11-wm/fluxbox/fluxbox-9999.ebuild +++ b/x11-wm/fluxbox/fluxbox-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.3 2009/03/16 12:56:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.4 2009/08/03 10:24:11 ssuominen Exp $ EAPI=2 inherit eutils git @@ -41,7 +41,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd src_unpack() { git_src_unpack +} +src_prepare() { + git_src_prepare cd "${S}" ./autogen.sh -- cgit v1.2.3-65-gdbad