EAPI=2; tidy

Package-Manager: portage-2.1.6.7/cvs/Linux i686

3 files changed, 26 insertions, 29 deletions

diff --git a/games-board/pouetchess/ChangeLog b/games-board/pouetchess/ChangeLog
index 82018337cc14..a182cf5c9a4a 100644
--- a/games-board/pouetchess/ChangeLog
+++ b/games-board/pouetchess/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/pouetchess
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/ChangeLog,v 1.11 2008/07/20 20:49:15 loki_val Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/ChangeLog,v 1.12 2009/04/07 01:21:05 mr_bones_ Exp $
+
+  07 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  pouetchess-0.2.0-r1.ebuild:
+  EAPI=2; tidy
 
   20 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
   +files/pouetchess-0.2.0-gcc43.patch, pouetchess-0.2.0-r1.ebuild:
diff --git a/games-board/pouetchess/Manifest b/games-board/pouetchess/Manifest
index 55560aad49c4..4573d491750a 100644
--- a/games-board/pouetchess/Manifest
+++ b/games-board/pouetchess/Manifest
@@ -3,6 +3,6 @@ AUX pouetchess-0.2.0-nvidia_glext.patch 373 RMD160 34d53944251ea3b6363ba0a4a4a5c
 AUX pouetchess-0.2.0-sconstruct-sandbox.patch 754 RMD160 cd2b425d782fa1da12bd6a68c77f54d8b577c16b SHA1 ffbbf33d85f427cd04a7f57f4ec5e17d114ef3fb SHA256 0d0c7471bc5de6157f5d8c44dde061dbbf9215fc6b00bd4be590d41dabbdd70a
 AUX pouetchess-0.2.0-segfaults.patch 1195 RMD160 698eeb1561ec984fafa2ec398a467151b5a74642 SHA1 5d79a39c2b8a98c619f3f285d321cab5bc4b4796 SHA256 a0796702fdc434a337afa7579d8fee7076bfab06eb99171b6802ecf85a0ae4c2
 DIST pouetchess_src_0.2.0.tar.gz 1055338 RMD160 29611b78ef75b3707ad98752055da775335c0490 SHA1 023bea8043b5dcf8a134531b920497c7efb89adb SHA256 fe966ff1b0aa2dd6d0ca2b62692f5b788e3a286050a6a374e58ca0612f68b2ef
-EBUILD pouetchess-0.2.0-r1.ebuild 1874 RMD160 45c7eb97622bc0c6ff6308e3d298eab24322bd30 SHA1 96e875efdf2f075cf60f1867bbd28d5393f304fc SHA256 56537ac07407dc20ab6bba2d6cdda59f728d65ab34d42651820918184067b029
-MISC ChangeLog 2170 RMD160 e63150c4c2022dbe7a7e2f2d2ff5ff326a285ad7 SHA1 e62ace1bec23d0bca872d8d9168e65f431820271 SHA256 10aeeb8f962de2c3a1e7a2e2b6fd3f3f0b0459aade7a58dc12ef24b41009a6e1
+EBUILD pouetchess-0.2.0-r1.ebuild 1722 RMD160 fe3e39d3b4b5b69be0f874efb394d29292431f81 SHA1 f74c65b116ad4f134bf33a3a30f61b608441d516 SHA256 34094350e601742b80f024fe921572c441bc9adafaa3c9b8b73131ab9d9ae670
+MISC ChangeLog 2272 RMD160 0315e4b48d1618f804dff588db2bf03708ec002a SHA1 d6127815807a5054cdd6c82e534f3933f2d6c533 SHA256 c0a01e33f704522c409ecd5bc569fe0b775a8c4d112247e55d408cf6e7a1d40e
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
index 038048ef524d..3bc8f5a83060 100644
--- a/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
+++ b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
@@ -1,8 +1,9 @@
-# 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-board/pouetchess/pouetchess-0.2.0-r1.ebuild,v 1.6 2008/07/20 20:49:15 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild,v 1.7 2009/04/07 01:21:05 mr_bones_ Exp $
 
-inherit base eutils toolchain-funcs games
+EAPI=2
+inherit eutils games
 
 MY_PN=${PN/c/C}
 DESCRIPTION="3D and open source chess game"
@@ -15,31 +16,20 @@ KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug"
 
 RDEPEND="media-libs/libsdl
-	media-libs/sdl-image
+	media-libs/sdl-image[jpeg,png]
 	virtual/glu
 	virtual/opengl"
 DEPEND="${RDEPEND}
 	dev-util/scons"
 
 S=${WORKDIR}/${PN}_src_${PV}
-PATCHES=(	"${FILESDIR}/${P}-sconstruct-sandbox.patch"
-		"${FILESDIR}/${P}-nvidia_glext.patch"
-		"${FILESDIR}/${P}-segfaults.patch"
-		"${FILESDIR}/${P}-gcc43.patch"	)
+PATCHES=( "${FILESDIR}/${P}-sconstruct-sandbox.patch"
+	"${FILESDIR}/${P}-nvidia_glext.patch"
+	"${FILESDIR}/${P}-segfaults.patch"
+	"${FILESDIR}/${P}-gcc43.patch" )
 
-pkg_setup() {
-	games_pkg_setup
-	einfo "If you experience problems building pouetchess with nvidia drivers,"
-	einfo "you can try:"
-	einfo "eselect opengl set xorg-x11"
-	einfo "emerge pouetchess"
-	einfo "eselect opengl set nvidia"
-}
-
-src_unpack() {
-	base_src_unpack
-
-	cd "${S}"
+src_prepare() {
+	epatch "${PATCHES[@]}"
 	# Fix for LibSDL >= 1.2.10 detection
 	sed -i \
 		-e "s:sdlver.split('.') >= \['1','2','8'\]:sdlver.split('.') >= [1,2,8]:" \
@@ -47,9 +37,7 @@ src_unpack() {
 		|| die "sed failed"
 }
 
-src_compile() {
-	tc-export CC CXX
-
+src_configure() {
 	# turn off the hackish optimization setting code (bug #230127)
 	scons configure \
 		strip=false \
@@ -58,7 +46,12 @@ src_compile() {
 		datadir="${GAMES_DATADIR}"/${PN} \
 		$(use debug && echo debug=1) \
 		|| die "scons configure failed"
-	scons || die "scons failed"
+}
+
+src_compile() {
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
+
+	scons ${sconsopts} || die "scons failed"
 }
 
 src_install() {