add use deps; respect CC, CXX, {CC,CXX,LD}FLAGS

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

diff --git a/games-action/rrootage/ChangeLog b/games-action/rrootage/ChangeLog
index 884dd4c413afd05249928b7ac334a3fb2565679c..3281519f3f3912218fe3e9fabb6bf87aea07b982 100644 (file)
--- a/games-action/rrootage/ChangeLog
+++ b/games-action/rrootage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/rrootage
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/rrootage/ChangeLog,v 1.9 2010/01/25 22:15:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/rrootage/ChangeLog,v 1.10 2010/06/14 21:35:45 mr_bones_ Exp $
+
+  14 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  rrootage-0.23a.ebuild:
+  add use deps; respect CC, CXX, {CC,CXX,LD}FLAGS
 
   25 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org>
   rrootage-0.23a.ebuild:

diff --git a/games-action/rrootage/Manifest b/games-action/rrootage/Manifest
index 48803b34039f69a7b5615d4d76e5777794b1ed02..1d462eb6a92a7df22a4347913f015c9209952570 100644 (file)
--- a/games-action/rrootage/Manifest
+++ b/games-action/rrootage/Manifest
@@ -1,5 +1,5 @@
 AUX rrootage-0.23a-gcc41.patch 959 RMD160 ab8aa82263f1dcf9db65c7b43e8841c7ac6abf3f SHA1 3482c15181a00dbe0e5096217efb3389274df32b SHA256 0bf69bcf48f434a62b22a893c3e07bc3c9412deee756081b2626118af58b08cb
 DIST rRootage-0.23a.tar.gz 3910941 RMD160 f6dc4e5ea72780fe2a9dd93ad813ecdeb8464b33 SHA1 8b63bfe17fd311ade6983ec99ec53e44cb8ee3f1 SHA256 964edbe21802e3e40d6a8da19b61132decacd13bf9a71bac86abce012379ff07
-EBUILD rrootage-0.23a.ebuild 1522 RMD160 15c21bdc4f0d94b04229ee9ff3162d30c811e8f7 SHA1 81751110cea811ea32ef02d77ca6931b5c94f59e SHA256 ddeb592f45533d123ee0a4724c81bf36d43daf125dec48e91cfe13be810c5bf6
-MISC ChangeLog 1194 RMD160 d1d88db78b2029b02cb26e0005b3c46cbea84a01 SHA1 095c17bbfb092a191bed39381125aa050b7ce18d SHA256 f3fc425e4d9762a41b27fc8f7691148900bfccfabb2060a6bf9f8a6960b5ce7c
+EBUILD rrootage-0.23a.ebuild 1810 RMD160 05ccefacc0b0ed193e523d1e378d9477218cedde SHA1 b56192b805c90d04e3fbf317bf0e16ccae3f7399 SHA256 e62c8321856c472ae1057e1a189e0aed86e5aa2d86edf1fe37c833f912736652
+MISC ChangeLog 1326 RMD160 b2c85c0dbbe5d44e6675ceb20387ac391b7bd9c3 SHA1 58a4ac60d490e869ff156de6f94682867f0b75a6 SHA256 8d37b7613509a8a4535a3b55ce83fc513108f5b90df753ebecdd9c3604032e71
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-action/rrootage/rrootage-0.23a.ebuild b/games-action/rrootage/rrootage-0.23a.ebuild
index 4c2dfbd1f351b0c8b0f44fda76565281bb8ed378..1dae3698cbb6a3fc939353a4567aa8aac0bd640d 100644 (file)
--- a/games-action/rrootage/rrootage-0.23a.ebuild
+++ b/games-action/rrootage/rrootage-0.23a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/rrootage/rrootage-0.23a.ebuild,v 1.9 2010/01/25 22:15:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/rrootage/rrootage-0.23a.ebuild,v 1.10 2010/06/14 21:35:45 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -19,15 +19,23 @@ IUSE=""
 
 DEPEND="virtual/opengl
        virtual/glu
-       media-libs/libsdl
-       media-libs/sdl-mixer
+       media-libs/libsdl[video]
+       media-libs/sdl-mixer[vorbis]
        >=dev-libs/libbulletml-0.0.3"
 
 S=${WORKDIR}/${MY_PN}/src
 
 src_prepare() {
        epatch "${FILESDIR}/${P}"-gcc41.patch
-       sed -e "s/-lglut/-lGL -lGLU/" makefile.lin > Makefile || die "sed failed"
+       sed \
+               -e "s/-lglut/-lGL -lGLU/" \
+               -e "/^CC/d" \
+               -e "/^CXX/d" \
+               -e "/^LDFLAGS/s/=/+=/" \
+               -e "/^CPPFLAGS/s/MORE_CFLAGS/MORE_CXXFLAGS/" \
+               -e "/^CPPFLAGS/s/MORE_CFLAGS/MORE_CXXFLAGS/" \
+               -e "s:-I./bulletml/:-I/usr/include/bulletml:" \
+               makefile.lin > Makefile || die "sed failed"
 
        sed -i \
                -e "s:/usr/share/games:${GAMES_DATADIR}:" \
@@ -36,7 +44,10 @@ src_prepare() {
 }
 
 src_compile() {
-       emake MORE_CFLAGS="${CFLAGS}" || die "emake failed"
+       emake \
+               MORE_CFLAGS="-DLINUX ${CFLAGS}" \
+               MORE_CXXFLAGS="-DLINUX ${CXXFLAGS}" \
+               || die "emake failed"
 }
 
 src_install() {