[gentoo-commits] gentoo-x86 commit in games-puzzle/pingus: ChangeLog pingus-0.7.2.ebuild

[Michael Sterrett (mr_bones_)]

mr_bones_    09/04/04 00:53:00

  Modified:             ChangeLog pingus-0.7.2.ebuild
  Log:
  EAPI=2; add gcc44 patch from Paul Mulders (bug #264739)
  (Portage version: 2.1.6.7/cvs/Linux i686)

Revision  Changes    Path
1.23                 games-puzzle/pingus/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/pingus/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/pingus/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/pingus/ChangeLog?r1=1.22&r2=1.23

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog	4 Sep 2008 16:31:25 -0000	1.22
+++ ChangeLog	4 Apr 2009 00:53:00 -0000	1.23
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/pingus
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.22 2008/09/04 16:31:25 mr_bones_ Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.23 2009/04/04 00:53:00 mr_bones_ Exp $
+
+  04 Apr 2009; Michael Sterrett <mr_bones_@g.o>
+  +files/pingus-0.7.2-gcc44.patch, pingus-0.7.2.ebuild:
+  EAPI=2; add gcc44 patch from Paul Mulders (bug #264739)
 
   04 Sep 2008; Michael Sterrett <mr_bones_@g.o> pingus-0.7.2.ebuild:
   Attempt at using a less-ugly icon (bug #236596)



1.9                  games-puzzle/pingus/pingus-0.7.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/pingus/pingus-0.7.2.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/pingus/pingus-0.7.2.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/pingus/pingus-0.7.2.ebuild?r1=1.8&r2=1.9

Index: pingus-0.7.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pingus-0.7.2.ebuild	4 Sep 2008 16:31:25 -0000	1.8
+++ pingus-0.7.2.ebuild	4 Apr 2009 00:53:00 -0000	1.9
@@ -1,7 +1,8 @@
-# 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/games-puzzle/pingus/pingus-0.7.2.ebuild,v 1.8 2008/09/04 16:31:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.2.ebuild,v 1.9 2009/04/04 00:53:00 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs games
 
 DESCRIPTION="free Lemmings clone"
@@ -21,12 +22,11 @@
 DEPEND="${RDEPEND}
 	>=dev-util/scons-0.97"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-paths.patch \
-		"${FILESDIR}/${P}+gcc-4.3.patch"
+		"${FILESDIR}"/${P}+gcc-4.3.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 	sed -i \
 		-e "s:GENTOO_BINDIR:${GAMES_BINDIR}:" \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
@@ -34,15 +34,18 @@
 		|| die "sed failed"
 }
 
-src_compile() {
-	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
-	[[ ${MAKEOPTS/-s/} != ${MAKEOPTS} ]] && sconsopts="${sconsopts} -s"
-
+src_configure() {
 	scons configure \
 		CXX="$(tc-getCXX)" \
 		CCFLAGS="${CXXFLAGS}" \
 		LINKFLAGS="${LDFLAGS}" \
 		|| die "scons configure failed"
+}
+
+src_compile() {
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
+	[[ ${MAKEOPTS/-s/} != ${MAKEOPTS} ]] && sconsopts="${sconsopts} -s"
+
 	scons ${sconsopts} || die "scons failed"
 }