summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-08-14 20:23:53 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-08-14 20:23:53 +0000
commite6df1229439dc55356353d882ff8f463a4b659c7 (patch)
tree01066987e0fa3c7a91799d0d560a7be4a3a5334c /games-util/emilia-pinedit
parentVersion bump. (diff)
downloadgentoo-2-e6df1229439dc55356353d882ff8f463a4b659c7.tar.gz
gentoo-2-e6df1229439dc55356353d882ff8f463a4b659c7.tar.bz2
gentoo-2-e6df1229439dc55356353d882ff8f463a4b659c7.zip
LIBS patch from Fredric Johansson via bug #281460; EAPI=2
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-util/emilia-pinedit')
-rw-r--r--games-util/emilia-pinedit/ChangeLog8
-rw-r--r--games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild17
2 files changed, 14 insertions, 11 deletions
diff --git a/games-util/emilia-pinedit/ChangeLog b/games-util/emilia-pinedit/ChangeLog
index f877f6569785..bcd1fc509a5e 100644
--- a/games-util/emilia-pinedit/ChangeLog
+++ b/games-util/emilia-pinedit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-util/emilia-pinedit
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/emilia-pinedit/ChangeLog,v 1.13 2009/01/04 23:03:26 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/emilia-pinedit/ChangeLog,v 1.14 2009/08/14 20:23:53 mr_bones_ Exp $
+
+ 14 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+ emilia-pinedit-0.3.1.ebuild:
+ LIBS patch from Fredric Johansson via bug #281460; EAPI=2
04 Jan 2009; Ulrich Mueller <ulm@gentoo.org> emilia-pinedit-0.3.1.ebuild:
Change virtual/xft dependency to x11-libs/libXft, bug 253771.
diff --git a/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild b/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild
index f8490ed47884..5b4e32c04233 100644
--- a/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild
+++ b/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild,v 1.17 2009/01/04 23:03:26 ulm Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild,v 1.18 2009/08/14 20:23:53 mr_bones_ Exp $
+EAPI=2
inherit eutils qt3 games
MY_P=${PN/emilia-/}-${PV}
@@ -28,24 +27,24 @@ DEPEND="media-libs/libsdl
x11-libs/qt:3
>=games-arcade/emilia-pinball-0.3.1"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
sed -i \
-e "/^CFLAGS=/s:-g -W -Wall:${CFLAGS}:" \
-e "/^CXXFLAGS=/s:-g -W -Wall:${CXXFLAGS}:" \
configure \
|| die "sed configure failed"
sed -i \
- -e "/^LDFLAGS/s:$: $(pinball-config --libs) @LIBS@ -lSDL -lSDL_image -lSDL_mixer:" \
+ -e "/^LDFLAGS/s:$: $(pinball-config --libs):" \
+ -e "/^LIBS/s:$: -lSDL -lSDL_image -lSDL_mixer:" \
pinedit/Makefile.in \
|| die "sed pinedit/Makefile.in failed"
- epatch "${FILESDIR}"/${PV}-assert.patch \
+
+ epatch \
+ "${FILESDIR}"/${PV}-assert.patch \
"${FILESDIR}"/${P}-gcc4.patch
}
src_compile() {
- egamesconf || die
emake MOC="${QTDIR}"/bin/moc -j1 || die "emake failed"
}