summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-10-18 12:51:22 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-10-18 12:51:22 +0000
commitc1d95549e056f965dbdc28f0876c6d169c03b180 (patch)
tree58c23d253f30e5f086a09b4fba5bb6f41d32d0d8 /games-emulation/psemu-cdr
parentVersion bump. (diff)
downloadgentoo-2-c1d95549e056f965dbdc28f0876c6d169c03b180.tar.gz
gentoo-2-c1d95549e056f965dbdc28f0876c6d169c03b180.tar.bz2
gentoo-2-c1d95549e056f965dbdc28f0876c6d169c03b180.zip
Respect LDFLAGS. Bug #333657
(Portage version: 2.1.9.14/cvs/Linux i686)
Diffstat (limited to 'games-emulation/psemu-cdr')
-rw-r--r--games-emulation/psemu-cdr/ChangeLog8
-rw-r--r--games-emulation/psemu-cdr/files/psemu-cdr-1.8-ldflags.patch23
-rw-r--r--games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild12
3 files changed, 34 insertions, 9 deletions
diff --git a/games-emulation/psemu-cdr/ChangeLog b/games-emulation/psemu-cdr/ChangeLog
index abb4a51bd570..3eeef44def5b 100644
--- a/games-emulation/psemu-cdr/ChangeLog
+++ b/games-emulation/psemu-cdr/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/psemu-cdr
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/ChangeLog,v 1.11 2007/02/21 23:29:47 peper Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/ChangeLog,v 1.12 2010/10/18 12:51:22 tupone Exp $
+
+ 18 Oct 2010; Tupone Alfredo <tupone@gentoo.org> psemu-cdr-1.8.ebuild,
+ +files/psemu-cdr-1.8-ldflags.patch:
+ Respect LDFLAGS. Bug #333657 by flameeyes@gentoo.org
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/games-emulation/psemu-cdr/files/psemu-cdr-1.8-ldflags.patch b/games-emulation/psemu-cdr/files/psemu-cdr-1.8-ldflags.patch
new file mode 100644
index 000000000000..eedabb08857c
--- /dev/null
+++ b/games-emulation/psemu-cdr/files/psemu-cdr-1.8-ldflags.patch
@@ -0,0 +1,23 @@
+--- src/Makefile.old 2010-10-18 14:44:19.000000000 +0200
++++ src/Makefile 2010-10-18 14:45:05.000000000 +0200
+@@ -34,7 +34,7 @@
+
+ plugin: $(OBJECTS)
+ rm -f $(PLUGIN)
+- $(CC) -shared -Wl,-soname,$(PLUGIN) $(CFLAGS) $(OBJECTS) -o $(PLUGIN) $(LIBS)
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(PLUGIN) $(CFLAGS) $(OBJECTS) -o $(PLUGIN) $(LIBS)
+
+
+ cfg:
+--- src/cfg-gtk2/Makefile.old 2010-10-18 14:45:38.000000000 +0200
++++ src/cfg-gtk2/Makefile 2010-10-18 14:46:06.000000000 +0200
+@@ -12,8 +12,7 @@
+
+ cfg: ${CFG_OBJECTS}
+ ${RM} ${CFG}
+- ${CC} `pkg-config --cflags --libs gtk+-2.0` ${CFLAGS} ${CFG_OBJECTS} -o ${CFG} ${LIBS}
+- ${STRIP} ${CFG}
++ ${CC} $(LDFLAGS) ${CFLAGS} ${CFG_OBJECTS} -o ${CFG} ${LIBS}
+
+ clean:
+ ${RM} *.o ${CFG}
diff --git a/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild b/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
index 1c4540c393b5..08f77157937c 100644
--- a/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
+++ b/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild,v 1.9 2007/04/09 15:56:39 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild,v 1.10 2010/10/18 12:51:22 tupone Exp $
+EAPI=2
inherit eutils games
@@ -19,11 +20,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/${PV}-makefile-cflags.patch
- sed -i '/STRIP/d' src/{,cfg-gtk2/}Makefile || die "sed failed"
-}
+PATCHES=( "${FILESDIR}"/${PV}-makefile-cflags.patch
+ "${FILESDIR}"/${P}-ldflags.patch )
src_compile() {
emake -C src OPTFLAGS="${CFLAGS}" GUI="gtk+2" || die "emake failed"