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
commitafe40a7def14c9f6e4ceceddc1498fb0c25e4dae (patch)
treed75c5e976c8bd9a1a160f6560269060230b096b1 /games-util
parentVersion bump. (diff)
downloadhistorical-afe40a7def14c9f6e4ceceddc1498fb0c25e4dae.tar.gz
historical-afe40a7def14c9f6e4ceceddc1498fb0c25e4dae.tar.bz2
historical-afe40a7def14c9f6e4ceceddc1498fb0c25e4dae.zip
LIBS patch from Fredric Johansson via bug #281460; EAPI=2
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-util')
-rw-r--r--games-util/emilia-pinedit/ChangeLog8
-rw-r--r--games-util/emilia-pinedit/Manifest14
-rw-r--r--games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild17
3 files changed, 16 insertions, 23 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/Manifest b/games-util/emilia-pinedit/Manifest
index 5177aa1084d2..61610e752df3 100644
--- a/games-util/emilia-pinedit/Manifest
+++ b/games-util/emilia-pinedit/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 0.3.1-assert.patch 525 RMD160 a6bceff29344ec36b02111dc4d73f2348476b75c SHA1 f0fd4a546d39df71abb29db1994350824248f0d4 SHA256 d718dca672bc5e37312a7b3aa4e9f3175309a6b1787b2c294ed06a8592aedd39
AUX emilia-pinedit-0.3.1-gcc4.patch 659 RMD160 2ee9a567a3c5fa72da07a83e277e21d2342c62c1 SHA1 0aa48eda88311914fe8236b5381317b7ba155cee SHA256 53807233f38e98a15037a7f2f63348163d99411cbf9644bf879e7b9d86d8be7f
DIST pinedit-0.3.1.tar.gz 1244070 RMD160 142b5416957f0c460ebf20b9c92fb0b7157b3fd4 SHA1 c83e570c699217d7d34f8f1210a3b8691e384906 SHA256 14c818e539c0ffa49868f5e7a92858038df91bd38610b38743946f9183538aa1
-EBUILD emilia-pinedit-0.3.1.ebuild 1497 RMD160 85a1296f0af95338b88ed99f8b7b893deff3e41c SHA1 501fc23f423cef898de98b792c3dcdfd34f9b5f9 SHA256 a6182189e50bdf9f4d04179efa1a2975e8f5a0c24e57ac484c4b38d3a89f78bc
-MISC ChangeLog 1602 RMD160 48d12289fde03005d916d7a1bbeda28f98f8f9a9 SHA1 bcf9d1ce23863aacc619c9d4933f504d84921988 SHA256 207dc8078a5c9dfb8cad2c5e9c52f41e4bf532bda3de65d5520f009691aa5df8
+EBUILD emilia-pinedit-0.3.1.ebuild 1480 RMD160 abdad2f7e07903a19c04e44c69b2a0810f0e8a6b SHA1 63956df473c51f460b07e46955de4ed0d76bbab3 SHA256 81d17b75ad8bd0eb549e0fd1931dac250ec09fb90d87e59474af45411b2ef3a0
+MISC ChangeLog 1755 RMD160 69aaec98cfec890f02f237eef6b1268eae2674fa SHA1 1fb3ed754b5fbbf1ff25c2b60c2e147b0103fc83 SHA256 3a5682e094110267abea873713754c234fa1ebe7095835b2f16e873937b959b8
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAklhQHIACgkQOeoy/oIi7uwcBACgroDBIGJXpRb8KSCUPq9qzDmG
-g/wAniQqGUAt+rZvU/VOLGrh9UYkMRvc
-=t4gH
------END PGP SIGNATURE-----
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"
}